diff --git a/apps/encryption/appinfo/application.php b/apps/encryption/appinfo/application.php
index d4804394c5..75107b2723 100644
--- a/apps/encryption/appinfo/application.php
+++ b/apps/encryption/appinfo/application.php
@@ -30,6 +30,7 @@ use OCA\Encryption\Controller\RecoveryController;
 use OCA\Encryption\Controller\SettingsController;
 use OCA\Encryption\Controller\StatusController;
 use OCA\Encryption\Crypto\Crypt;
+use OCA\Encryption\Crypto\EncryptAll;
 use OCA\Encryption\Crypto\Encryption;
 use OCA\Encryption\HookManager;
 use OCA\Encryption\Hooks\UserHooks;
@@ -42,6 +43,7 @@ use OCP\App;
 use OCP\AppFramework\IAppContainer;
 use OCP\Encryption\IManager;
 use OCP\IConfig;
+use Symfony\Component\Console\Helper\QuestionHelper;
 
 
 class Application extends \OCP\AppFramework\App {
@@ -111,6 +113,7 @@ class Application extends \OCP\AppFramework\App {
 				$container->query('Crypt'),
 				$container->query('KeyManager'),
 				$container->query('Util'),
+				$container->query('EncryptAll'),
 				$container->getServer()->getLogger(),
 				$container->getServer()->getL10N($container->getAppName())
 			);
@@ -195,7 +198,8 @@ class Application extends \OCP\AppFramework\App {
 				$server->getUserSession(),
 				$c->query('KeyManager'),
 				$c->query('Crypt'),
-				$c->query('Session')
+				$c->query('Session'),
+				$server->getSession()
 			);
 		});
 
@@ -221,6 +225,23 @@ class Application extends \OCP\AppFramework\App {
 					$server->getUserManager());
 			});
 
+		$container->registerService('EncryptAll',
+			function (IAppContainer $c) {
+				$server = $c->getServer();
+				return new EncryptAll(
+					$c->query('UserSetup'),
+					$c->getServer()->getUserManager(),
+					new View(),
+					$c->query('KeyManager'),
+					$server->getConfig(),
+					$server->getMailer(),
+					$server->getL10N('encryption'),
+					new QuestionHelper(),
+					$server->getSecureRandom()
+				);
+			}
+		);
+
 	}
 
 	public function registerSettings() {
diff --git a/apps/encryption/appinfo/register_command.php b/apps/encryption/appinfo/register_command.php
index 4fdf7ecec3..0f03b63560 100644
--- a/apps/encryption/appinfo/register_command.php
+++ b/apps/encryption/appinfo/register_command.php
@@ -21,10 +21,17 @@
  */
 
 use OCA\Encryption\Command\MigrateKeys;
+use Symfony\Component\Console\Helper\QuestionHelper;
 
 $userManager = OC::$server->getUserManager();
 $view = new \OC\Files\View();
 $config = \OC::$server->getConfig();
+$userSession = \OC::$server->getUserSession();
 $connection = \OC::$server->getDatabaseConnection();
 $logger = \OC::$server->getLogger();
+$questionHelper = new QuestionHelper();
+$crypt = new \OCA\Encryption\Crypto\Crypt($logger, $userSession, $config);
+$util = new \OCA\Encryption\Util($view, $crypt, $logger, $userSession, $config, $userManager);
+
 $application->add(new MigrateKeys($userManager, $view, $connection, $config, $logger));
+$application->add(new \OCA\Encryption\Command\EnableMasterKey($util, $config, $questionHelper));
diff --git a/apps/encryption/command/enablemasterkey.php b/apps/encryption/command/enablemasterkey.php
new file mode 100644
index 0000000000..f49579a3b8
--- /dev/null
+++ b/apps/encryption/command/enablemasterkey.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Encryption\Command;
+
+
+use OCA\Encryption\Util;
+use OCP\IConfig;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+class EnableMasterKey extends Command {
+
+	/** @var Util */
+	protected $util;
+
+	/** @var IConfig */
+	protected $config;
+
+	/** @var  QuestionHelper */
+	protected $questionHelper;
+
+	/**
+	 * @param Util $util
+	 * @param IConfig $config
+	 * @param QuestionHelper $questionHelper
+	 */
+	public function __construct(Util $util,
+								IConfig $config,
+								QuestionHelper $questionHelper) {
+
+		$this->util = $util;
+		$this->config = $config;
+		$this->questionHelper = $questionHelper;
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this
+			->setName('encryption:enable-master-key')
+			->setDescription('Enable the master key. Only available for fresh installations with no existing encrypted data! There is also no way to disable it again.');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+
+		$isAlreadyEnabled = $this->util->isMasterKeyEnabled();
+
+		if($isAlreadyEnabled) {
+			$output->writeln('Master key already enabled');
+		} else {
+			$question = new ConfirmationQuestion(
+				'Warning: Only available for fresh installations with no existing encrypted data! '
+			. 'There is also no way to disable it again. Do you want to continue? (y/n) ', false);
+			if ($this->questionHelper->ask($input, $output, $question)) {
+				$this->config->setAppValue('encryption', 'useMasterKey', '1');
+				$output->writeln('Master key successfully enabled.');
+			} else {
+				$output->writeln('aborted.');
+			}
+		}
+
+	}
+
+}
diff --git a/apps/encryption/controller/settingscontroller.php b/apps/encryption/controller/settingscontroller.php
index 641c97e1d6..8e6de19e78 100644
--- a/apps/encryption/controller/settingscontroller.php
+++ b/apps/encryption/controller/settingscontroller.php
@@ -31,6 +31,7 @@ use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IL10N;
 use OCP\IRequest;
+use OCP\ISession;
 use OCP\IUserManager;
 use OCP\IUserSession;
 
@@ -54,6 +55,9 @@ class SettingsController extends Controller {
 	/** @var Session */
 	private $session;
 
+	/** @var ISession  */
+	private $ocSession;
+
 	/**
 	 * @param string $AppName
 	 * @param IRequest $request
@@ -63,6 +67,7 @@ class SettingsController extends Controller {
 	 * @param KeyManager $keyManager
 	 * @param Crypt $crypt
 	 * @param Session $session
+	 * @param ISession $ocSession
 	 */
 	public function __construct($AppName,
 								IRequest $request,
@@ -71,7 +76,8 @@ class SettingsController extends Controller {
 								IUserSession $userSession,
 								KeyManager $keyManager,
 								Crypt $crypt,
-								Session $session) {
+								Session $session,
+								ISession $ocSession) {
 		parent::__construct($AppName, $request);
 		$this->l = $l10n;
 		$this->userSession = $userSession;
@@ -79,6 +85,7 @@ class SettingsController extends Controller {
 		$this->keyManager = $keyManager;
 		$this->crypt = $crypt;
 		$this->session = $session;
+		$this->ocSession = $ocSession;
 	}
 
 
@@ -97,13 +104,20 @@ class SettingsController extends Controller {
 
 		//check if password is correct
 		$passwordCorrect = $this->userManager->checkPassword($uid, $newPassword);
+		if ($passwordCorrect === false) {
+			// if check with uid fails we need to check the password with the login name
+			// e.g. in the ldap case. For local user we need to check the password with
+			// the uid because in this case the login name is case insensitive
+			$loginName = $this->ocSession->get('loginname');
+			$passwordCorrect = $this->userManager->checkPassword($loginName, $newPassword);
+		}
 
 		if ($passwordCorrect !== false) {
 			$encryptedKey = $this->keyManager->getPrivateKey($uid);
-			$decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword);
+			$decryptedKey = $this->crypt->decryptPrivateKey($encryptedKey, $oldPassword, $uid);
 
 			if ($decryptedKey) {
-				$encryptedKey = $this->crypt->symmetricEncryptFileContent($decryptedKey, $newPassword);
+				$encryptedKey = $this->crypt->encryptPrivateKey($decryptedKey, $newPassword, $uid);
 				$header = $this->crypt->generateHeader();
 				if ($encryptedKey) {
 					$this->keyManager->setPrivateKey($uid, $header . $encryptedKey);
diff --git a/apps/encryption/hooks/userhooks.php b/apps/encryption/hooks/userhooks.php
index a86b866278..8b6f17bec6 100644
--- a/apps/encryption/hooks/userhooks.php
+++ b/apps/encryption/hooks/userhooks.php
@@ -220,8 +220,7 @@ class UserHooks implements IHook {
 		if ($user && $params['uid'] === $user->getUID() && $privateKey) {
 
 			// Encrypt private key with new user pwd as passphrase
-			$encryptedPrivateKey = $this->crypt->symmetricEncryptFileContent($privateKey,
-				$params['password']);
+			$encryptedPrivateKey = $this->crypt->encryptPrivateKey($privateKey, $params['password'], $params['uid']);
 
 			// Save private key
 			if ($encryptedPrivateKey) {
@@ -259,8 +258,7 @@ class UserHooks implements IHook {
 				$this->keyManager->setPublicKey($user, $keyPair['publicKey']);
 
 				// Encrypt private key with new password
-				$encryptedKey = $this->crypt->symmetricEncryptFileContent($keyPair['privateKey'],
-					$newUserPassword);
+				$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $newUserPassword, $user);
 
 				if ($encryptedKey) {
 					$this->keyManager->setPrivateKey($user, $this->crypt->generateHeader() . $encryptedKey);
diff --git a/apps/encryption/l10n/ast.js b/apps/encryption/l10n/ast.js
index 94a164ff65..eb732bada5 100644
--- a/apps/encryption/l10n/ast.js
+++ b/apps/encryption/l10n/ast.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
+    "The share will expire on %s." : "La compartición va caducar el %s.",
+    "Cheers!" : "¡Salú!",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
     "Change Password" : "Camudar contraseña",
diff --git a/apps/encryption/l10n/ast.json b/apps/encryption/l10n/ast.json
index ecd1c2ff2e..501e4757ac 100644
--- a/apps/encryption/l10n/ast.json
+++ b/apps/encryption/l10n/ast.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Clave privada non válida pa Encryption. Por favor, anueva la to contraseña de clave nos tos axustes personales pa recuperar l'accesu a los tos ficheros cifraos.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicación Encryption ta habilitada pero les tos claves nun s'aniciaron, por favor zarra sesión y aníciala de nueves",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nun pudo descifrase esti ficheru, dablemente seya un ficheru compartíu. Solicita al propietariu del mesmu que vuelva a compartilu contigo.",
+    "The share will expire on %s." : "La compartición va caducar el %s.",
+    "Cheers!" : "¡Salú!",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
     "Change Password" : "Camudar contraseña",
diff --git a/apps/encryption/l10n/az.js b/apps/encryption/l10n/az.js
index a8897f9ec1..0b429f903f 100644
--- a/apps/encryption/l10n/az.js
+++ b/apps/encryption/l10n/az.js
@@ -20,6 +20,7 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifrələnmə proqramı üçün yalnış şəxsi açar. Xahiş olunur öz şəxsi quraşdırmalarınızda şəxsi açarınızı yeniləyəsiniz ki, şifrələnmiş fayllara yetki ala biləsiniz.   ",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu faylı deşifrə etmək olmur və ola bilər ki, bu paylaşımda olan fayldır. Xahiş olunur faylın sahibinə həmin faylı sizinlə yenidən paylaşım etməsini bildirəsiniz. ",
+    "Cheers!" : "Şərəfə!",
     "Recovery key password" : "Açar şifrənin bərpa edilməsi",
     "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
     "Change Password" : "Şifrəni dəyişdir",
diff --git a/apps/encryption/l10n/az.json b/apps/encryption/l10n/az.json
index 1dae4fbeaf..fc5ab73b8b 100644
--- a/apps/encryption/l10n/az.json
+++ b/apps/encryption/l10n/az.json
@@ -18,6 +18,7 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifrələnmə proqramı üçün yalnış şəxsi açar. Xahiş olunur öz şəxsi quraşdırmalarınızda şəxsi açarınızı yeniləyəsiniz ki, şifrələnmiş fayllara yetki ala biləsiniz.   ",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Proqram şifrələnməsi işə salınıb ancaq, sizin açarlar inisializasiya edilməyib. Xahiş edilir çıxıb yenidən daxil olasınız",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu faylı deşifrə etmək olmur və ola bilər ki, bu paylaşımda olan fayldır. Xahiş olunur faylın sahibinə həmin faylı sizinlə yenidən paylaşım etməsini bildirəsiniz. ",
+    "Cheers!" : "Şərəfə!",
     "Recovery key password" : "Açar şifrənin bərpa edilməsi",
     "Change recovery key password:" : "Bərpa açarın şifrəsini dəyişdir:",
     "Change Password" : "Şifrəni dəyişdir",
diff --git a/apps/encryption/l10n/bg_BG.js b/apps/encryption/l10n/bg_BG.js
index 0a5de0eab8..f099d9462b 100644
--- a/apps/encryption/l10n/bg_BG.js
+++ b/apps/encryption/l10n/bg_BG.js
@@ -20,6 +20,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
+    "The share will expire on %s." : "Споделянето ще изтече на %s.",
+    "Cheers!" : "Поздрави!",
     "Recovery key password" : "Парола за възстановяане на ключа",
     "Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
     "Change Password" : "Промени Паролата",
diff --git a/apps/encryption/l10n/bg_BG.json b/apps/encryption/l10n/bg_BG.json
index 1272941719..d4aa2e521c 100644
--- a/apps/encryption/l10n/bg_BG.json
+++ b/apps/encryption/l10n/bg_BG.json
@@ -18,6 +18,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
+    "The share will expire on %s." : "Споделянето ще изтече на %s.",
+    "Cheers!" : "Поздрави!",
     "Recovery key password" : "Парола за възстановяане на ключа",
     "Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
     "Change Password" : "Промени Паролата",
diff --git a/apps/encryption/l10n/bn_BD.js b/apps/encryption/l10n/bn_BD.js
index f91008e240..2d20f4caa2 100644
--- a/apps/encryption/l10n/bn_BD.js
+++ b/apps/encryption/l10n/bn_BD.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
     "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
     "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
+    "Cheers!" : "শুভেচ্ছা!",
     "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
     "Change Password" : "কূটশব্দ পরিবর্তন করুন",
     "Enabled" : "কার্যকর",
diff --git a/apps/encryption/l10n/bn_BD.json b/apps/encryption/l10n/bn_BD.json
index 375bbd517a..4c2c9c14b9 100644
--- a/apps/encryption/l10n/bn_BD.json
+++ b/apps/encryption/l10n/bn_BD.json
@@ -2,6 +2,7 @@
     "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
     "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
     "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
+    "Cheers!" : "শুভেচ্ছা!",
     "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
     "Change Password" : "কূটশব্দ পরিবর্তন করুন",
     "Enabled" : "কার্যকর",
diff --git a/apps/encryption/l10n/bs.js b/apps/encryption/l10n/bs.js
index bd38f94486..41d7074d5a 100644
--- a/apps/encryption/l10n/bs.js
+++ b/apps/encryption/l10n/bs.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
     "Enabled" : "Aktivirano",
     "Disabled" : "Onemogućeno"
 },
diff --git a/apps/encryption/l10n/bs.json b/apps/encryption/l10n/bs.json
index 4d858dbb96..0beb35f155 100644
--- a/apps/encryption/l10n/bs.json
+++ b/apps/encryption/l10n/bs.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molim ažurirajte lozinku svoga privatnog ključa u svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je uključena, ali vaši ključevi nisu inicializirani, molim odjavite se i ponovno prijavite",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
     "Enabled" : "Aktivirano",
     "Disabled" : "Onemogućeno"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/encryption/l10n/ca.js b/apps/encryption/l10n/ca.js
index e160a23b72..9a318f2d4c 100644
--- a/apps/encryption/l10n/ca.js
+++ b/apps/encryption/l10n/ca.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.",
+    "The share will expire on %s." : "La compartició venç el %s.",
+    "Cheers!" : "Salut!",
     "Recovery key password" : "Clau de recuperació de la contrasenya",
     "Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
     "Change Password" : "Canvia la contrasenya",
diff --git a/apps/encryption/l10n/ca.json b/apps/encryption/l10n/ca.json
index 464c6e8634..b172da4a0d 100644
--- a/apps/encryption/l10n/ca.json
+++ b/apps/encryption/l10n/ca.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No es pot desencriptar aquest fitxer, probablement és un fitxer compartit. Demaneu al propietari del fitxer que el comparteixi de nou amb vós.",
+    "The share will expire on %s." : "La compartició venç el %s.",
+    "Cheers!" : "Salut!",
     "Recovery key password" : "Clau de recuperació de la contrasenya",
     "Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
     "Change Password" : "Canvia la contrasenya",
diff --git a/apps/encryption/l10n/cs_CZ.js b/apps/encryption/l10n/cs_CZ.js
index 7b138c8008..661731c31d 100644
--- a/apps/encryption/l10n/cs_CZ.js
+++ b/apps/encryption/l10n/cs_CZ.js
@@ -25,8 +25,11 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
     "Encryption App is enabled and ready" : "Aplikace šifrování je již povolena",
+    "one-time password for server-side-encryption" : "jednorázové heslo pro šifrování na straně serveru",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.",
+    "The share will expire on %s." : "Sdílení vyprší %s.",
+    "Cheers!" : "Ať slouží!",
     "Enable recovery key" : "Povolit záchranný klíč",
     "Disable recovery key" : "Vypnout záchranný klíč",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.",
diff --git a/apps/encryption/l10n/cs_CZ.json b/apps/encryption/l10n/cs_CZ.json
index ab0fd8b2e4..1b530d137e 100644
--- a/apps/encryption/l10n/cs_CZ.json
+++ b/apps/encryption/l10n/cs_CZ.json
@@ -23,8 +23,11 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste",
     "Encryption App is enabled and ready" : "Aplikace šifrování je již povolena",
+    "one-time password for server-side-encryption" : "jednorázové heslo pro šifrování na straně serveru",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento soubor se nepodařilo dešifrovat, pravděpodobně je sdílený. Požádejte prosím majitele souboru, aby jej s vámi znovu sdílel.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Soubor nelze načíst, pravděpodobně se jedná o sdílený soubor. Požádejte prosím vlastníka souboru, aby vám jej znovu sdílel.",
+    "The share will expire on %s." : "Sdílení vyprší %s.",
+    "Cheers!" : "Ať slouží!",
     "Enable recovery key" : "Povolit záchranný klíč",
     "Disable recovery key" : "Vypnout záchranný klíč",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Záchranný klíč je dodatečný šifrovací klíč použitý pro\nšifrování souborů. S jeho pomocí lze obnovit soubory uživatele při zapomenutí hesla.",
diff --git a/apps/encryption/l10n/da.js b/apps/encryption/l10n/da.js
index 5d97843f77..b5ca0a29e0 100644
--- a/apps/encryption/l10n/da.js
+++ b/apps/encryption/l10n/da.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
     "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar",
+    "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
-    "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.",
+    "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig på ny.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hejsa,\n\nadministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
+    "The share will expire on %s." : "Delingen vil udløbe om %s.",
+    "Cheers!" : "Hej!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hejsa,<br><br>administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet <strong>%s</strong>.<br><br>Venligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.<br><br>",
     "Enable recovery key" : "Aktivér gendannelsesnøgle",
     "Disable recovery key" : "Deaktivér gendannelsesnøgle",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.",
diff --git a/apps/encryption/l10n/da.json b/apps/encryption/l10n/da.json
index d90d030f45..1ead926ca7 100644
--- a/apps/encryption/l10n/da.json
+++ b/apps/encryption/l10n/da.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgler er ikke igangsat. Log venligst ud og ind igen.",
     "Encryption App is enabled and ready" : "App til kryptering er slået til og er klar",
+    "one-time password for server-side-encryption" : "Engangs password for kryptering på serverdelen",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke kryptere denne fil, sandsynligvis fordi filen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
-    "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig påny.",
+    "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke læse denne fil, sandsynligvis fordi det er en delt fil. Bed venligst ejeren af filen om at dele filen med dig på ny.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hejsa,\n\nadministrator aktiveret kryptering på serverdelen. '%s'.\n\nVenligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.\n\n",
+    "The share will expire on %s." : "Delingen vil udløbe om %s.",
+    "Cheers!" : "Hej!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hejsa,<br><br>administrator aktiveret kryptering på serverdelen. Dine file er blevet krypteret med kodeordet <strong>%s</strong>.<br><br>Venligst log på web brugerfladen, gå til sektionen \"ownCloud grundlæggende krypterings modul\" for din personlige opsætninger og opdater dine krypterings kodeord ved at indtaste dette kodeord i \"gamle kodeord log\" feltet samt dit nuværende kodeord.<br><br>",
     "Enable recovery key" : "Aktivér gendannelsesnøgle",
     "Disable recovery key" : "Deaktivér gendannelsesnøgle",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gendannelsesnøglen er en ekstra krypteringsnøgle, der bruges til at kryptere filer. Den tillader gendannelse af en brugers filer, hvis brugeren glemmer sin adgangskode.",
diff --git a/apps/encryption/l10n/de.js b/apps/encryption/l10n/de.js
index df1566adb2..18e74fb9ed 100644
--- a/apps/encryption/l10n/de.js
+++ b/apps/encryption/l10n/de.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein oder ihr Passwort vergessen hat.",
diff --git a/apps/encryption/l10n/de.json b/apps/encryption/l10n/de.json
index 1fe237562f..e15fe7e1cd 100644
--- a/apps/encryption/l10n/de.json
+++ b/apps/encryption/l10n/de.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktiere den Eigentümer der Datei und bitte darum, die Datei noch einmal mit Dir zu teilen.",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein oder ihr Passwort vergessen hat.",
diff --git a/apps/encryption/l10n/de_DE.js b/apps/encryption/l10n/de_DE.js
index 5d5911c91e..eb87c99825 100644
--- a/apps/encryption/l10n/de_DE.js
+++ b/apps/encryption/l10n/de_DE.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.",
diff --git a/apps/encryption/l10n/de_DE.json b/apps/encryption/l10n/de_DE.json
index f67d5dfd4c..8971978dd7 100644
--- a/apps/encryption/l10n/de_DE.json
+++ b/apps/encryption/l10n/de_DE.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Verschlüsselungs-App ist aktiviert und bereit",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht entschlüsselt werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Diese Datei kann nicht gelesen werden, es handelt sich wahrscheinlich um eine geteilte Datei. Bitte kontaktieren Sie den Eigentümer der Datei und bitten Sie darum, die Datei noch einmal mit Ihnen zu teilen.",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Enable recovery key" : "Wiederherstellungsschlüssel aktivieren",
     "Disable recovery key" : "Wiederherstellungsschlüssel deaktivieren",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Der Wiederherstellungsschlüssel ist ein zusätzlicher Verschlüsselungsschlüssel, der zum Verschlüsseln von Dateien benutzt wird. Er erlaubt die Wiederherstellung von Benutzerdateien auch dann, wenn der Benutzer sein Passwort vergessen hat.",
diff --git a/apps/encryption/l10n/el.js b/apps/encryption/l10n/el.js
index 078b66d678..d27098ddb0 100644
--- a/apps/encryption/l10n/el.js
+++ b/apps/encryption/l10n/el.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
     "Encryption App is enabled and ready" : "Η Εφαρμογή Κρυπτογράφησης είναι ενεργοποιημένη και έτοιμη.",
+    "one-time password for server-side-encryption" : "κωδικός μιας χρήσης για κρυπτογράφηση στο διακομιστή",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Αδυναμία ανάγνωσης αυτού του αρχείου, πιθανό να είναι διαμοιραζόμενο αρχείο. Παρακαλώ ρωτήστε τον κάτοχο του αρχείου να το διαμοιράσει ξανά μαζί σας.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Χαίρετε,\n\nο διαχειριστής ενεργοποίηση την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό '%s'.\n\nΠαρακαλούμε συνδεθείτε στη διεπαφή ιστού, πηγαίνετε στην ενότητα 'μονάδα βασικής κρυπτογράφησης ownCloud' στις προσωπικές σας ρυθμίσεις και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο 'παλιός κωδικός σύνδεσης' και τον τωρινό σας κωδικό σύνδεσης.\n",
+    "The share will expire on %s." : "Ο διαμοιρασμός θα λήξει σε %s.",
+    "Cheers!" : "Χαιρετισμούς!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Χαίρετε,<br><br>ο διαχειριστής ενεργοποίησε την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό <strong>%s</strong>.<br><br>Παρακαλούμε συνδεθείτε στη διεπαφή ιστού, πηγαίνετε στην ενότητα \"μονάδα βασικής κρυπτογράφησης ownCloud\" τωνπ ροσωπικών σας ρυθμίσεων και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο \"παλιός κωδικός σύνδεσης\" και τον τωρινό σας κωδικό σύνδεσης.",
     "Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης",
     "Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.",
diff --git a/apps/encryption/l10n/el.json b/apps/encryption/l10n/el.json
index c50f4cf938..3ed5e39b7c 100644
--- a/apps/encryption/l10n/el.json
+++ b/apps/encryption/l10n/el.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
     "Encryption App is enabled and ready" : "Η Εφαρμογή Κρυπτογράφησης είναι ενεργοποιημένη και έτοιμη.",
+    "one-time password for server-side-encryption" : "κωδικός μιας χρήσης για κρυπτογράφηση στο διακομιστή",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Αδυναμία ανάγνωσης αυτού του αρχείου, πιθανό να είναι διαμοιραζόμενο αρχείο. Παρακαλώ ρωτήστε τον κάτοχο του αρχείου να το διαμοιράσει ξανά μαζί σας.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Χαίρετε,\n\nο διαχειριστής ενεργοποίηση την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό '%s'.\n\nΠαρακαλούμε συνδεθείτε στη διεπαφή ιστού, πηγαίνετε στην ενότητα 'μονάδα βασικής κρυπτογράφησης ownCloud' στις προσωπικές σας ρυθμίσεις και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο 'παλιός κωδικός σύνδεσης' και τον τωρινό σας κωδικό σύνδεσης.\n",
+    "The share will expire on %s." : "Ο διαμοιρασμός θα λήξει σε %s.",
+    "Cheers!" : "Χαιρετισμούς!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Χαίρετε,<br><br>ο διαχειριστής ενεργοποίησε την κρυπτογράφηση στο διακομιστή. Τα αρχεία σας κρυπτογραφήθηκαν με τον κωδικό <strong>%s</strong>.<br><br>Παρακαλούμε συνδεθείτε στη διεπαφή ιστού, πηγαίνετε στην ενότητα \"μονάδα βασικής κρυπτογράφησης ownCloud\" τωνπ ροσωπικών σας ρυθμίσεων και ενημερώστε τον κωδικό κρυπτογράφησης εισάγοντας αυτό τον κωδικό στο πεδίο \"παλιός κωδικός σύνδεσης\" και τον τωρινό σας κωδικό σύνδεσης.",
     "Enable recovery key" : "Ενεργοποίηση κλειδιού ανάκτησης",
     "Disable recovery key" : "Απενεργοποίηση κλειδιού ανάκτησης",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Το κλειδί ανάκτησης είναι ένα επιπλέον κλειδί κρυπτογράφησης που χρησιμοποιείται για να κρυπτογραφήσει αρχεία. Επιτρέπει την ανάκτηση των αρχείων ενός χρήστη αν αυτός/αυτή ξεχάσει τον κωδικό πρόσβασης.",
diff --git a/apps/encryption/l10n/en_GB.js b/apps/encryption/l10n/en_GB.js
index 13b103dee1..50835a334f 100644
--- a/apps/encryption/l10n/en_GB.js
+++ b/apps/encryption/l10n/en_GB.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Encryption App is enabled and ready",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.",
+    "The share will expire on %s." : "The share will expire on %s.",
+    "Cheers!" : "Cheers!",
     "Enable recovery key" : "Enable recovery key",
     "Disable recovery key" : "Disable recovery key",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.",
diff --git a/apps/encryption/l10n/en_GB.json b/apps/encryption/l10n/en_GB.json
index e1d20385f6..3c2e115290 100644
--- a/apps/encryption/l10n/en_GB.json
+++ b/apps/encryption/l10n/en_GB.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Encryption App is enabled and ready",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Cannot decrypt this file, which is probably a shared file. Please ask the file owner to reshare the file with you.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you.",
+    "The share will expire on %s." : "The share will expire on %s.",
+    "Cheers!" : "Cheers!",
     "Enable recovery key" : "Enable recovery key",
     "Disable recovery key" : "Disable recovery key",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password.",
diff --git a/apps/encryption/l10n/es.js b/apps/encryption/l10n/es.js
index cd800250be..cadedbcc0d 100644
--- a/apps/encryption/l10n/es.js
+++ b/apps/encryption/l10n/es.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
     "Encryption App is enabled and ready" : "Cifrado App está habilitada y lista",
+    "one-time password for server-side-encryption" : "Contraseña de un solo uso para el cifrado en el lado servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hola,\n\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:  '%s'.\n\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.\n\n",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hola,\n<br><br>\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:   <strong>%s</strong>\n<br><br>\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.<br><br>",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
diff --git a/apps/encryption/l10n/es.json b/apps/encryption/l10n/es.json
index 69c14e008c..9bdad94cb6 100644
--- a/apps/encryption/l10n/es.json
+++ b/apps/encryption/l10n/es.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
     "Encryption App is enabled and ready" : "Cifrado App está habilitada y lista",
+    "one-time password for server-side-encryption" : "Contraseña de un solo uso para el cifrado en el lado servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente sea un archivo compartido. Consulte con el propietario del mismo y que lo vuelva a compartir con usted.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hola,\n\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:  '%s'.\n\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.\n\n",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hola,\n<br><br>\nEl administrador ha habilitado el cifrado del lado servidor. Sus archivos serán cifrados usando como contraseña:   <strong>%s</strong>\n<br><br>\nPor favor logese en el interfaz web, vaya a la sección , 'Modulo básico de cifrado' de sus opciones personales y actualice su contraseña tecleando esta contraseña en el campo 'contraseña antigua' e introduciendo la neva en su correspondiente campo.<br><br>",
     "Enable recovery key" : "Activa la clave de recuperación",
     "Disable recovery key" : "Desactiva la clave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clave de recuperación es una clave de cifrado extra que se usa para cifrar ficheros. Permite la recuperación de los ficheros de un usuario si él o ella olvida su contraseña.",
diff --git a/apps/encryption/l10n/es_AR.js b/apps/encryption/l10n/es_AR.js
index e2fed7c3d3..bff5b7c593 100644
--- a/apps/encryption/l10n/es_AR.js
+++ b/apps/encryption/l10n/es_AR.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pídele al dueño que recomparta el archivo contigo.",
+    "The share will expire on %s." : "El compartir expirará en %s.",
+    "Cheers!" : "¡Saludos!",
     "Recovery key password" : "Contraseña de recuperación de clave",
     "Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
     "Change Password" : "Cambiar contraseña",
diff --git a/apps/encryption/l10n/es_AR.json b/apps/encryption/l10n/es_AR.json
index b938c1d6e3..0cdcd9cd12 100644
--- a/apps/encryption/l10n/es_AR.json
+++ b/apps/encryption/l10n/es_AR.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pídele al dueño que recomparta el archivo contigo.",
+    "The share will expire on %s." : "El compartir expirará en %s.",
+    "Cheers!" : "¡Saludos!",
     "Recovery key password" : "Contraseña de recuperación de clave",
     "Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
     "Change Password" : "Cambiar contraseña",
diff --git a/apps/encryption/l10n/es_MX.js b/apps/encryption/l10n/es_MX.js
index 12836faa54..ad94a24e11 100644
--- a/apps/encryption/l10n/es_MX.js
+++ b/apps/encryption/l10n/es_MX.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
     "Change Password" : "Cambiar contraseña",
diff --git a/apps/encryption/l10n/es_MX.json b/apps/encryption/l10n/es_MX.json
index f8332799f1..5a64c7c877 100644
--- a/apps/encryption/l10n/es_MX.json
+++ b/apps/encryption/l10n/es_MX.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No fue posible descifrar este archivo, probablemente se trate de un archivo compartido. Solicite al propietario del mismo que vuelva a compartirlo con usted.",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
     "Recovery key password" : "Contraseña de clave de recuperación",
     "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
     "Change Password" : "Cambiar contraseña",
diff --git a/apps/encryption/l10n/et_EE.js b/apps/encryption/l10n/et_EE.js
index 0c33015cdf..501772c280 100644
--- a/apps/encryption/l10n/et_EE.js
+++ b/apps/encryption/l10n/et_EE.js
@@ -14,6 +14,8 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
     "Password successfully changed." : "Parool edukalt vahetatud.",
     "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+    "Recovery Key disabled" : "Taastevõti on välja lülitatud",
+    "Recovery Key enabled" : "Taastevõti on sisse lülitatud",
     "Could not update the private key password." : "Ei suutnud uuendada privaatse võtme parooli.",
     "The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.",
     "The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.",
@@ -21,8 +23,16 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
+    "The share will expire on %s." : "Jagamine aegub %s.",
+    "Cheers!" : "Terekest!",
+    "Enable recovery key" : "Luba taastevõtme kasutamine",
+    "Disable recovery key" : "Keela taastevõtme kasutamine",
     "Recovery key password" : "Taastevõtme parool",
+    "Repeat recovery key password" : "Korda taastevõtme parooli",
     "Change recovery key password:" : "Muuda taastevõtme parooli:",
+    "Old recovery key password" : "Vana taastevõtme parool",
+    "New recovery key password" : "Uus taastevõtme parool",
+    "Repeat new recovery key password" : "Korda uut taastevõtme parooli",
     "Change Password" : "Muuda parooli",
     "Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
     "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
diff --git a/apps/encryption/l10n/et_EE.json b/apps/encryption/l10n/et_EE.json
index 1f8f74dc7f..14d4c59f9f 100644
--- a/apps/encryption/l10n/et_EE.json
+++ b/apps/encryption/l10n/et_EE.json
@@ -12,6 +12,8 @@
     "Please repeat the new recovery password" : "Palun korda uut taastevõtme parooli",
     "Password successfully changed." : "Parool edukalt vahetatud.",
     "Could not change the password. Maybe the old password was not correct." : "Ei suutnud vahetada parooli. Võib-olla on vana parool valesti sisestatud.",
+    "Recovery Key disabled" : "Taastevõti on välja lülitatud",
+    "Recovery Key enabled" : "Taastevõti on sisse lülitatud",
     "Could not update the private key password." : "Ei suutnud uuendada privaatse võtme parooli.",
     "The old password was not correct, please try again." : "Vana parool polnud õige, palun proovi uuesti.",
     "The current log-in password was not correct, please try again." : "Praeguse sisselogimise parool polnud õige, palun proovi uuesti.",
@@ -19,8 +21,16 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Sa ei saa seda faili dekrüpteerida, see on tõenäoliselt jagatud fail. Palun lase omanikul seda faili sinuga uuesti jagada.",
+    "The share will expire on %s." : "Jagamine aegub %s.",
+    "Cheers!" : "Terekest!",
+    "Enable recovery key" : "Luba taastevõtme kasutamine",
+    "Disable recovery key" : "Keela taastevõtme kasutamine",
     "Recovery key password" : "Taastevõtme parool",
+    "Repeat recovery key password" : "Korda taastevõtme parooli",
     "Change recovery key password:" : "Muuda taastevõtme parooli:",
+    "Old recovery key password" : "Vana taastevõtme parool",
+    "New recovery key password" : "Uus taastevõtme parool",
+    "Repeat new recovery key password" : "Korda uut taastevõtme parooli",
     "Change Password" : "Muuda parooli",
     "Your private key password no longer matches your log-in password." : "Sinu provaatvõtme parool ei kattu enam sinu sisselogimise parooliga.",
     "Set your old private key password to your current log-in password:" : "Pane oma vana privaatvõtme parooliks oma praegune sisselogimise parool.",
diff --git a/apps/encryption/l10n/eu.js b/apps/encryption/l10n/eu.js
index 1e0cffe466..1c8bdf4fa0 100644
--- a/apps/encryption/l10n/eu.js
+++ b/apps/encryption/l10n/eu.js
@@ -20,6 +20,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.",
+    "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
+    "Cheers!" : "Ongi izan!",
     "Recovery key password" : "Berreskuratze gako pasahitza",
     "Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
     "Change Password" : "Aldatu Pasahitza",
diff --git a/apps/encryption/l10n/eu.json b/apps/encryption/l10n/eu.json
index b896698f6d..0c07ebd477 100644
--- a/apps/encryption/l10n/eu.json
+++ b/apps/encryption/l10n/eu.json
@@ -18,6 +18,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ezin izan da fitxategi hau deszifratu, ziurrenik elkarbanatutako fitxategi bat da. Mesdez, eskatu fitxategiaren jabeari fitxategia zurekin berriz elkarbana dezan.",
+    "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
+    "Cheers!" : "Ongi izan!",
     "Recovery key password" : "Berreskuratze gako pasahitza",
     "Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
     "Change Password" : "Aldatu Pasahitza",
diff --git a/apps/encryption/l10n/fa.js b/apps/encryption/l10n/fa.js
index 493b3992a6..706491f45a 100644
--- a/apps/encryption/l10n/fa.js
+++ b/apps/encryption/l10n/fa.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
     "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
+    "Cheers!" : "سلامتی!",
     "Recovery key password" : "رمزعبور کلید بازیابی",
     "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
     "Change Password" : "تغییر رمزعبور",
diff --git a/apps/encryption/l10n/fa.json b/apps/encryption/l10n/fa.json
index ccb7949e7e..1071fd6e11 100644
--- a/apps/encryption/l10n/fa.json
+++ b/apps/encryption/l10n/fa.json
@@ -6,6 +6,7 @@
     "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
     "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
+    "Cheers!" : "سلامتی!",
     "Recovery key password" : "رمزعبور کلید بازیابی",
     "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
     "Change Password" : "تغییر رمزعبور",
diff --git a/apps/encryption/l10n/fi_FI.js b/apps/encryption/l10n/fi_FI.js
index a3ea0bf761..cac43eae16 100644
--- a/apps/encryption/l10n/fi_FI.js
+++ b/apps/encryption/l10n/fi_FI.js
@@ -25,8 +25,11 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
     "Encryption App is enabled and ready" : "Salaussovellus on käytössä ja valmis",
+    "one-time password for server-side-encryption" : "kertakäyttöinen salasana palvelinpään salausta varten",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.",
+    "The share will expire on %s." : "Jakaminen päättyy %s.",
+    "Cheers!" : "Kiitos!",
     "Enable recovery key" : "Ota palautusavain käyttöön",
     "Disable recovery key" : "Poista palautusavain käytöstä",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Palautusavain on ylimääräinen salausavain, jota käytetään tiedostojen salaamiseen. Sen avulla on mahdollista palauttaa käyttäjien tiedostot, vaikka käyttäjä unohtaisi oman salasanansa.",
diff --git a/apps/encryption/l10n/fi_FI.json b/apps/encryption/l10n/fi_FI.json
index 1c0faa5921..7f5bec24f8 100644
--- a/apps/encryption/l10n/fi_FI.json
+++ b/apps/encryption/l10n/fi_FI.json
@@ -23,8 +23,11 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Salaussovelluksen salausavain on virheellinen. Ole hyvä ja päivitä salausavain henkilökohtaisissa asetuksissasi jotta voit taas avata salatuskirjoitetut tiedostosi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Salaussovellus on käytössä, mutta salausavaimia ei ole alustettu. Ole hyvä ja kirjaudu sisään uudelleen.",
     "Encryption App is enabled and ready" : "Salaussovellus on käytössä ja valmis",
+    "one-time password for server-side-encryption" : "kertakäyttöinen salasana palvelinpään salausta varten",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tämän tiedoston salauksen purkaminen ei onnistu. Kyseessä on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto kanssasi uudelleen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tiedostoa ei voi lukea, se on luultavasti jaettu tiedosto. Pyydä tiedoston omistajaa jakamaan tiedosto uudelleen kanssasi.",
+    "The share will expire on %s." : "Jakaminen päättyy %s.",
+    "Cheers!" : "Kiitos!",
     "Enable recovery key" : "Ota palautusavain käyttöön",
     "Disable recovery key" : "Poista palautusavain käytöstä",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Palautusavain on ylimääräinen salausavain, jota käytetään tiedostojen salaamiseen. Sen avulla on mahdollista palauttaa käyttäjien tiedostot, vaikka käyttäjä unohtaisi oman salasanansa.",
diff --git a/apps/encryption/l10n/fr.js b/apps/encryption/l10n/fr.js
index 6eaf7b125a..0de35f8ec1 100644
--- a/apps/encryption/l10n/fr.js
+++ b/apps/encryption/l10n/fr.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée de chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de la clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
     "Encryption App is enabled and ready" : "L'application de chiffrement est activée et prête",
+    "one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous.  ",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjour,\n\nL'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel.\n",
+    "The share will expire on %s." : "Le partage expirera le %s.",
+    "Cheers!" : "À bientôt !",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>. <br><br>Veuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel. <br><br>",
     "Enable recovery key" : "Activer la clé de récupération",
     "Disable recovery key" : "Désactiver la clé de récupération",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
diff --git a/apps/encryption/l10n/fr.json b/apps/encryption/l10n/fr.json
index 8e319e87fd..3fa598a72c 100644
--- a/apps/encryption/l10n/fr.json
+++ b/apps/encryption/l10n/fr.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée de chiffrement n'est pas valide ! Veuillez mettre à jour le mot de passe de la clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'application de chiffrement est activée mais vos clefs ne sont pas initialisées. Veuillez vous déconnecter et ensuite vous reconnecter.",
     "Encryption App is enabled and ready" : "L'application de chiffrement est activée et prête",
+    "one-time password for server-side-encryption" : "Mot de passe à usage unique pour le chiffrement côté serveur",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de déchiffrer ce fichier : il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le partager à nouveau avec vous.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de lire ce fichier, il s'agit probablement d'un fichier partagé. Veuillez demander au propriétaire du fichier de le repartager avec vous.  ",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Bonjour,\n\nL'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe '%s'.\n\nVeuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel.\n",
+    "The share will expire on %s." : "Le partage expirera le %s.",
+    "Cheers!" : "À bientôt !",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Bonjour,<br><br>L'administrateur a activé le chiffrement côté serveur. Vos fichiers ont été chiffrés avec le mot de passe <strong>%s</strong>. <br><br>Veuillez vous connecté dans l'interface web, allez dans la section \"Module de chiffrement de base d'ownCloud\" de vos paramètres personnels. De là mettez à jour votre mot de passe de chiffrement en entrant ce mot de passe dans le champ \"Ancien mot de passe de connexion\" et votre mot de passe de connexion actuel. <br><br>",
     "Enable recovery key" : "Activer la clé de récupération",
     "Disable recovery key" : "Désactiver la clé de récupération",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clé de récupération est une clé supplémentaire utilisée pour chiffrer les fichiers. Elle permet de récupérer les fichiers des utilisateurs s'ils oublient leur mot de passe.",
diff --git a/apps/encryption/l10n/gl.js b/apps/encryption/l10n/gl.js
index b1c3891078..d6a5d03e93 100644
--- a/apps/encryption/l10n/gl.js
+++ b/apps/encryption/l10n/gl.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : " A aplicación de cifrado está activada e lista",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel descifrar o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que  volva compartir o ficheiro con vostede.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel ler o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que  volva compartir o ficheiro con vostede.",
+    "The share will expire on %s." : "Esta compartición caduca o %s.",
+    "Cheers!" : "Saúdos!",
     "Enable recovery key" : "Activar a chave de recuperación",
     "Disable recovery key" : "Desactivar a chave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperación é unha chave de cifrado adicional que se utiliza para cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se o usuario esquece o seu contrasinal.",
diff --git a/apps/encryption/l10n/gl.json b/apps/encryption/l10n/gl.json
index 4fa779248f..78c781acaa 100644
--- a/apps/encryption/l10n/gl.json
+++ b/apps/encryption/l10n/gl.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : " A aplicación de cifrado está activada e lista",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel descifrar o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que  volva compartir o ficheiro con vostede.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Non foi posíbel ler o ficheiro, probabelmente tratase dun ficheiro compartido. Pídalle ao propietario do ficheiro que  volva compartir o ficheiro con vostede.",
+    "The share will expire on %s." : "Esta compartición caduca o %s.",
+    "Cheers!" : "Saúdos!",
     "Enable recovery key" : "Activar a chave de recuperación",
     "Disable recovery key" : "Desactivar a chave de recuperación",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperación é unha chave de cifrado adicional que se utiliza para cifrar ficheiros. Permite a recuperación de ficheiros dun usuario se o usuario esquece o seu contrasinal.",
diff --git a/apps/encryption/l10n/hr.js b/apps/encryption/l10n/hr.js
index f6cf942edf..2965961be0 100644
--- a/apps/encryption/l10n/hr.js
+++ b/apps/encryption/l10n/hr.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molimo ažurirajte lozinku svoga privatnog ključa u svojim osobnimpostavkama da biste obnovili pristup svojim šifriranim datotekama.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće dešifrirati, vjerojatno je riječ o zajedničkoj datoteci. Molimopitajte vlasnika datoteke da je ponovo podijeli s vama.",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
     "Recovery key password" : "Lozinka ključa za oporavak",
     "Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
     "Change Password" : "Promijenite lozinku",
diff --git a/apps/encryption/l10n/hr.json b/apps/encryption/l10n/hr.json
index acfd057ec6..f526050840 100644
--- a/apps/encryption/l10n/hr.json
+++ b/apps/encryption/l10n/hr.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za šifriranje. Molimo ažurirajte lozinku svoga privatnog ključa u svojim osobnimpostavkama da biste obnovili pristup svojim šifriranim datotekama.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je aktivirana ali vaši ključevi nisu inicijalizirani, molimo odjavite se iponovno prijavite.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Ovu datoteku nije moguće dešifrirati, vjerojatno je riječ o zajedničkoj datoteci. Molimopitajte vlasnika datoteke da je ponovo podijeli s vama.",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
     "Recovery key password" : "Lozinka ključa za oporavak",
     "Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
     "Change Password" : "Promijenite lozinku",
diff --git a/apps/encryption/l10n/hu_HU.js b/apps/encryption/l10n/hu_HU.js
index 15611a77d0..d13459e490 100644
--- a/apps/encryption/l10n/hu_HU.js
+++ b/apps/encryption/l10n/hu_HU.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Az állományt nem sikerült dekódolni, valószínűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!",
+    "The share will expire on %s." : "A megosztás lejár ekkor %s",
+    "Cheers!" : "Üdv.",
     "Recovery key password" : "A helyreállítási kulcs jelszava",
     "Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
     "Change Password" : "Jelszó megváltoztatása",
diff --git a/apps/encryption/l10n/hu_HU.json b/apps/encryption/l10n/hu_HU.json
index 3214000e1a..2e77ff3018 100644
--- a/apps/encryption/l10n/hu_HU.json
+++ b/apps/encryption/l10n/hu_HU.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Az állományt nem sikerült dekódolni, valószínűleg ez egy megosztott fájl. Kérje meg az állomány tulajdonosát, hogy újra ossza meg Önnel ezt az állományt!",
+    "The share will expire on %s." : "A megosztás lejár ekkor %s",
+    "Cheers!" : "Üdv.",
     "Recovery key password" : "A helyreállítási kulcs jelszava",
     "Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
     "Change Password" : "Jelszó megváltoztatása",
diff --git a/apps/encryption/l10n/ia.js b/apps/encryption/l10n/ia.js
new file mode 100644
index 0000000000..27932deb15
--- /dev/null
+++ b/apps/encryption/l10n/ia.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "The share will expire on %s." : "Le compartir expirara le %s.",
+    "Cheers!" : "Acclamationes!"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/ia.json b/apps/encryption/l10n/ia.json
new file mode 100644
index 0000000000..a935ab07c5
--- /dev/null
+++ b/apps/encryption/l10n/ia.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "The share will expire on %s." : "Le compartir expirara le %s.",
+    "Cheers!" : "Acclamationes!"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/id.js b/apps/encryption/l10n/id.js
index e1de33fe15..1247b35bad 100644
--- a/apps/encryption/l10n/id.js
+++ b/apps/encryption/l10n/id.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
     "Encryption App is enabled and ready" : "Apl Enkripsi telah diaktifkan dan siap",
+    "one-time password for server-side-encryption" : "Sandi sekali pakai untuk server-side-encryption",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat membaca berkas ini, kemungkinan merupakan berkas berbagi. Silakan minta pemilik berkas untuk membagikan ulang kepada Anda.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hai,\n\nadmin mengaktifkan server-side-encryption. Berkas-berkas Anda dienkripsi menggunakan sandi '%s'.\n\nSilakan masuk di antarmuka web, pergi ke bagian 'modul enkripsi dasar ownCloud' pada pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini kedalam kolom 'sandi masuk yang lama' dan sandi-masuk saat ini.\n\n",
+    "The share will expire on %s." : "Pembagian akan berakhir pada %s.",
+    "Cheers!" : "Horee!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hai,<br><br>admin mengaktifkan server-side-encryption. Berkas-berkas Anda dienkripsi menggunakan sandi <strong>%s</strong>.<br><br>Silakan masuk di antarmuka web, pergi ke bagian 'modul enkripsi dasar ownCloud' pada pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini kedalam kolom 'sandi masuk yang lama' dan sandi masuk yang baru.<br><br>",
     "Enable recovery key" : "Aktifkan kunci pemulihan",
     "Disable recovery key" : "Nonaktifkan kunci pemulihan",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kunci pemulihan adalah kunci enkripsi tambahan yang digunakan untuk mengenkripsi berkas. Kunci pemulihan memungkinkan untuk memulihkan berkas-berkas pengguna ketika pengguna tersebut melupakan sandi mereka.",
diff --git a/apps/encryption/l10n/id.json b/apps/encryption/l10n/id.json
index 66d7f6c899..3771f7e935 100644
--- a/apps/encryption/l10n/id.json
+++ b/apps/encryption/l10n/id.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
     "Encryption App is enabled and ready" : "Apl Enkripsi telah diaktifkan dan siap",
+    "one-time password for server-side-encryption" : "Sandi sekali pakai untuk server-side-encryption",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat mendekripsi berkas ini, mungkin ini adalah berkas bersama. Silakan meminta pemilik berkas ini untuk membagikan kembali dengan Anda.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tidak dapat membaca berkas ini, kemungkinan merupakan berkas berbagi. Silakan minta pemilik berkas untuk membagikan ulang kepada Anda.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hai,\n\nadmin mengaktifkan server-side-encryption. Berkas-berkas Anda dienkripsi menggunakan sandi '%s'.\n\nSilakan masuk di antarmuka web, pergi ke bagian 'modul enkripsi dasar ownCloud' pada pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini kedalam kolom 'sandi masuk yang lama' dan sandi-masuk saat ini.\n\n",
+    "The share will expire on %s." : "Pembagian akan berakhir pada %s.",
+    "Cheers!" : "Horee!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hai,<br><br>admin mengaktifkan server-side-encryption. Berkas-berkas Anda dienkripsi menggunakan sandi <strong>%s</strong>.<br><br>Silakan masuk di antarmuka web, pergi ke bagian 'modul enkripsi dasar ownCloud' pada pengaturan pribadi Anda dan perbarui sandi enkripsi Anda dengan memasukkan sandi ini kedalam kolom 'sandi masuk yang lama' dan sandi masuk yang baru.<br><br>",
     "Enable recovery key" : "Aktifkan kunci pemulihan",
     "Disable recovery key" : "Nonaktifkan kunci pemulihan",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kunci pemulihan adalah kunci enkripsi tambahan yang digunakan untuk mengenkripsi berkas. Kunci pemulihan memungkinkan untuk memulihkan berkas-berkas pengguna ketika pengguna tersebut melupakan sandi mereka.",
diff --git a/apps/encryption/l10n/is.js b/apps/encryption/l10n/is.js
new file mode 100644
index 0000000000..afdf2b02f4
--- /dev/null
+++ b/apps/encryption/l10n/is.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "encryption",
+    {
+    "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
+    "Cheers!" : "Skál!"
+},
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/encryption/l10n/is.json b/apps/encryption/l10n/is.json
new file mode 100644
index 0000000000..6c56e00be8
--- /dev/null
+++ b/apps/encryption/l10n/is.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
+    "Cheers!" : "Skál!"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
+}
\ No newline at end of file
diff --git a/apps/encryption/l10n/it.js b/apps/encryption/l10n/it.js
index 9980396f6e..c0d42e17f7 100644
--- a/apps/encryption/l10n/it.js
+++ b/apps/encryption/l10n/it.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
     "Encryption App is enabled and ready" : "L'applicazione Cifratura è abilitata e pronta",
+    "one-time password for server-side-encryption" : "password monouso per la cifratura lato server",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile leggere questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Ciao,\n\nl'amministratore ha abilitato la cifratura lato server. I tuoi file sono stati\ncifrati utilizzando la password '%s'.\n\nAccedi all'interfaccia web, vai alla sezione 'modulo di cifratura base di ownCloud' dalle nelle tue impostazioni personali e aggiorna la tua password di cifratura digitando la password nel campo 'vecchia password di accesso' e la tua nuova password.\n\n",
+    "The share will expire on %s." : "La condivisione scadrà il %s.",
+    "Cheers!" : "Saluti!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Ciao,<br><br>l'amministratore ha abilitato la cifratura lato server. I tuoi file sono stati cifrati utilizzando la password <strong>%s</strong>.<br><br>Accedi all'interfaccia web, vai alla sezione \"modulo di cifratura base di ownCloud\" dalle nelle tue impostazioni personali e aggiorna la tua password di cifratura digitando la password nel campo \"vecchia password di accesso\" e la tua nuova password.",
     "Enable recovery key" : "Abilita chiave di ripristino",
     "Disable recovery key" : "Disabilita chiave di ripristino",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.",
@@ -37,7 +42,7 @@ OC.L10N.register(
     "New recovery key password" : "Nuova password della chiave di ripristino",
     "Repeat new recovery key password" : "Ripeti la nuova password della chiave di ripristino",
     "Change Password" : "Modifica password",
-    "ownCloud basic encryption module" : "Modulo di cifratura di base di ownCloud",
+    "ownCloud basic encryption module" : "Modulo di cifratura base di ownCloud",
     "Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
     "Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
diff --git a/apps/encryption/l10n/it.json b/apps/encryption/l10n/it.json
index 69b31b7d3d..ee3f487c54 100644
--- a/apps/encryption/l10n/it.json
+++ b/apps/encryption/l10n/it.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
     "Encryption App is enabled and ready" : "L'applicazione Cifratura è abilitata e pronta",
+    "one-time password for server-side-encryption" : "password monouso per la cifratura lato server",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile decifrare questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossibile leggere questo file, probabilmente è un file condiviso. Chiedi al proprietario del file di condividere nuovamente il file con te.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Ciao,\n\nl'amministratore ha abilitato la cifratura lato server. I tuoi file sono stati\ncifrati utilizzando la password '%s'.\n\nAccedi all'interfaccia web, vai alla sezione 'modulo di cifratura base di ownCloud' dalle nelle tue impostazioni personali e aggiorna la tua password di cifratura digitando la password nel campo 'vecchia password di accesso' e la tua nuova password.\n\n",
+    "The share will expire on %s." : "La condivisione scadrà il %s.",
+    "Cheers!" : "Saluti!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Ciao,<br><br>l'amministratore ha abilitato la cifratura lato server. I tuoi file sono stati cifrati utilizzando la password <strong>%s</strong>.<br><br>Accedi all'interfaccia web, vai alla sezione \"modulo di cifratura base di ownCloud\" dalle nelle tue impostazioni personali e aggiorna la tua password di cifratura digitando la password nel campo \"vecchia password di accesso\" e la tua nuova password.",
     "Enable recovery key" : "Abilita chiave di ripristino",
     "Disable recovery key" : "Disabilita chiave di ripristino",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La chiave di ripristino è una chiave di cifratura aggiuntiva utilizzata per cifrare i file. Consente di ripristinare i file di un utente se l'utente dimentica la propria password.",
@@ -35,7 +40,7 @@
     "New recovery key password" : "Nuova password della chiave di ripristino",
     "Repeat new recovery key password" : "Ripeti la nuova password della chiave di ripristino",
     "Change Password" : "Modifica password",
-    "ownCloud basic encryption module" : "Modulo di cifratura di base di ownCloud",
+    "ownCloud basic encryption module" : "Modulo di cifratura base di ownCloud",
     "Your private key password no longer matches your log-in password." : "La password della chiave privata non corrisponde più alla password di accesso.",
     "Set your old private key password to your current log-in password:" : "Imposta la vecchia password della chiave privata sull'attuale password di accesso:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Se non ricordi la vecchia password puoi chiedere al tuo amministratore di recuperare i file.",
diff --git a/apps/encryption/l10n/ja.js b/apps/encryption/l10n/ja.js
index f76b215fe1..5c4f470def 100644
--- a/apps/encryption/l10n/ja.js
+++ b/apps/encryption/l10n/ja.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "暗号化アプリは有効になっており、準備が整いました",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを読み取ることができません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
+    "The share will expire on %s." : "共有は %s で有効期限が切れます。",
+    "Cheers!" : "それでは！",
     "Enable recovery key" : "復旧キーを有効にする",
     "Disable recovery key" : "復旧キーを無効にする",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザのファイルを復元することができます。",
diff --git a/apps/encryption/l10n/ja.json b/apps/encryption/l10n/ja.json
index 58b32ebdd2..9e04dd87f8 100644
--- a/apps/encryption/l10n/ja.json
+++ b/apps/encryption/l10n/ja.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "暗号化アプリは有効になっており、準備が整いました",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを読み取ることができません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
+    "The share will expire on %s." : "共有は %s で有効期限が切れます。",
+    "Cheers!" : "それでは！",
     "Enable recovery key" : "復旧キーを有効にする",
     "Disable recovery key" : "復旧キーを無効にする",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "復旧キーは、ファイルの暗号化に使う特別な暗号化キーです。ユーザがパスワードを忘れてしまった場合には、リカバリキーを使ってユーザのファイルを復元することができます。",
diff --git a/apps/encryption/l10n/kn.js b/apps/encryption/l10n/kn.js
index aca1cf249b..3f0108db17 100644
--- a/apps/encryption/l10n/kn.js
+++ b/apps/encryption/l10n/kn.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "encryption",
     {
+    "Cheers!" : "ಆನಂದಿಸಿ !",
     "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
     "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
 },
diff --git a/apps/encryption/l10n/kn.json b/apps/encryption/l10n/kn.json
index 8387e3890d..3b78ba1f13 100644
--- a/apps/encryption/l10n/kn.json
+++ b/apps/encryption/l10n/kn.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Cheers!" : "ಆನಂದಿಸಿ !",
     "Enabled" : "ಸಕ್ರಿಯಗೊಳಿಸಿದೆ",
     "Disabled" : "ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/encryption/l10n/ko.js b/apps/encryption/l10n/ko.js
index 891265e8c9..8bf099b6b3 100644
--- a/apps/encryption/l10n/ko.js
+++ b/apps/encryption/l10n/ko.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
     "Encryption App is enabled and ready" : "암호화 앱이 활성화되었고 준비됨",
+    "one-time password for server-side-encryption" : "서버 측 암호화용 일회용 암호",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 읽을 수 없습니다. 공유된 파일이라면 파일 소유자에게 연락하여 다시 공유해 달라고 요청하십시오.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "안녕하세요,\n\n시스템 관리자가 서버 측 암호화를 활성화하였습니다. 저장된 파일이 암호 '%s'으(로) 암호화되었습니다.\n\n웹 인터페이스에 로그인하여 개인 설정의 'ownCloud 기본 암호화 모듈'로 이동한 다음, '이전 로그인 암호' 필드에 위 암호를 입력하고 현재 로그인 암호로 변경하여 암호화 암호를 업데이트하십시오.\n\n",
+    "The share will expire on %s." : "이 공유는 %s 까지 유지됩니다.",
+    "Cheers!" : "감사합니다!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "안녕하세요,<br><br>시스템 관리자가 서버 측 암호화를 활성화하였습니다. 저장된 파일이 암호 <strong>%s</strong>으(로) 암호화되었습니다.<br><br>웹 인터페이스에 로그인하여 개인 설정의 'ownCloud 기본 암호화 모듈'로 이동한 다음, '이전 로그인 암호' 필드에 위 암호를 입력하고 현재 로그인 암호로 변경하여 암호화 암호를 업데이트하십시오.<br><br>",
     "Enable recovery key" : "복구 키 활성화",
     "Disable recovery key" : "복구 키 비활성화",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "복구 키는 파일을 암호화하는 추가 키입니다. 사용자가 암호를 잊었을 때 복구할 수 있도록 해 줍니다.",
diff --git a/apps/encryption/l10n/ko.json b/apps/encryption/l10n/ko.json
index 0231412e29..a6843bdda4 100644
--- a/apps/encryption/l10n/ko.json
+++ b/apps/encryption/l10n/ko.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
     "Encryption App is enabled and ready" : "암호화 앱이 활성화되었고 준비됨",
+    "one-time password for server-side-encryption" : "서버 측 암호화용 일회용 암호",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 읽을 수 없습니다. 공유된 파일이라면 파일 소유자에게 연락하여 다시 공유해 달라고 요청하십시오.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "안녕하세요,\n\n시스템 관리자가 서버 측 암호화를 활성화하였습니다. 저장된 파일이 암호 '%s'으(로) 암호화되었습니다.\n\n웹 인터페이스에 로그인하여 개인 설정의 'ownCloud 기본 암호화 모듈'로 이동한 다음, '이전 로그인 암호' 필드에 위 암호를 입력하고 현재 로그인 암호로 변경하여 암호화 암호를 업데이트하십시오.\n\n",
+    "The share will expire on %s." : "이 공유는 %s 까지 유지됩니다.",
+    "Cheers!" : "감사합니다!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "안녕하세요,<br><br>시스템 관리자가 서버 측 암호화를 활성화하였습니다. 저장된 파일이 암호 <strong>%s</strong>으(로) 암호화되었습니다.<br><br>웹 인터페이스에 로그인하여 개인 설정의 'ownCloud 기본 암호화 모듈'로 이동한 다음, '이전 로그인 암호' 필드에 위 암호를 입력하고 현재 로그인 암호로 변경하여 암호화 암호를 업데이트하십시오.<br><br>",
     "Enable recovery key" : "복구 키 활성화",
     "Disable recovery key" : "복구 키 비활성화",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "복구 키는 파일을 암호화하는 추가 키입니다. 사용자가 암호를 잊었을 때 복구할 수 있도록 해 줍니다.",
diff --git a/apps/encryption/l10n/lb.js b/apps/encryption/l10n/lb.js
index 0e57555bb1..478426b6a1 100644
--- a/apps/encryption/l10n/lb.js
+++ b/apps/encryption/l10n/lb.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "encryption",
     {
+    "Cheers!" : "Prost!",
     "Change Password" : "Passwuert änneren",
     "Enabled" : "Aktivéiert",
     "Disabled" : "Deaktivéiert"
diff --git a/apps/encryption/l10n/lb.json b/apps/encryption/l10n/lb.json
index 08afbc43c8..53692b969e 100644
--- a/apps/encryption/l10n/lb.json
+++ b/apps/encryption/l10n/lb.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Cheers!" : "Prost!",
     "Change Password" : "Passwuert änneren",
     "Enabled" : "Aktivéiert",
     "Disabled" : "Deaktivéiert"
diff --git a/apps/encryption/l10n/lt_LT.js b/apps/encryption/l10n/lt_LT.js
index 03a825d1e3..627be83860 100644
--- a/apps/encryption/l10n/lt_LT.js
+++ b/apps/encryption/l10n/lt_LT.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.",
+    "The share will expire on %s." : "Bendrinimo laikas baigsis %s.",
+    "Cheers!" : "Sveikinimai!",
     "Recovery key password" : "Atkūrimo rakto slaptažodis",
     "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
     "Change Password" : "Pakeisti slaptažodį",
diff --git a/apps/encryption/l10n/lt_LT.json b/apps/encryption/l10n/lt_LT.json
index fcfee0f3e5..7a38dca5a9 100644
--- a/apps/encryption/l10n/lt_LT.json
+++ b/apps/encryption/l10n/lt_LT.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.",
+    "The share will expire on %s." : "Bendrinimo laikas baigsis %s.",
+    "Cheers!" : "Sveikinimai!",
     "Recovery key password" : "Atkūrimo rakto slaptažodis",
     "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
     "Change Password" : "Pakeisti slaptažodį",
diff --git a/apps/encryption/l10n/mk.js b/apps/encryption/l10n/mk.js
index f1abdd2f51..c2f503a449 100644
--- a/apps/encryption/l10n/mk.js
+++ b/apps/encryption/l10n/mk.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Password successfully changed." : "Лозинката е успешно променета.",
     "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
+    "Cheers!" : "Поздрав!",
     "Change Password" : "Смени лозинка",
     "Old log-in password" : "Старата лозинка за најавување",
     "Current log-in password" : "Тековната лозинка за најавување",
diff --git a/apps/encryption/l10n/mk.json b/apps/encryption/l10n/mk.json
index 112d818347..fb521ea75f 100644
--- a/apps/encryption/l10n/mk.json
+++ b/apps/encryption/l10n/mk.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Password successfully changed." : "Лозинката е успешно променета.",
     "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
+    "Cheers!" : "Поздрав!",
     "Change Password" : "Смени лозинка",
     "Old log-in password" : "Старата лозинка за најавување",
     "Current log-in password" : "Тековната лозинка за најавување",
diff --git a/apps/encryption/l10n/nb_NO.js b/apps/encryption/l10n/nb_NO.js
index 295621f9ca..d5ce661868 100644
--- a/apps/encryption/l10n/nb_NO.js
+++ b/apps/encryption/l10n/nb_NO.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
     "Encryption App is enabled and ready" : "Krypterings-appen er aktivert og klar",
+    "one-time password for server-side-encryption" : "engangspassord for serverkryptering",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke lese denne filen, som sannsynligvis er en delt fil. Be eieren av filen om å dele den med deg på nytt.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hei,\n\nAdministratoren har aktivert serverkryptering. Filene dine er blitt kryptert med passordet '%s'.\n\nVennligst logg inn på web-grensesnittet, gå til seksjonen 'ownCloud grunnleggende krypteringsmodul' i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet 'gammelt påloggingspassord' sammen med ditt nåværende påloggingspassord.\n\n",
+    "The share will expire on %s." : "Delingen vil opphøre %s.",
+    "Cheers!" : "Ha det!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hei,<br><br>Administratoren har aktivert serverkryptering. Filene dine er blitt kryptert med passordet <strong>%s</strong>.<br><br>Vennligst logg inn på web-grensesnittet, gå til seksjonen \"ownCloud grunnleggende krypteringsmodul\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet \"gammelt påloggingspassord\" sammen med ditt nåværende påloggingspassord.<br><br>",
     "Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
     "Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt.",
diff --git a/apps/encryption/l10n/nb_NO.json b/apps/encryption/l10n/nb_NO.json
index bb95014e96..8b3e8c1174 100644
--- a/apps/encryption/l10n/nb_NO.json
+++ b/apps/encryption/l10n/nb_NO.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
     "Encryption App is enabled and ready" : "Krypterings-appen er aktivert og klar",
+    "one-time password for server-side-encryption" : "engangspassord for serverkryptering",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ikke lese denne filen, som sannsynligvis er en delt fil. Be eieren av filen om å dele den med deg på nytt.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hei,\n\nAdministratoren har aktivert serverkryptering. Filene dine er blitt kryptert med passordet '%s'.\n\nVennligst logg inn på web-grensesnittet, gå til seksjonen 'ownCloud grunnleggende krypteringsmodul' i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet 'gammelt påloggingspassord' sammen med ditt nåværende påloggingspassord.\n\n",
+    "The share will expire on %s." : "Delingen vil opphøre %s.",
+    "Cheers!" : "Ha det!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hei,<br><br>Administratoren har aktivert serverkryptering. Filene dine er blitt kryptert med passordet <strong>%s</strong>.<br><br>Vennligst logg inn på web-grensesnittet, gå til seksjonen \"ownCloud grunnleggende krypteringsmodul\" i dine personlige innstillinger og oppdater krypteringspassordet ditt ved å legge inn dette passordet i feltet \"gammelt påloggingspassord\" sammen med ditt nåværende påloggingspassord.<br><br>",
     "Enable recovery key" : "Aktiver gjenopprettingsnøkkel",
     "Disable recovery key" : "Deaktiver gjenopprettingsnøkkel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Gjenopprettingsnøkkelen er en ekstra krypteringsnøkkel som brukes til å kryptere filer. Den tillater gjenoppretting av en brukers filer i tilfelle brukeren glemmer passordet sitt.",
diff --git a/apps/encryption/l10n/nl.js b/apps/encryption/l10n/nl.js
index 4a3115d46a..0655b6d29b 100644
--- a/apps/encryption/l10n/nl.js
+++ b/apps/encryption/l10n/nl.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
     "Encryption App is enabled and ready" : "Encryptie app is geactiveerd en gereed",
+    "one-time password for server-side-encryption" : "eenmalig wachtwoord voor server-side versleuteling",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met u te delen.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hallo daar,\n\nde beheerder heeft server-side versleuteling ingeschakeld. Uw bestanden werden versleuteld met het wachtwoord '%s'.\n\nLogin op de webinterface, ga naar 'ownCloud basis cryptomodule' in uw persoonlijke instellingen en pas uw cryptowachtwoord aan door dit wachtwoord in het 'oude inlog wachtwoord' veld in te vullen alsmede in uw huidige inlogwachtwoord.\n",
+    "The share will expire on %s." : "De share vervalt op %s.",
+    "Cheers!" : "Proficiat!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hallo daar,<br><br>de beheerder heeft server-side versleuteling ingeschakeld. Uw bestanden werden versleuteld met het wachtwoord <strong>%s</strong>.<br><br>Login op de webinterface, ga naar 'ownCloud basis cryptomodule' in uw persoonlijke instellingen en pas uw cryptowachtwoord aan door dit wachtwoord in het \"oude inlog wachtwoord\" veld in te vullen alsmede in uw huidige inlogwachtwoord.<br><br>",
     "Enable recovery key" : "Activeer herstelsleutel",
     "Disable recovery key" : "Deactiveer herstelsleutel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt om bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker zijn of haar wachtwoord vergeet.",
diff --git a/apps/encryption/l10n/nl.json b/apps/encryption/l10n/nl.json
index 1689a418f9..00f6e67822 100644
--- a/apps/encryption/l10n/nl.json
+++ b/apps/encryption/l10n/nl.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
     "Encryption App is enabled and ready" : "Encryptie app is geactiveerd en gereed",
+    "one-time password for server-side-encryption" : "eenmalig wachtwoord voor server-side versleuteling",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet ontcijferen, waarschijnlijk is het een gedeeld bestand, Vraag de eigenaar om het bestand opnieuw met u te delen.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan dit bestand niet lezen, waarschijnlijk is het een gedeeld bestand. Vraag de eigenaar om het bestand opnieuw met u te delen.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Hallo daar,\n\nde beheerder heeft server-side versleuteling ingeschakeld. Uw bestanden werden versleuteld met het wachtwoord '%s'.\n\nLogin op de webinterface, ga naar 'ownCloud basis cryptomodule' in uw persoonlijke instellingen en pas uw cryptowachtwoord aan door dit wachtwoord in het 'oude inlog wachtwoord' veld in te vullen alsmede in uw huidige inlogwachtwoord.\n",
+    "The share will expire on %s." : "De share vervalt op %s.",
+    "Cheers!" : "Proficiat!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Hallo daar,<br><br>de beheerder heeft server-side versleuteling ingeschakeld. Uw bestanden werden versleuteld met het wachtwoord <strong>%s</strong>.<br><br>Login op de webinterface, ga naar 'ownCloud basis cryptomodule' in uw persoonlijke instellingen en pas uw cryptowachtwoord aan door dit wachtwoord in het \"oude inlog wachtwoord\" veld in te vullen alsmede in uw huidige inlogwachtwoord.<br><br>",
     "Enable recovery key" : "Activeer herstelsleutel",
     "Disable recovery key" : "Deactiveer herstelsleutel",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "De herstelsleutel is een extra cryptografische sleutel die wordt gebruikt om bestanden te versleutelen. Die maakt het mogelijk bestanden te herstellen als de gebruiker zijn of haar wachtwoord vergeet.",
diff --git a/apps/encryption/l10n/oc.js b/apps/encryption/l10n/oc.js
index 34d8782b2f..8715fd378b 100644
--- a/apps/encryption/l10n/oc.js
+++ b/apps/encryption/l10n/oc.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "L'aplicacion de chiframent es activada e prèsta",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de deschifrar aqueste fichièr : s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo partejar tornamai amb vos.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de legir aqueste fichièr, s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo repartejar amb vos.  ",
+    "The share will expire on %s." : "Lo partiment expirarà lo %s.",
+    "Cheers!" : "A lèu !",
     "Enable recovery key" : "Activar la clau de recuperacion",
     "Disable recovery key" : "Desactivar la clau de recuperacion",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clau de recuperacion es una clau suplementària utilizada per chifrar los fichièrs. Permet de recuperar los fichièrs dels utilizaires se doblidan lor senhal.",
diff --git a/apps/encryption/l10n/oc.json b/apps/encryption/l10n/oc.json
index e3afad2db1..ec4406dd77 100644
--- a/apps/encryption/l10n/oc.json
+++ b/apps/encryption/l10n/oc.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "L'aplicacion de chiframent es activada e prèsta",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de deschifrar aqueste fichièr : s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo partejar tornamai amb vos.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Impossible de legir aqueste fichièr, s'agís probablament d'un fichièr partejat. Demandatz al proprietari del fichièr de lo repartejar amb vos.  ",
+    "The share will expire on %s." : "Lo partiment expirarà lo %s.",
+    "Cheers!" : "A lèu !",
     "Enable recovery key" : "Activar la clau de recuperacion",
     "Disable recovery key" : "Desactivar la clau de recuperacion",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "La clau de recuperacion es una clau suplementària utilizada per chifrar los fichièrs. Permet de recuperar los fichièrs dels utilizaires se doblidan lor senhal.",
diff --git a/apps/encryption/l10n/pl.js b/apps/encryption/l10n/pl.js
index 016671e88b..fda41f5714 100644
--- a/apps/encryption/l10n/pl.js
+++ b/apps/encryption/l10n/pl.js
@@ -20,6 +20,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnianie pliku Tobie.",
+    "The share will expire on %s." : "Ten zasób wygaśnie %s",
+    "Cheers!" : "Pozdrawiam!",
     "Recovery key password" : "Hasło klucza odzyskiwania",
     "Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
     "Change Password" : "Zmień hasło",
diff --git a/apps/encryption/l10n/pl.json b/apps/encryption/l10n/pl.json
index 3b6e4a18e4..7de8c5ad59 100644
--- a/apps/encryption/l10n/pl.json
+++ b/apps/encryption/l10n/pl.json
@@ -18,6 +18,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Nie można odszyfrować tego pliku, prawdopodobnie jest to plik udostępniony. Poproś właściciela pliku o ponowne udostępnianie pliku Tobie.",
+    "The share will expire on %s." : "Ten zasób wygaśnie %s",
+    "Cheers!" : "Pozdrawiam!",
     "Recovery key password" : "Hasło klucza odzyskiwania",
     "Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
     "Change Password" : "Zmień hasło",
diff --git a/apps/encryption/l10n/pt_BR.js b/apps/encryption/l10n/pt_BR.js
index faac7ca03a..09ed1910c1 100644
--- a/apps/encryption/l10n/pt_BR.js
+++ b/apps/encryption/l10n/pt_BR.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave do App de Criptografia é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
     "Encryption App is enabled and ready" : "Aplicativo de criptografia está ativado e pronto",
+    "one-time password for server-side-encryption" : "senha de uso único para criptografia-lado-servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Por favor peça ao dono do arquivo para compartilha-lo com você.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este arquivo, provavelmente este é um arquivo compartilhado. Por favor, pergunte o dono do arquivo para recompartilhar o arquivo com você.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Olá,\n\nO administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha '%s'.\n\nPor favor faça o login para a interface da Web, vá para a seção 'ownCloud módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login.\n\n",
+    "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
+    "Cheers!" : "Saúde!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Olá,<br><br>o administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha <strong>%s</strong>.<br><br>Por favor faça o login para a interface da Web, vá para a seção 'ownCloud módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login..<br><br>",
     "Enable recovery key" : "Habilitar recuperação de chave",
     "Disable recovery key" : "Dasabilitar chave de recuperação",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar arquivos. Ela permite a recuperação de arquivos de um usuário esquecer sua senha.",
diff --git a/apps/encryption/l10n/pt_BR.json b/apps/encryption/l10n/pt_BR.json
index fd8fd33d8c..1682ec44b2 100644
--- a/apps/encryption/l10n/pt_BR.json
+++ b/apps/encryption/l10n/pt_BR.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave do App de Criptografia é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "App de criptografia está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
     "Encryption App is enabled and ready" : "Aplicativo de criptografia está ativado e pronto",
+    "one-time password for server-side-encryption" : "senha de uso único para criptografia-lado-servidor",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Este arquivo não pode ser decriptado, provavelmente este é um arquivo compartilhado. Por favor peça ao dono do arquivo para compartilha-lo com você.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este arquivo, provavelmente este é um arquivo compartilhado. Por favor, pergunte o dono do arquivo para recompartilhar o arquivo com você.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Olá,\n\nO administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha '%s'.\n\nPor favor faça o login para a interface da Web, vá para a seção 'ownCloud módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login.\n\n",
+    "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
+    "Cheers!" : "Saúde!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Olá,<br><br>o administrador habilitou criptografia-lado-servidor. Os seus arquivos foram criptografados usando a senha <strong>%s</strong>.<br><br>Por favor faça o login para a interface da Web, vá para a seção 'ownCloud módulo de criptografia básico' das suas definições pessoais e atualize sua senha de criptografia, inserindo esta senha no campo 'senha antiga de log-in' e sua atual senha-de-login..<br><br>",
     "Enable recovery key" : "Habilitar recuperação de chave",
     "Disable recovery key" : "Dasabilitar chave de recuperação",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar arquivos. Ela permite a recuperação de arquivos de um usuário esquecer sua senha.",
diff --git a/apps/encryption/l10n/pt_PT.js b/apps/encryption/l10n/pt_PT.js
index c02efa4c1f..fc93818e9e 100644
--- a/apps/encryption/l10n/pt_PT.js
+++ b/apps/encryption/l10n/pt_PT.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "encryption",
     {
-    "Missing recovery key password" : "Palavra-passe da chave de recuperação em falta",
-    "Please repeat the recovery key password" : "Por favor, insira a palavra-passe da chave de recuperação",
-    "Repeated recovery key password does not match the provided recovery key password" : "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida",
+    "Missing recovery key password" : "Senha da chave de recuperação em falta",
+    "Please repeat the recovery key password" : "Por favor, repita a senha da chave de recuperação",
+    "Repeated recovery key password does not match the provided recovery key password" : "A contrassenha da chave de recuperação não corresponde à senha fornecida",
     "Recovery key successfully enabled" : "A chave de recuperação foi ativada com sucesso",
     "Could not enable recovery key. Please check your recovery key password!" : "Não foi possível ativar a chave de recuperação. Por favor, verifique a sua senha da chave de recuperação!",
     "Recovery key successfully disabled" : "A chave de recuperação foi desativada com sucesso",
@@ -14,20 +14,30 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação",
     "Password successfully changed." : "Palavra-passe alterada com sucesso.",
     "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
+    "Recovery Key disabled" : "Chave de recuperação desativada",
     "Recovery Key enabled" : "Chave de Recuperação ativada",
     "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possível ativar a chave de recuperação, por favor, tente de novo ou contacte o seu administrador",
     "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.",
     "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente de novo.",
     "The current log-in password was not correct, please try again." : "A senha de iniciar a sessão atual não estava correta, por favor, tente de novo.",
     "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Precisa de migrar as suas chaves de encriptação da encriptação antiga (ownCloud <= 8.0) para a nova. Por favor, execute 'occ encryption:migrate' ou contacte o seu administrador",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
     "Encryption App is enabled and ready" : "A aplicação de encriptação está ativa e pronta",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível desencriptar este ficheiro, provavelmente é um ficheiro partilhado. Por favor, peça ao proprietário do ficheiro para voltar a partilhar o ficheiro consigo.",
+    "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este ficheiro, provavelmente isto é um ficheiro compartilhado. Por favor, peça ao dono do ficheiro para voltar a partilhar o ficheiro consigo.",
+    "The share will expire on %s." : "Esta partilha irá expirar em %s.",
+    "Cheers!" : "Parabéns!",
     "Enable recovery key" : "Ativar a chave de recuperação",
     "Disable recovery key" : "Desativar a chave de recuperação",
+    "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar os ficheiros. Esta permite a recuperação dos ficheiros do utilizador se este esquecer a sua senha.",
     "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat recovery key password" : "Repetir a senha da chave de recuperação",
     "Change recovery key password:" : "Alterar a senha da chave de recuperação:",
+    "Old recovery key password" : "Senha da chave de recuperação antiga",
+    "New recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat new recovery key password" : "Repetir senha da chave de recuperação",
     "Change Password" : "Alterar a Senha",
     "ownCloud basic encryption module" : "módulo de encriptação básico da ownCloud",
     "Your private key password no longer matches your log-in password." : "A Password da sua chave privada não coincide mais com a password do seu login.",
diff --git a/apps/encryption/l10n/pt_PT.json b/apps/encryption/l10n/pt_PT.json
index 32f1d984ff..de139edfff 100644
--- a/apps/encryption/l10n/pt_PT.json
+++ b/apps/encryption/l10n/pt_PT.json
@@ -1,7 +1,7 @@
 { "translations": {
-    "Missing recovery key password" : "Palavra-passe da chave de recuperação em falta",
-    "Please repeat the recovery key password" : "Por favor, insira a palavra-passe da chave de recuperação",
-    "Repeated recovery key password does not match the provided recovery key password" : "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida",
+    "Missing recovery key password" : "Senha da chave de recuperação em falta",
+    "Please repeat the recovery key password" : "Por favor, repita a senha da chave de recuperação",
+    "Repeated recovery key password does not match the provided recovery key password" : "A contrassenha da chave de recuperação não corresponde à senha fornecida",
     "Recovery key successfully enabled" : "A chave de recuperação foi ativada com sucesso",
     "Could not enable recovery key. Please check your recovery key password!" : "Não foi possível ativar a chave de recuperação. Por favor, verifique a sua senha da chave de recuperação!",
     "Recovery key successfully disabled" : "A chave de recuperação foi desativada com sucesso",
@@ -12,20 +12,30 @@
     "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação",
     "Password successfully changed." : "Palavra-passe alterada com sucesso.",
     "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
+    "Recovery Key disabled" : "Chave de recuperação desativada",
     "Recovery Key enabled" : "Chave de Recuperação ativada",
     "Could not enable the recovery key, please try again or contact your administrator" : "Não foi possível ativar a chave de recuperação, por favor, tente de novo ou contacte o seu administrador",
     "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.",
     "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente de novo.",
     "The current log-in password was not correct, please try again." : "A senha de iniciar a sessão atual não estava correta, por favor, tente de novo.",
     "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Precisa de migrar as suas chaves de encriptação da encriptação antiga (ownCloud <= 8.0) para a nova. Por favor, execute 'occ encryption:migrate' ou contacte o seu administrador",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
     "Encryption App is enabled and ready" : "A aplicação de encriptação está ativa e pronta",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível desencriptar este ficheiro, provavelmente é um ficheiro partilhado. Por favor, peça ao proprietário do ficheiro para voltar a partilhar o ficheiro consigo.",
+    "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Não é possível ler este ficheiro, provavelmente isto é um ficheiro compartilhado. Por favor, peça ao dono do ficheiro para voltar a partilhar o ficheiro consigo.",
+    "The share will expire on %s." : "Esta partilha irá expirar em %s.",
+    "Cheers!" : "Parabéns!",
     "Enable recovery key" : "Ativar a chave de recuperação",
     "Disable recovery key" : "Desativar a chave de recuperação",
+    "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "A chave de recuperação é uma chave de encriptação extra que é utilizada para encriptar os ficheiros. Esta permite a recuperação dos ficheiros do utilizador se este esquecer a sua senha.",
     "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat recovery key password" : "Repetir a senha da chave de recuperação",
     "Change recovery key password:" : "Alterar a senha da chave de recuperação:",
+    "Old recovery key password" : "Senha da chave de recuperação antiga",
+    "New recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat new recovery key password" : "Repetir senha da chave de recuperação",
     "Change Password" : "Alterar a Senha",
     "ownCloud basic encryption module" : "módulo de encriptação básico da ownCloud",
     "Your private key password no longer matches your log-in password." : "A Password da sua chave privada não coincide mais com a password do seu login.",
diff --git a/apps/encryption/l10n/ro.js b/apps/encryption/l10n/ro.js
index 3f69957724..88af06692a 100644
--- a/apps/encryption/l10n/ro.js
+++ b/apps/encryption/l10n/ro.js
@@ -17,6 +17,7 @@ OC.L10N.register(
     "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Cheie privată nevalidă pentru aplicația Încriptare. Te rog, actualizează-ți parola cheii private folosind setările personale pentru a reaccesa fișierele tale încriptate.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va",
+    "The share will expire on %s." : "Partajarea va expira în data de %s.",
     "Change Password" : "Schimbă parola",
     "ownCloud basic encryption module" : "modul de ecnriptie bazic ownCloud",
     "Enabled" : "Activat",
diff --git a/apps/encryption/l10n/ro.json b/apps/encryption/l10n/ro.json
index e546b40093..9251037e35 100644
--- a/apps/encryption/l10n/ro.json
+++ b/apps/encryption/l10n/ro.json
@@ -15,6 +15,7 @@
     "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes",
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Cheie privată nevalidă pentru aplicația Încriptare. Te rog, actualizează-ți parola cheii private folosind setările personale pentru a reaccesa fișierele tale încriptate.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplicatia de criptare este activata dar tastatura nu este initializata , va rugam deconectati-va si reconectati-va",
+    "The share will expire on %s." : "Partajarea va expira în data de %s.",
     "Change Password" : "Schimbă parola",
     "ownCloud basic encryption module" : "modul de ecnriptie bazic ownCloud",
     "Enabled" : "Activat",
diff --git a/apps/encryption/l10n/ru.js b/apps/encryption/l10n/ru.js
index 7907c8aaeb..2b64fa66ed 100644
--- a/apps/encryption/l10n/ru.js
+++ b/apps/encryption/l10n/ru.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Приложение шифрования включено и готово",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удалось расшифровать файл, возможно это опубликованный файл. Попросите владельца файла повторно открыть к нему доступ.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удается прочитать файл, возможно это публичный файл. Пожалуйста попросите владельца открыть доступ снова.",
+    "The share will expire on %s." : "Доступ будет закрыт %s",
+    "Cheers!" : "Всего наилучшего!",
     "Enable recovery key" : "Включить ключ восстановления",
     "Disable recovery key" : "Отключить ключ восстановления",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Ключ восстановления это дополнительный ключ, который используется для шифрования файлов. Он позволяет восстановить пользовательские файлы в случае утери пароля.",
diff --git a/apps/encryption/l10n/ru.json b/apps/encryption/l10n/ru.json
index 87378952db..229d4e32de 100644
--- a/apps/encryption/l10n/ru.json
+++ b/apps/encryption/l10n/ru.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Приложение шифрования включено и готово",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удалось расшифровать файл, возможно это опубликованный файл. Попросите владельца файла повторно открыть к нему доступ.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не удается прочитать файл, возможно это публичный файл. Пожалуйста попросите владельца открыть доступ снова.",
+    "The share will expire on %s." : "Доступ будет закрыт %s",
+    "Cheers!" : "Всего наилучшего!",
     "Enable recovery key" : "Включить ключ восстановления",
     "Disable recovery key" : "Отключить ключ восстановления",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Ключ восстановления это дополнительный ключ, который используется для шифрования файлов. Он позволяет восстановить пользовательские файлы в случае утери пароля.",
diff --git a/apps/encryption/l10n/sk_SK.js b/apps/encryption/l10n/sk_SK.js
index 3f3b93f043..6b97ef3268 100644
--- a/apps/encryption/l10n/sk_SK.js
+++ b/apps/encryption/l10n/sk_SK.js
@@ -23,6 +23,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor sa nepodarilo dešifrovať, pravdepodobne je zdieľaný. Požiadajte majiteľa súboru, aby ho s vami znovu vyzdieľal.",
+    "The share will expire on %s." : "Zdieľanie vyprší %s.",
+    "Cheers!" : "Pekný deň!",
     "Enable recovery key" : "Povoliť obnovovací kľúč",
     "Disable recovery key" : "Zakázať obnovovací kľúč",
     "Recovery key password" : "Heslo obnovovacieho kľúča",
diff --git a/apps/encryption/l10n/sk_SK.json b/apps/encryption/l10n/sk_SK.json
index 05371299db..92ef811db2 100644
--- a/apps/encryption/l10n/sk_SK.json
+++ b/apps/encryption/l10n/sk_SK.json
@@ -21,6 +21,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor sa nepodarilo dešifrovať, pravdepodobne je zdieľaný. Požiadajte majiteľa súboru, aby ho s vami znovu vyzdieľal.",
+    "The share will expire on %s." : "Zdieľanie vyprší %s.",
+    "Cheers!" : "Pekný deň!",
     "Enable recovery key" : "Povoliť obnovovací kľúč",
     "Disable recovery key" : "Zakázať obnovovací kľúč",
     "Recovery key password" : "Heslo obnovovacieho kľúča",
diff --git a/apps/encryption/l10n/sl.js b/apps/encryption/l10n/sl.js
index 7c90ba7e9a..4e4e9998b0 100644
--- a/apps/encryption/l10n/sl.js
+++ b/apps/encryption/l10n/sl.js
@@ -23,6 +23,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.",
+    "The share will expire on %s." : "Povezava souporabe bo potekla %s.",
+    "Cheers!" : "Na zdravje!",
     "Enable recovery key" : "Omogoči obnovitev gesla",
     "Disable recovery key" : "Onemogoči obnovitev gesla",
     "Recovery key password" : "Ključ za obnovitev gesla",
diff --git a/apps/encryption/l10n/sl.json b/apps/encryption/l10n/sl.json
index 82d23fc6e7..34829a2280 100644
--- a/apps/encryption/l10n/sl.json
+++ b/apps/encryption/l10n/sl.json
@@ -21,6 +21,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Te datoteke ni mogoče šifrirati, ker je to najverjetneje datoteka v souporabi. Prosite lastnika datoteke, da jo da ponovno v souporabo.",
+    "The share will expire on %s." : "Povezava souporabe bo potekla %s.",
+    "Cheers!" : "Na zdravje!",
     "Enable recovery key" : "Omogoči obnovitev gesla",
     "Disable recovery key" : "Onemogoči obnovitev gesla",
     "Recovery key password" : "Ključ za obnovitev gesla",
diff --git a/apps/encryption/l10n/sq.js b/apps/encryption/l10n/sq.js
index be24512a35..9a9230e86f 100644
--- a/apps/encryption/l10n/sq.js
+++ b/apps/encryption/l10n/sq.js
@@ -2,6 +2,8 @@ OC.L10N.register(
     "encryption",
     {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Çelësi privat për Aplikacionin e Shifrimit është i pavlefshëm. Ju lutem përditësoni fjalëkalimin e çelësit tuaj privat në parametrat tuaj për të rimarrë qasje në skedarët tuaj të shifruar.",
+    "The share will expire on %s." : "Ndarja do të skadojë në %s.",
+    "Cheers!" : "Gjithë të mirat",
     "Enabled" : "Aktivizuar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/encryption/l10n/sq.json b/apps/encryption/l10n/sq.json
index 48f32535ac..87481aa334 100644
--- a/apps/encryption/l10n/sq.json
+++ b/apps/encryption/l10n/sq.json
@@ -1,5 +1,7 @@
 { "translations": {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Çelësi privat për Aplikacionin e Shifrimit është i pavlefshëm. Ju lutem përditësoni fjalëkalimin e çelësit tuaj privat në parametrat tuaj për të rimarrë qasje në skedarët tuaj të shifruar.",
+    "The share will expire on %s." : "Ndarja do të skadojë në %s.",
+    "Cheers!" : "Gjithë të mirat",
     "Enabled" : "Aktivizuar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/encryption/l10n/sr.js b/apps/encryption/l10n/sr.js
index 9c37a8a3b3..e351a73923 100644
--- a/apps/encryption/l10n/sr.js
+++ b/apps/encryption/l10n/sr.js
@@ -27,6 +27,8 @@ OC.L10N.register(
     "Encryption App is enabled and ready" : "Апликација шифровања је укључена и спремна",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу да дешифрујем фајл. Вероватно је то дељен фајл. Затражите од власника фајла да га поново подели са вама.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу да читам фајл. Вероватно је дељен. Питајте власника да га поново подели са вама.",
+    "The share will expire on %s." : "Дељење истиче %s.",
+    "Cheers!" : "Здраво!",
     "Enable recovery key" : "Омогући кључ за опоравак",
     "Disable recovery key" : "Онемогући кључ за опоравак",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Кључ за опоравак је додатни шифрарски кључ који се користи за шифровање фајлова. Он омогућава опоравак корисничких фајлова ако корисник заборави своју лозинку.",
diff --git a/apps/encryption/l10n/sr.json b/apps/encryption/l10n/sr.json
index cd648279e9..7fe6e1672d 100644
--- a/apps/encryption/l10n/sr.json
+++ b/apps/encryption/l10n/sr.json
@@ -25,6 +25,8 @@
     "Encryption App is enabled and ready" : "Апликација шифровања је укључена и спремна",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу да дешифрујем фајл. Вероватно је то дељен фајл. Затражите од власника фајла да га поново подели са вама.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу да читам фајл. Вероватно је дељен. Питајте власника да га поново подели са вама.",
+    "The share will expire on %s." : "Дељење истиче %s.",
+    "Cheers!" : "Здраво!",
     "Enable recovery key" : "Омогући кључ за опоравак",
     "Disable recovery key" : "Онемогући кључ за опоравак",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Кључ за опоравак је додатни шифрарски кључ који се користи за шифровање фајлова. Он омогућава опоравак корисничких фајлова ако корисник заборави своју лозинку.",
diff --git a/apps/encryption/l10n/sr@latin.js b/apps/encryption/l10n/sr@latin.js
index b078b50fce..d784912394 100644
--- a/apps/encryption/l10n/sr@latin.js
+++ b/apps/encryption/l10n/sr@latin.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
+    "The share will expire on %s." : "Deljeni sadržaj će isteći: %s",
+    "Cheers!" : "U zdravlje!",
     "Disabled" : "Onemogućeno"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/encryption/l10n/sr@latin.json b/apps/encryption/l10n/sr@latin.json
index 08f90ad591..cb3a38ecf7 100644
--- a/apps/encryption/l10n/sr@latin.json
+++ b/apps/encryption/l10n/sr@latin.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Neispravan privatni ključ za Aplikaciju za šifrovanje. Molimo da osvežite vašu lozinku privatnog ključa u ličnim podešavanjima kako bi dobili pristup šifrovanim fajlovima.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija za šifrovanje je omogućena ali Vaši ključevi nisu inicijalizovani, molimo Vas da se izlogujete i ulogujete ponovo.",
+    "The share will expire on %s." : "Deljeni sadržaj će isteći: %s",
+    "Cheers!" : "U zdravlje!",
     "Disabled" : "Onemogućeno"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/encryption/l10n/sv.js b/apps/encryption/l10n/sv.js
index d68e3274ad..16f9d00cd3 100644
--- a/apps/encryption/l10n/sv.js
+++ b/apps/encryption/l10n/sv.js
@@ -20,6 +20,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ej dekryptera denna fil, förmodligen är det en delad fil. Be ägaren av filen att dela den med dig.",
+    "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
+    "Cheers!" : "Ha de fint!",
     "Recovery key password" : "Lösenord för återställningsnyckel",
     "Change recovery key password:" : "Ändra lösenord för återställningsnyckel:",
     "Change Password" : "Byt lösenord",
diff --git a/apps/encryption/l10n/sv.json b/apps/encryption/l10n/sv.json
index 2ab5025fb2..c8f6596670 100644
--- a/apps/encryption/l10n/sv.json
+++ b/apps/encryption/l10n/sv.json
@@ -18,6 +18,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Kan ej dekryptera denna fil, förmodligen är det en delad fil. Be ägaren av filen att dela den med dig.",
+    "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
+    "Cheers!" : "Ha de fint!",
     "Recovery key password" : "Lösenord för återställningsnyckel",
     "Change recovery key password:" : "Ändra lösenord för återställningsnyckel:",
     "Change Password" : "Byt lösenord",
diff --git a/apps/encryption/l10n/th_TH.js b/apps/encryption/l10n/th_TH.js
index d6a2d00d12..3c4a5d696f 100644
--- a/apps/encryption/l10n/th_TH.js
+++ b/apps/encryption/l10n/th_TH.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "รหัสส่วนตัวไม่ถูกต้องสำหรับการเข้ารหัสแอพฯ กรุณาอัพเดทรหัสการเข้ารหัสผ่านส่วนตัวของคุณในการตั้งค่าส่วนบุคคลและในการกู้คืนการเข้าถึงไฟล์ที่มีการเข้ารหัสของคุณ",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "การเข้ารหัสแอพฯ ถูกเปิดใช้งานแต่รหัสของคุณยังไม่ได้เริ่มต้นใช้ โปรดออกและเข้าสู่ระบบอีกครั้ง",
     "Encryption App is enabled and ready" : "เข้ารหัสแอพถูกเปิดใช้งานและพร้อมทำงาน",
+    "one-time password for server-side-encryption" : "รหัสผ่านเพียงครั้งเดียว สำหรับเข้ารหัสฝั่งเซิร์ฟเวอร์",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถถอดรหัสไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาถามเจ้าของไฟล์เพื่อยกเลิกการใช้งานร่วมกัน ",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถอ่านไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาสอบถามเจ้าของไฟล์เพื่อแชร์ไฟล์กับคุณ",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "นี่คุณ<br>\n<br> \nผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong><br>\n<br>\nกรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br>\n<br>\n",
+    "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s",
+    "Cheers!" : "ไชโย!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "นี่คุณ <br><br> ผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong> <br><br>กรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br><br>",
     "Enable recovery key" : "เปิดใช้งานการกู้คืนรหัส",
     "Disable recovery key" : "ปิดใช้งานรหัสการกู้คืนรหัส",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "รหัสการกู้คืนเป็นการเข้ารหัสลับพิเศษจะใช้ในการเข้ารหัสไฟล์ มันจะช่วยเรื่องการกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่าน",
diff --git a/apps/encryption/l10n/th_TH.json b/apps/encryption/l10n/th_TH.json
index 5c90434098..b69cdb8a87 100644
--- a/apps/encryption/l10n/th_TH.json
+++ b/apps/encryption/l10n/th_TH.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "รหัสส่วนตัวไม่ถูกต้องสำหรับการเข้ารหัสแอพฯ กรุณาอัพเดทรหัสการเข้ารหัสผ่านส่วนตัวของคุณในการตั้งค่าส่วนบุคคลและในการกู้คืนการเข้าถึงไฟล์ที่มีการเข้ารหัสของคุณ",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "การเข้ารหัสแอพฯ ถูกเปิดใช้งานแต่รหัสของคุณยังไม่ได้เริ่มต้นใช้ โปรดออกและเข้าสู่ระบบอีกครั้ง",
     "Encryption App is enabled and ready" : "เข้ารหัสแอพถูกเปิดใช้งานและพร้อมทำงาน",
+    "one-time password for server-side-encryption" : "รหัสผ่านเพียงครั้งเดียว สำหรับเข้ารหัสฝั่งเซิร์ฟเวอร์",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถถอดรหัสไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาถามเจ้าของไฟล์เพื่อยกเลิกการใช้งานร่วมกัน ",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "ไม่สามารถอ่านไฟล์นี้ มันอาจเป็นไฟล์ที่ใช้งานร่วมกัน กรุณาสอบถามเจ้าของไฟล์เพื่อแชร์ไฟล์กับคุณ",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "นี่คุณ<br>\n<br> \nผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong><br>\n<br>\nกรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br>\n<br>\n",
+    "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s",
+    "Cheers!" : "ไชโย!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "นี่คุณ <br><br> ผู้ดูแลระบบเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์ ไฟล์ของคุณจะถูกเข้ารหัสโดยใช้รหัสผ่าน <strong>%s</strong> <br><br>กรุณาเข้าสู่ระบบเว็บอินเตอร์เฟซไปที่ส่วน \"โมดูลการเข้ารหัส ownCloud พื้นฐาน\" ของการตั้งค่าส่วนบุคคลของคุณและอัพเดทการเข้ารหัสรหัสผ่านของคุณโดย ป้อนรหัสผ่านนี้ในช่อง \"รหัสผ่านเก่าที่เข้าสู่ระบบ\" และเข้าสู่ระบบด้วยรหัสผ่านปัจจุบันของคุณ<br><br>",
     "Enable recovery key" : "เปิดใช้งานการกู้คืนรหัส",
     "Disable recovery key" : "ปิดใช้งานรหัสการกู้คืนรหัส",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "รหัสการกู้คืนเป็นการเข้ารหัสลับพิเศษจะใช้ในการเข้ารหัสไฟล์ มันจะช่วยเรื่องการกู้คืนไฟล์ของผู้ใช้ที่ลืมรหัสผ่าน",
diff --git a/apps/encryption/l10n/tr.js b/apps/encryption/l10n/tr.js
index 065c0d16d1..96db8f9120 100644
--- a/apps/encryption/l10n/tr.js
+++ b/apps/encryption/l10n/tr.js
@@ -25,8 +25,13 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
     "Encryption App is enabled and ready" : "Şifreleme Uygulaması etkin ve hazır",
+    "one-time password for server-side-encryption" : "sunucu tarafında şifleme için tek kullanımlık parola",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan okunamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Selam,\n\nsistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız '%s' parolası kullanılarak şifrelendi.\n\nLütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.\n\n",
+    "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
+    "Cheers!" : "Hoşçakalın!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Selam,<br><br>sistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız <strong>%s</strong> parolası kullanılarak şifrelendi.<br><br>Lütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.<br><br>",
     "Enable recovery key" : "Kurtarma anahtarını etkinleştir",
     "Disable recovery key" : "Kurtarma anahtarını devre dışı bırak",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kurtarma anahtarı, dosyaların şifrelenmesi için daha fazla \nşifreleme sunar. Bu kullanıcının dosyasının şifresini unuttuğunda kurtarmasına imkan verir.",
diff --git a/apps/encryption/l10n/tr.json b/apps/encryption/l10n/tr.json
index b21a019bb6..be6f6a5dfd 100644
--- a/apps/encryption/l10n/tr.json
+++ b/apps/encryption/l10n/tr.json
@@ -23,8 +23,13 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin.",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
     "Encryption App is enabled and ready" : "Şifreleme Uygulaması etkin ve hazır",
+    "one-time password for server-side-encryption" : "sunucu tarafında şifleme için tek kullanımlık parola",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan şifrelemesi kaldırılamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
     "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Bu dosya muhtemelen bir paylaşılan dosya olduğundan okunamıyor. Lütfen dosyayı sizinle bir daha paylaşması için dosya sahibi ile iletişime geçin.",
+    "Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n" : "Selam,\n\nsistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız '%s' parolası kullanılarak şifrelendi.\n\nLütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.\n\n",
+    "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
+    "Cheers!" : "Hoşçakalın!",
+    "Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section \"ownCloud basic encryption module\" of your personal settings and update your encryption password by entering this password into the \"old log-in password\" field and your current login-password.<br><br>" : "Selam,<br><br>sistem yöneticisi sunucu tarafında şifrelemeyi etkinleştirdi. Dosyalarınız <strong>%s</strong> parolası kullanılarak şifrelendi.<br><br>Lütfen web arayüzünde oturum açın ve kişisel ayarlarınızdan 'ownCloud temel şifreleme modülü'ne giderek 'eski oturum parolası' alanına bu parolayı girerek şifreleme parolanızı ve mevcut oturum açma parolanızı güncelleyin.<br><br>",
     "Enable recovery key" : "Kurtarma anahtarını etkinleştir",
     "Disable recovery key" : "Kurtarma anahtarını devre dışı bırak",
     "The recovery key is an extra encryption key that is used to encrypt files. It allows recovery of a user's files if the user forgets his or her password." : "Kurtarma anahtarı, dosyaların şifrelenmesi için daha fazla \nşifreleme sunar. Bu kullanıcının dosyasının şifresini unuttuğunda kurtarmasına imkan verir.",
diff --git a/apps/encryption/l10n/uk.js b/apps/encryption/l10n/uk.js
index 4c7143800d..553478a7f4 100644
--- a/apps/encryption/l10n/uk.js
+++ b/apps/encryption/l10n/uk.js
@@ -25,6 +25,8 @@ OC.L10N.register(
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
     "Encryption App is enabled and ready" : "Додаток кодування дозволений і готовий",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.",
+    "The share will expire on %s." : "Спільний доступ закінчиться %s.",
+    "Cheers!" : "Будьмо!",
     "Enable recovery key" : "Увімкнути ключ відновлення",
     "Disable recovery key" : "Вимкнути ключ відновлення",
     "Recovery key password" : "Пароль ключа відновлення",
diff --git a/apps/encryption/l10n/uk.json b/apps/encryption/l10n/uk.json
index 3be3a35b2f..e474e25cea 100644
--- a/apps/encryption/l10n/uk.json
+++ b/apps/encryption/l10n/uk.json
@@ -23,6 +23,8 @@
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
     "Encryption App is enabled and ready" : "Додаток кодування дозволений і готовий",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.",
+    "The share will expire on %s." : "Спільний доступ закінчиться %s.",
+    "Cheers!" : "Будьмо!",
     "Enable recovery key" : "Увімкнути ключ відновлення",
     "Disable recovery key" : "Вимкнути ключ відновлення",
     "Recovery key password" : "Пароль ключа відновлення",
diff --git a/apps/user_webdavauth/l10n/eu_ES.js b/apps/encryption/l10n/ur_PK.js
similarity index 57%
rename from apps/user_webdavauth/l10n/eu_ES.js
rename to apps/encryption/l10n/ur_PK.js
index 68ab406f83..9fbed2e780 100644
--- a/apps/user_webdavauth/l10n/eu_ES.js
+++ b/apps/encryption/l10n/ur_PK.js
@@ -1,6 +1,6 @@
 OC.L10N.register(
-    "user_webdavauth",
+    "encryption",
     {
-    "Save" : "Gorde"
+    "Cheers!" : "واہ!"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/eu_ES.json b/apps/encryption/l10n/ur_PK.json
similarity index 71%
rename from apps/files_trashbin/l10n/eu_ES.json
rename to apps/encryption/l10n/ur_PK.json
index 14a2375ad6..f798bdf2a7 100644
--- a/apps/files_trashbin/l10n/eu_ES.json
+++ b/apps/encryption/l10n/ur_PK.json
@@ -1,4 +1,4 @@
 { "translations": {
-    "Delete" : "Ezabatu"
+    "Cheers!" : "واہ!"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/encryption/l10n/vi.js b/apps/encryption/l10n/vi.js
index b995655162..d325fc7166 100644
--- a/apps/encryption/l10n/vi.js
+++ b/apps/encryption/l10n/vi.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
     "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
+    "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
+    "Cheers!" : "Chúc mừng!",
     "Change Password" : "Đổi Mật khẩu",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn.",
     "Old log-in password" : "Mật khẩu đăng nhập cũ",
diff --git a/apps/encryption/l10n/vi.json b/apps/encryption/l10n/vi.json
index eaaa3d1c03..78ed43b704 100644
--- a/apps/encryption/l10n/vi.json
+++ b/apps/encryption/l10n/vi.json
@@ -9,6 +9,8 @@
     "Could not change the password. Maybe the old password was not correct." : "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
     "Private key password successfully updated." : "Cập nhật thành công mật khẩu khóa cá nhân",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
+    "The share will expire on %s." : "Chia sẻ này sẽ hết hiệu lực vào %s.",
+    "Cheers!" : "Chúc mừng!",
     "Change Password" : "Đổi Mật khẩu",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn.",
     "Old log-in password" : "Mật khẩu đăng nhập cũ",
diff --git a/apps/encryption/l10n/zh_CN.js b/apps/encryption/l10n/zh_CN.js
index e38e6f0322..93a1b13996 100644
--- a/apps/encryption/l10n/zh_CN.js
+++ b/apps/encryption/l10n/zh_CN.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "Could not enable recovery key. Please check your recovery key password!" : "不能启用恢复密钥。请检查恢复密钥密码！",
     "Recovery key successfully disabled" : "恢复密钥成功禁用",
     "Could not disable recovery key. Please check your recovery key password!" : "不能禁用恢复密钥。请检查恢复密钥密码！",
+    "Missing parameters" : "缺少参数",
     "Please provide the old recovery password" : "请提供原来的恢复密码",
     "Please provide a new recovery password" : "请提供一个新的恢复密码",
     "Please repeat the new recovery password" : "请替换新的恢复密码",
@@ -18,6 +19,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : " 无法解密这个文件（或许这是一个共享文件？），请询问文件所有者重新与您分享这个文件。",
+    "The share will expire on %s." : "此分享将在 %s 过期。",
+    "Cheers!" : "干杯！",
     "Recovery key password" : "恢复密钥密码",
     "Change recovery key password:" : "更改恢复密钥密码",
     "Change Password" : "修改密码",
diff --git a/apps/encryption/l10n/zh_CN.json b/apps/encryption/l10n/zh_CN.json
index 0a1c7b5b89..0fb653b232 100644
--- a/apps/encryption/l10n/zh_CN.json
+++ b/apps/encryption/l10n/zh_CN.json
@@ -5,6 +5,7 @@
     "Could not enable recovery key. Please check your recovery key password!" : "不能启用恢复密钥。请检查恢复密钥密码！",
     "Recovery key successfully disabled" : "恢复密钥成功禁用",
     "Could not disable recovery key. Please check your recovery key password!" : "不能禁用恢复密钥。请检查恢复密钥密码！",
+    "Missing parameters" : "缺少参数",
     "Please provide the old recovery password" : "请提供原来的恢复密码",
     "Please provide a new recovery password" : "请提供一个新的恢复密码",
     "Please repeat the new recovery password" : "请替换新的恢复密码",
@@ -16,6 +17,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : " 无法解密这个文件（或许这是一个共享文件？），请询问文件所有者重新与您分享这个文件。",
+    "The share will expire on %s." : "此分享将在 %s 过期。",
+    "Cheers!" : "干杯！",
     "Recovery key password" : "恢复密钥密码",
     "Change recovery key password:" : "更改恢复密钥密码",
     "Change Password" : "修改密码",
diff --git a/apps/encryption/l10n/zh_TW.js b/apps/encryption/l10n/zh_TW.js
index 01b35d4661..17893b44b6 100644
--- a/apps/encryption/l10n/zh_TW.js
+++ b/apps/encryption/l10n/zh_TW.js
@@ -11,6 +11,8 @@ OC.L10N.register(
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案，也許這是分享的檔案。請詢問檔案所有人重新分享檔案給您。",
+    "The share will expire on %s." : "這個分享將會於 %s 過期",
+    "Cheers!" : "太棒了！",
     "Recovery key password" : "還原金鑰密碼",
     "Change recovery key password:" : "變更還原金鑰密碼:",
     "Change Password" : "變更密碼",
diff --git a/apps/encryption/l10n/zh_TW.json b/apps/encryption/l10n/zh_TW.json
index a1617eec76..ce2e07228f 100644
--- a/apps/encryption/l10n/zh_TW.json
+++ b/apps/encryption/l10n/zh_TW.json
@@ -9,6 +9,8 @@
     "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
     "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案，也許這是分享的檔案。請詢問檔案所有人重新分享檔案給您。",
+    "The share will expire on %s." : "這個分享將會於 %s 過期",
+    "Cheers!" : "太棒了！",
     "Recovery key password" : "還原金鑰密碼",
     "Change recovery key password:" : "變更還原金鑰密碼:",
     "Change Password" : "變更密碼",
diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php
index f3cf38fb96..5d1bb92460 100644
--- a/apps/encryption/lib/crypto/crypt.php
+++ b/apps/encryption/lib/crypto/crypt.php
@@ -30,6 +30,7 @@ use OC\Encryption\Exceptions\DecryptionFailedException;
 use OC\Encryption\Exceptions\EncryptionFailedException;
 use OCA\Encryption\Exceptions\MultiKeyDecryptException;
 use OCA\Encryption\Exceptions\MultiKeyEncryptException;
+use OCA\Encryption\Vendor\PBKDF2Fallback;
 use OCP\Encryption\Exceptions\GenericEncryptionException;
 use OCP\IConfig;
 use OCP\ILogger;
@@ -42,6 +43,10 @@ class Crypt {
 	// default cipher from old ownCloud versions
 	const LEGACY_CIPHER = 'AES-128-CFB';
 
+	// default key format, old ownCloud version encrypted the private key directly
+	// with the user password
+	const LEGACY_KEY_FORMAT = 'password';
+
 	const HEADER_START = 'HBEGIN';
 	const HEADER_END = 'HEND';
 	/**
@@ -57,6 +62,11 @@ class Crypt {
 	 */
 	private $config;
 
+	/**
+	 * @var array
+	 */
+	private $supportedKeyFormats;
+
 	/**
 	 * @param ILogger $logger
 	 * @param IUserSession $userSession
@@ -66,6 +76,7 @@ class Crypt {
 		$this->logger = $logger;
 		$this->user = $userSession && $userSession->isLoggedIn() ? $userSession->getUser() : false;
 		$this->config = $config;
+		$this->supportedKeyFormats = ['hash', 'password'];
 	}
 
 	/**
@@ -161,10 +172,23 @@ class Crypt {
 
 	/**
 	 * generate header for encrypted file
+	 *
+	 * @param string $keyFormat (can be 'hash' or 'password')
+	 * @return string
+	 * @throws \InvalidArgumentException
 	 */
-	public function generateHeader() {
+	public function generateHeader($keyFormat = 'hash') {
+
+		if (in_array($keyFormat, $this->supportedKeyFormats, true) === false) {
+			throw new \InvalidArgumentException('key format "' . $keyFormat . '" is not supported');
+		}
+
 		$cipher = $this->getCipher();
-		$header = self::HEADER_START . ':cipher:' . $cipher . ':' . self::HEADER_END;
+
+		$header = self::HEADER_START
+			. ':cipher:' . $cipher
+			. ':keyFormat:' . $keyFormat
+			. ':' . self::HEADER_END;
 
 		return $header;
 	}
@@ -211,6 +235,25 @@ class Crypt {
 		return $cipher;
 	}
 
+	/**
+	 * get key size depending on the cipher
+	 *
+	 * @param string $cipher supported ('AES-256-CFB' and 'AES-128-CFB')
+	 * @return int
+	 * @throws \InvalidArgumentException
+	 */
+	protected function getKeySize($cipher) {
+		if ($cipher === 'AES-256-CFB') {
+			return 32;
+		} else if ($cipher === 'AES-128-CFB') {
+			return 16;
+		}
+
+		throw new \InvalidArgumentException(
+			'Wrong cipher defined only AES-128-CFB and AES-256-CFB are supported.'
+		);
+	}
+
 	/**
 	 * get legacy cipher
 	 *
@@ -238,11 +281,71 @@ class Crypt {
 	}
 
 	/**
+	 * generate password hash used to encrypt the users private key
+	 *
+	 * @param string $password
+	 * @param string $cipher
+	 * @param string $uid only used for user keys
+	 * @return string
+	 */
+	protected function generatePasswordHash($password, $cipher, $uid = '') {
+		$instanceId = $this->config->getSystemValue('instanceid');
+		$instanceSecret = $this->config->getSystemValue('secret');
+		$salt = hash('sha256', $uid . $instanceId . $instanceSecret, true);
+		$keySize = $this->getKeySize($cipher);
+
+		if (function_exists('hash_pbkdf2')) {
+			$hash = hash_pbkdf2(
+				'sha256',
+				$password,
+				$salt,
+				100000,
+				$keySize,
+				true
+			);
+		} else {
+			// fallback to 3rdparty lib for PHP <= 5.4.
+			// FIXME: Can be removed as soon as support for PHP 5.4 was dropped
+			$fallback = new PBKDF2Fallback();
+			$hash = $fallback->pbkdf2(
+				'sha256',
+				$password,
+				$salt,
+				100000,
+				$keySize,
+				true
+			);
+		}
+
+		return $hash;
+	}
+
+	/**
+	 * encrypt private key
+	 *
 	 * @param string $privateKey
 	 * @param string $password
+	 * @param string $uid for regular users, empty for system keys
 	 * @return bool|string
 	 */
-	public function decryptPrivateKey($privateKey, $password = '') {
+	public function encryptPrivateKey($privateKey, $password, $uid = '') {
+		$cipher = $this->getCipher();
+		$hash = $this->generatePasswordHash($password, $cipher, $uid);
+		$encryptedKey = $this->symmetricEncryptFileContent(
+			$privateKey,
+			$hash
+		);
+
+		return $encryptedKey;
+	}
+
+	/**
+	 * @param string $privateKey
+	 * @param string $password
+	 * @param string $uid for regular users, empty for system keys
+	 * @return bool|string
+	 */
+	public function decryptPrivateKey($privateKey, $password = '', $uid = '') {
 
 		$header = $this->parseHeader($privateKey);
 
@@ -252,6 +355,16 @@ class Crypt {
 			$cipher = self::LEGACY_CIPHER;
 		}
 
+		if (isset($header['keyFormat'])) {
+			$keyFormat = $header['keyFormat'];
+		} else {
+			$keyFormat = self::LEGACY_KEY_FORMAT;
+		}
+
+		if ($keyFormat === 'hash') {
+			$password = $this->generatePasswordHash($password, $cipher, $uid);
+		}
+
 		// If we found a header we need to remove it from the key we want to decrypt
 		if (!empty($header)) {
 			$privateKey = substr($privateKey,
@@ -263,20 +376,31 @@ class Crypt {
 			$password,
 			$cipher);
 
-		// Check if this is a valid private key
-		$res = openssl_get_privatekey($plainKey);
-		if (is_resource($res)) {
-			$sslInfo = openssl_pkey_get_details($res);
-			if (!isset($sslInfo['key'])) {
-				return false;
-			}
-		} else {
+		if ($this->isValidPrivateKey($plainKey) === false) {
 			return false;
 		}
 
 		return $plainKey;
 	}
 
+	/**
+	 * check if it is a valid private key
+	 *
+	 * @param $plainKey
+	 * @return bool
+	 */
+	protected function isValidPrivateKey($plainKey) {
+		$res = openssl_get_privatekey($plainKey);
+		if (is_resource($res)) {
+			$sslInfo = openssl_pkey_get_details($res);
+			if (isset($sslInfo['key'])) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * @param $keyFileContents
 	 * @param string $passPhrase
@@ -358,7 +482,7 @@ class Crypt {
 	 * @param $data
 	 * @return array
 	 */
-	private function parseHeader($data) {
+	protected function parseHeader($data) {
 		$result = [];
 
 		if (substr($data, 0, strlen(self::HEADER_START)) === self::HEADER_START) {
diff --git a/apps/encryption/lib/crypto/encryptall.php b/apps/encryption/lib/crypto/encryptall.php
new file mode 100644
index 0000000000..a0c69c13fd
--- /dev/null
+++ b/apps/encryption/lib/crypto/encryptall.php
@@ -0,0 +1,424 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Encryption\Crypto;
+
+use OC\Encryption\Exceptions\DecryptionFailedException;
+use OC\Files\View;
+use OCA\Encryption\KeyManager;
+use OCA\Encryption\Users\Setup;
+use OCP\IConfig;
+use OCP\IL10N;
+use OCP\IUserManager;
+use OCP\Mail\IMailer;
+use OCP\Security\ISecureRandom;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Helper\Table;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+class EncryptAll {
+
+	/** @var Setup */
+	protected $userSetup;
+
+	/** @var IUserManager */
+	protected $userManager;
+
+	/** @var View */
+	protected $rootView;
+
+	/** @var KeyManager */
+	protected $keyManager;
+
+	/** @var array  */
+	protected $userPasswords;
+
+	/** @var  IConfig */
+	protected $config;
+
+	/** @var IMailer */
+	protected $mailer;
+
+	/** @var  IL10N */
+	protected $l;
+
+	/** @var  QuestionHelper */
+	protected $questionHelper;
+
+	/** @var  OutputInterface */
+	protected $output;
+
+	/** @var  InputInterface */
+	protected $input;
+
+	/** @var ISecureRandom */
+	protected $secureRandom;
+
+	/**
+	 * @param Setup $userSetup
+	 * @param IUserManager $userManager
+	 * @param View $rootView
+	 * @param KeyManager $keyManager
+	 * @param IConfig $config
+	 * @param IMailer $mailer
+	 * @param IL10N $l
+	 * @param QuestionHelper $questionHelper
+	 * @param ISecureRandom $secureRandom
+	 */
+	public function __construct(
+		Setup $userSetup,
+		IUserManager $userManager,
+		View $rootView,
+		KeyManager $keyManager,
+		IConfig $config,
+		IMailer $mailer,
+		IL10N $l,
+		QuestionHelper $questionHelper,
+		ISecureRandom $secureRandom
+	) {
+		$this->userSetup = $userSetup;
+		$this->userManager = $userManager;
+		$this->rootView = $rootView;
+		$this->keyManager = $keyManager;
+		$this->config = $config;
+		$this->mailer = $mailer;
+		$this->l = $l;
+		$this->questionHelper = $questionHelper;
+		$this->secureRandom = $secureRandom;
+		// store one time passwords for the users
+		$this->userPasswords = array();
+	}
+
+	/**
+	 * start to encrypt all files
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output
+	 */
+	public function encryptAll(InputInterface $input, OutputInterface $output) {
+
+		$this->input = $input;
+		$this->output = $output;
+
+		$headline = 'Encrypt all files with the ' . Encryption::DISPLAY_NAME;
+		$this->output->writeln("\n");
+		$this->output->writeln($headline);
+		$this->output->writeln(str_pad('', strlen($headline), '='));
+
+		//create private/public keys for each user and store the private key password
+		$this->output->writeln("\n");
+		$this->output->writeln('Create key-pair for every user');
+		$this->output->writeln('------------------------------');
+		$this->output->writeln('');
+		$this->output->writeln('This module will encrypt all files in the users files folder initially.');
+		$this->output->writeln('Already existing versions and files in the trash bin will not be encrypted.');
+		$this->output->writeln('');
+		$this->createKeyPairs();
+
+		//setup users file system and encrypt all files one by one (take should encrypt setting of storage into account)
+		$this->output->writeln("\n");
+		$this->output->writeln('Start to encrypt users files');
+		$this->output->writeln('----------------------------');
+		$this->output->writeln('');
+		$this->encryptAllUsersFiles();
+		//send-out or display password list and write it to a file
+		$this->output->writeln("\n");
+		$this->output->writeln('Generated encryption key passwords');
+		$this->output->writeln('----------------------------------');
+		$this->output->writeln('');
+		$this->outputPasswords();
+		$this->output->writeln("\n");
+	}
+
+	/**
+	 * create key-pair for every user
+	 */
+	protected function createKeyPairs() {
+		$this->output->writeln("\n");
+		$progress = new ProgressBar($this->output);
+		$progress->setFormat(" %message% \n [%bar%]");
+		$progress->start();
+
+		foreach($this->userManager->getBackends() as $backend) {
+			$limit = 500;
+			$offset = 0;
+			do {
+				$users = $backend->getUsers('', $limit, $offset);
+				foreach ($users as $user) {
+					if ($this->keyManager->userHasKeys($user) === false) {
+						$progress->setMessage('Create key-pair for ' . $user);
+						$progress->advance();
+						$this->setupUserFS($user);
+						$password = $this->generateOneTimePassword($user);
+						$this->userSetup->setupUser($user, $password);
+					} else {
+						// users which already have a key-pair will be stored with a
+						// empty password and filtered out later
+						$this->userPasswords[$user] = '';
+					}
+				}
+				$offset += $limit;
+			} while(count($users) >= $limit);
+		}
+
+		$progress->setMessage('Key-pair created for all users');
+		$progress->finish();
+	}
+
+	/**
+	 * iterate over all user and encrypt their files
+	 */
+	protected function encryptAllUsersFiles() {
+		$this->output->writeln("\n");
+		$progress = new ProgressBar($this->output);
+		$progress->setFormat(" %message% \n [%bar%]");
+		$progress->start();
+		$numberOfUsers = count($this->userPasswords);
+		$userNo = 1;
+		foreach ($this->userPasswords as $uid => $password) {
+			$userCount = "$uid ($userNo of $numberOfUsers)";
+			$this->encryptUsersFiles($uid, $progress, $userCount);
+			$userNo++;
+		}
+		$progress->setMessage("all files encrypted");
+		$progress->finish();
+
+	}
+
+	/**
+	 * encrypt files from the given user
+	 *
+	 * @param string $uid
+	 * @param ProgressBar $progress
+	 * @param string $userCount
+	 */
+	protected function encryptUsersFiles($uid, ProgressBar $progress, $userCount) {
+
+		$this->setupUserFS($uid);
+		$directories = array();
+		$directories[] =  '/' . $uid . '/files';
+
+		while($root = array_pop($directories)) {
+			$content = $this->rootView->getDirectoryContent($root);
+			foreach ($content as $file) {
+				$path = $root . '/' . $file['name'];
+				if ($this->rootView->is_dir($path)) {
+					$directories[] = $path;
+					continue;
+				} else {
+					$progress->setMessage("encrypt files for user $userCount: $path");
+					$progress->advance();
+					if($this->encryptFile($path) === false) {
+						$progress->setMessage("encrypt files for user $userCount: $path (already encrypted)");
+						$progress->advance();
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * encrypt file
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	protected function encryptFile($path) {
+
+		$source = $path;
+		$target = $path . '.encrypted.' . time();
+
+		try {
+			$this->rootView->copy($source, $target);
+			$this->rootView->rename($target, $source);
+		} catch (DecryptionFailedException $e) {
+			if ($this->rootView->file_exists($target)) {
+				$this->rootView->unlink($target);
+			}
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * output one-time encryption passwords
+	 */
+	protected function outputPasswords() {
+		$table = new Table($this->output);
+		$table->setHeaders(array('Username', 'Private key password'));
+
+		//create rows
+		$newPasswords = array();
+		$unchangedPasswords = array();
+		foreach ($this->userPasswords as $uid => $password) {
+			if (empty($password)) {
+				$unchangedPasswords[] = $uid;
+			} else {
+				$newPasswords[] = [$uid, $password];
+			}
+		}
+		$table->setRows($newPasswords);
+		$table->render();
+
+		if (!empty($unchangedPasswords)) {
+			$this->output->writeln("\nThe following users already had a key-pair which was reused without setting a new password:\n");
+			foreach ($unchangedPasswords as $uid) {
+				$this->output->writeln("    $uid");
+			}
+		}
+
+		$this->writePasswordsToFile($newPasswords);
+
+		$this->output->writeln('');
+		$question = new ConfirmationQuestion('Do you want to send the passwords directly to the users by mail? (y/n) ', false);
+		if ($this->questionHelper->ask($this->input, $this->output, $question)) {
+			$this->sendPasswordsByMail();
+		}
+	}
+
+	/**
+	 * write one-time encryption passwords to a csv file
+	 *
+	 * @param array $passwords
+	 */
+	protected function writePasswordsToFile(array $passwords) {
+		$fp = $this->rootView->fopen('oneTimeEncryptionPasswords.csv', 'w');
+		foreach ($passwords as $pwd) {
+			fputcsv($fp, $pwd);
+		}
+		fclose($fp);
+		$this->output->writeln("\n");
+		$this->output->writeln('A list of all newly created passwords was written to data/oneTimeEncryptionPasswords.csv');
+		$this->output->writeln('');
+		$this->output->writeln('Each of these users need to login to the web interface, go to the');
+		$this->output->writeln('personal settings section "ownCloud basic encryption module" and');
+		$this->output->writeln('update the private key password to match the login password again by');
+		$this->output->writeln('entering the one-time password into the "old log-in password" field');
+		$this->output->writeln('and their current login password');
+	}
+
+	/**
+	 * setup user file system
+	 *
+	 * @param string $uid
+	 */
+	protected function setupUserFS($uid) {
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($uid);
+	}
+
+	/**
+	 * generate one time password for the user and store it in a array
+	 *
+	 * @param string $uid
+	 * @return string password
+	 */
+	protected function generateOneTimePassword($uid) {
+		$password = $this->secureRandom->getMediumStrengthGenerator()->generate(8);
+		$this->userPasswords[$uid] = $password;
+		return $password;
+	}
+
+	/**
+	 * send encryption key passwords to the users by mail
+	 */
+	protected function sendPasswordsByMail() {
+		$noMail = [];
+
+		$this->output->writeln('');
+		$progress = new ProgressBar($this->output, count($this->userPasswords));
+		$progress->start();
+
+		foreach ($this->userPasswords as $recipient => $password) {
+			$progress->advance();
+			if (!empty($password)) {
+				$recipientDisplayName = $this->userManager->get($recipient)->getDisplayName();
+				$to = $this->config->getUserValue($recipient, 'settings', 'email', '');
+
+				if ($to === '') {
+					$noMail[] = $recipient;
+					continue;
+				}
+
+				$subject = (string)$this->l->t('one-time password for server-side-encryption');
+				list($htmlBody, $textBody) = $this->createMailBody($password);
+
+				// send it out now
+				try {
+					$message = $this->mailer->createMessage();
+					$message->setSubject($subject);
+					$message->setTo([$to => $recipientDisplayName]);
+					$message->setHtmlBody($htmlBody);
+					$message->setPlainBody($textBody);
+					$message->setFrom([
+						\OCP\Util::getDefaultEmailAddress('admin-noreply')
+					]);
+
+					$this->mailer->send($message);
+				} catch (\Exception $e) {
+					$noMail[] = $recipient;
+				}
+			}
+		}
+
+		$progress->finish();
+
+		if (empty($noMail)) {
+			$this->output->writeln("\n\nPassword successfully send to all users");
+		} else {
+			$table = new Table($this->output);
+			$table->setHeaders(array('Username', 'Private key password'));
+			$this->output->writeln("\n\nCould not send password to following users:\n");
+			$rows = [];
+			foreach ($noMail as $uid) {
+				$rows[] = [$uid, $this->userPasswords[$uid]];
+			}
+			$table->setRows($rows);
+			$table->render();
+		}
+
+	}
+
+	/**
+	 * create mail body for plain text and html mail
+	 *
+	 * @param string $password one-time encryption password
+	 * @return array an array of the html mail body and the plain text mail body
+	 */
+	protected function createMailBody($password) {
+
+		$html = new \OC_Template("encryption", "mail", "");
+		$html->assign ('password', $password);
+		$htmlMail = $html->fetchPage();
+
+		$plainText = new \OC_Template("encryption", "altmail", "");
+		$plainText->assign ('password', $password);
+		$plainTextMail = $plainText->fetchPage();
+
+		return [$htmlMail, $plainTextMail];
+	}
+
+}
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 1fa0581506..c62afac83c 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -35,6 +35,8 @@ use OCP\Encryption\IEncryptionModule;
 use OCA\Encryption\KeyManager;
 use OCP\IL10N;
 use OCP\ILogger;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 class Encryption implements IEncryptionModule {
 
@@ -79,24 +81,34 @@ class Encryption implements IEncryptionModule {
 	/** @var IL10N */
 	private $l;
 
+	/** @var EncryptAll */
+	private $encryptAll;
+
+	/** @var  bool */
+	private $useMasterPassword;
+
 	/**
 	 *
 	 * @param Crypt $crypt
 	 * @param KeyManager $keyManager
 	 * @param Util $util
+	 * @param EncryptAll $encryptAll
 	 * @param ILogger $logger
 	 * @param IL10N $il10n
 	 */
 	public function __construct(Crypt $crypt,
 								KeyManager $keyManager,
 								Util $util,
+								EncryptAll $encryptAll,
 								ILogger $logger,
 								IL10N $il10n) {
 		$this->crypt = $crypt;
 		$this->keyManager = $keyManager;
 		$this->util = $util;
+		$this->encryptAll = $encryptAll;
 		$this->logger = $logger;
 		$this->l = $il10n;
+		$this->useMasterPassword = $util->isMasterKeyEnabled();
 	}
 
 	/**
@@ -185,23 +197,26 @@ class Encryption implements IEncryptionModule {
 				$this->writeCache = '';
 			}
 			$publicKeys = array();
-			foreach ($this->accessList['users'] as $uid) {
-				try {
-					$publicKeys[$uid] = $this->keyManager->getPublicKey($uid);
-				} catch (PublicKeyMissingException $e) {
-					$this->logger->warning(
-						'no public key found for user "{uid}", user will not be able to read the file',
-						['app' => 'encryption', 'uid' => $uid]
-					);
-					// if the public key of the owner is missing we should fail
-					if ($uid === $this->user) {
-						throw $e;
+			if ($this->useMasterPassword === true) {
+				$publicKeys[$this->keyManager->getMasterKeyId()] = $this->keyManager->getPublicMasterKey();
+			} else {
+				foreach ($this->accessList['users'] as $uid) {
+					try {
+						$publicKeys[$uid] = $this->keyManager->getPublicKey($uid);
+					} catch (PublicKeyMissingException $e) {
+						$this->logger->warning(
+							'no public key found for user "{uid}", user will not be able to read the file',
+							['app' => 'encryption', 'uid' => $uid]
+						);
+						// if the public key of the owner is missing we should fail
+						if ($uid === $this->user) {
+							throw $e;
+						}
 					}
 				}
 			}
 
 			$publicKeys = $this->keyManager->addSystemKeys($this->accessList, $publicKeys, $this->user);
-
 			$encryptedKeyfiles = $this->crypt->multiKeyEncrypt($this->fileKey, $publicKeys);
 			$this->keyManager->setAllFileKeys($this->path, $encryptedKeyfiles);
 		}
@@ -310,8 +325,12 @@ class Encryption implements IEncryptionModule {
 		if (!empty($fileKey)) {
 
 			$publicKeys = array();
-			foreach ($accessList['users'] as $user) {
-				$publicKeys[$user] = $this->keyManager->getPublicKey($user);
+			if ($this->useMasterPassword === true) {
+				$publicKeys[$this->keyManager->getMasterKeyId()] = $this->keyManager->getPublicMasterKey();
+			} else {
+				foreach ($accessList['users'] as $user) {
+					$publicKeys[$user] = $this->keyManager->getPublicKey($user);
+				}
 			}
 
 			$publicKeys = $this->keyManager->addSystemKeys($accessList, $publicKeys, $uid);
@@ -397,6 +416,16 @@ class Encryption implements IEncryptionModule {
 		return true;
 	}
 
+	/**
+	 * Initial encryption of all files
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output write some status information to the terminal during encryption
+	 */
+	public function encryptAll(InputInterface $input, OutputInterface $output) {
+		$this->encryptAll->encryptAll($input, $output);
+	}
+
 	/**
 	 * @param string $path
 	 * @return string
diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php
index 8c8c1f8fd7..c450722887 100644
--- a/apps/encryption/lib/keymanager.php
+++ b/apps/encryption/lib/keymanager.php
@@ -54,6 +54,10 @@ class KeyManager {
 	 * @var string
 	 */
 	private $publicShareKeyId;
+	/**
+	 * @var string
+	 */
+	private $masterKeyId;
 	/**
 	 * @var string UserID
 	 */
@@ -131,10 +135,20 @@ class KeyManager {
 			$this->config->setAppValue('encryption', 'publicShareKeyId', $this->publicShareKeyId);
 		}
 
+		$this->masterKeyId = $this->config->getAppValue('encryption',
+			'masterKeyId');
+		if (empty($this->masterKeyId)) {
+			$this->masterKeyId = 'master_' . substr(md5(time()), 0, 8);
+			$this->config->setAppValue('encryption', 'masterKeyId', $this->masterKeyId);
+		}
+
 		$this->keyId = $userSession && $userSession->isLoggedIn() ? $userSession->getUser()->getUID() : false;
 		$this->log = $log;
 	}
 
+	/**
+	 * check if key pair for public link shares exists, if not we create one
+	 */
 	public function validateShareKey() {
 		$shareKey = $this->getPublicShareKey();
 		if (empty($shareKey)) {
@@ -146,12 +160,32 @@ class KeyManager {
 				Encryption::ID);
 
 			// Encrypt private key empty passphrase
-			$encryptedKey = $this->crypt->symmetricEncryptFileContent($keyPair['privateKey'], '');
+			$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], '');
 			$header = $this->crypt->generateHeader();
 			$this->setSystemPrivateKey($this->publicShareKeyId, $header . $encryptedKey);
 		}
 	}
 
+	/**
+	 * check if a key pair for the master key exists, if not we create one
+	 */
+	public function validateMasterKey() {
+		$masterKey = $this->getPublicMasterKey();
+		if (empty($masterKey)) {
+			$keyPair = $this->crypt->createKeyPair();
+
+			// Save public key
+			$this->keyStorage->setSystemUserKey(
+				$this->masterKeyId . '.publicKey', $keyPair['publicKey'],
+				Encryption::ID);
+
+			// Encrypt private key with system password
+			$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $this->getMasterKeyPassword(), $this->masterKeyId);
+			$header = $this->crypt->generateHeader();
+			$this->setSystemPrivateKey($this->masterKeyId, $header . $encryptedKey);
+		}
+	}
+
 	/**
 	 * @return bool
 	 */
@@ -184,8 +218,7 @@ class KeyManager {
 	 */
 	public function checkRecoveryPassword($password) {
 		$recoveryKey = $this->keyStorage->getSystemUserKey($this->recoveryKeyId . '.privateKey', Encryption::ID);
-		$decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey,
-			$password);
+		$decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $password);
 
 		if ($decryptedRecoveryKey) {
 			return true;
@@ -203,8 +236,8 @@ class KeyManager {
 		// Save Public Key
 		$this->setPublicKey($uid, $keyPair['publicKey']);
 
-		$encryptedKey = $this->crypt->symmetricEncryptFileContent($keyPair['privateKey'],
-			$password);
+		$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $password, $uid);
+
 		$header = $this->crypt->generateHeader();
 
 		if ($encryptedKey) {
@@ -226,8 +259,7 @@ class KeyManager {
 			$keyPair['publicKey'],
 			Encryption::ID);
 
-		$encryptedKey = $this->crypt->symmetricEncryptFileContent($keyPair['privateKey'],
-			$password);
+		$encryptedKey = $this->crypt->encryptPrivateKey($keyPair['privateKey'], $password);
 		$header = $this->crypt->generateHeader();
 
 		if ($encryptedKey) {
@@ -306,10 +338,16 @@ class KeyManager {
 
 		$this->session->setStatus(Session::INIT_EXECUTED);
 
+
 		try {
-			$privateKey = $this->getPrivateKey($uid);
-			$privateKey = $this->crypt->decryptPrivateKey($privateKey,
-				$passPhrase);
+			if($this->util->isMasterKeyEnabled()) {
+				$uid = $this->getMasterKeyId();
+				$passPhrase = $this->getMasterKeyPassword();
+				$privateKey = $this->getSystemPrivateKey($uid);
+			} else {
+				$privateKey = $this->getPrivateKey($uid);
+			}
+			$privateKey = $this->crypt->decryptPrivateKey($privateKey, $passPhrase, $uid);
 		} catch (PrivateKeyMissingException $e) {
 			return false;
 		} catch (DecryptionFailedException $e) {
@@ -348,6 +386,10 @@ class KeyManager {
 	public function getFileKey($path, $uid) {
 		$encryptedFileKey = $this->keyStorage->getFileKey($path, $this->fileKeyId, Encryption::ID);
 
+		if ($this->util->isMasterKeyEnabled()) {
+			$uid = $this->getMasterKeyId();
+		}
+
 		if (is_null($uid)) {
 			$uid = $this->getPublicShareKeyId();
 			$shareKey = $this->getShareKey($path, $uid);
@@ -569,4 +611,37 @@ class KeyManager {
 
 		return $publicKeys;
 	}
+
+	/**
+	 * get master key password
+	 *
+	 * @return string
+	 * @throws \Exception
+	 */
+	protected function getMasterKeyPassword() {
+		$password = $this->config->getSystemValue('secret');
+		if (empty($password)){
+			throw new \Exception('Can not get secret from ownCloud instance');
+		}
+
+		return $password;
+	}
+
+	/**
+	 * return master key id
+	 *
+	 * @return string
+	 */
+	public function getMasterKeyId() {
+		return $this->masterKeyId;
+	}
+
+	/**
+	 * get public master key
+	 *
+	 * @return string
+	 */
+	public function getPublicMasterKey() {
+		return $this->keyStorage->getSystemUserKey($this->masterKeyId . '.publicKey', Encryption::ID);
+	}
 }
diff --git a/apps/encryption/lib/recovery.php b/apps/encryption/lib/recovery.php
index e31a14fba6..b22e326562 100644
--- a/apps/encryption/lib/recovery.php
+++ b/apps/encryption/lib/recovery.php
@@ -136,7 +136,7 @@ class Recovery {
 	public function changeRecoveryKeyPassword($newPassword, $oldPassword) {
 		$recoveryKey = $this->keyManager->getSystemPrivateKey($this->keyManager->getRecoveryKeyId());
 		$decryptedRecoveryKey = $this->crypt->decryptPrivateKey($recoveryKey, $oldPassword);
-		$encryptedRecoveryKey = $this->crypt->symmetricEncryptFileContent($decryptedRecoveryKey, $newPassword);
+		$encryptedRecoveryKey = $this->crypt->encryptPrivateKey($decryptedRecoveryKey, $newPassword);
 		$header = $this->crypt->generateHeader();
 		if ($encryptedRecoveryKey) {
 			$this->keyManager->setSystemPrivateKey($this->keyManager->getRecoveryKeyId(), $header . $encryptedRecoveryKey);
@@ -263,8 +263,7 @@ class Recovery {
 	public function recoverUsersFiles($recoveryPassword, $user) {
 		$encryptedKey = $this->keyManager->getSystemPrivateKey($this->keyManager->getRecoveryKeyId());
 
-		$privateKey = $this->crypt->decryptPrivateKey($encryptedKey,
-			$recoveryPassword);
+		$privateKey = $this->crypt->decryptPrivateKey($encryptedKey, $recoveryPassword);
 
 		$this->recoverAllFiles('/' . $user . '/files/', $privateKey, $user);
 	}
diff --git a/apps/encryption/lib/users/setup.php b/apps/encryption/lib/users/setup.php
index f224826ed5..d4f7c37454 100644
--- a/apps/encryption/lib/users/setup.php
+++ b/apps/encryption/lib/users/setup.php
@@ -76,12 +76,15 @@ class Setup {
 	}
 
 	/**
+	 * check if user has a key pair, if not we create one
+	 *
 	 * @param string $uid userid
 	 * @param string $password user password
 	 * @return bool
 	 */
 	public function setupServerSide($uid, $password) {
 		$this->keyManager->validateShareKey();
+		$this->keyManager->validateMasterKey();
 		// Check if user already has keys
 		if (!$this->keyManager->userHasKeys($uid)) {
 			return $this->keyManager->storeKeyPair($uid, $password,
diff --git a/apps/encryption/lib/util.php b/apps/encryption/lib/util.php
index fbedc5d607..e9f916eff3 100644
--- a/apps/encryption/lib/util.php
+++ b/apps/encryption/lib/util.php
@@ -101,6 +101,16 @@ class Util {
 		return ($recoveryMode === '1');
 	}
 
+	/**
+	 * check if master key is enabled
+	 *
+	 * @return bool
+	 */
+	public function isMasterKeyEnabled() {
+		$userMasterKey = $this->config->getAppValue('encryption', 'useMasterKey', '0');
+		return ($userMasterKey === '1');
+	}
+
 	/**
 	 * @param $enabled
 	 * @return bool
diff --git a/apps/encryption/templates/altmail.php b/apps/encryption/templates/altmail.php
new file mode 100644
index 0000000000..b92c6b4a7c
--- /dev/null
+++ b/apps/encryption/templates/altmail.php
@@ -0,0 +1,16 @@
+<?php
+/** @var OC_Theme $theme */
+/** @var array $_ */
+
+print_unescaped($l->t("Hey there,\n\nthe admin enabled server-side-encryption. Your files were encrypted using the password '%s'.\n\nPlease login to the web interface, go to the section 'ownCloud basic encryption module' of your personal settings and update your encryption password by entering this password into the 'old log-in password' field and your current login-password.\n\n", array($_['password'])));
+if ( isset($_['expiration']) ) {
+	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
+	print_unescaped("\n\n");
+}
+// TRANSLATORS term at the end of a mail
+p($l->t("Cheers!"));
+?>
+
+	--
+<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
+<?php print_unescaped("\n".$theme->getBaseUrl());
diff --git a/apps/encryption/templates/mail.php b/apps/encryption/templates/mail.php
new file mode 100644
index 0000000000..2b61e915de
--- /dev/null
+++ b/apps/encryption/templates/mail.php
@@ -0,0 +1,39 @@
+<?php
+/** @var OC_Theme $theme */
+/** @var array $_ */
+?>
+<table cellspacing="0" cellpadding="0" border="0" width="100%">
+	<tr><td>
+			<table cellspacing="0" cellpadding="0" border="0" width="600px">
+				<tr>
+					<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
+					<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
+						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+					</td>
+				</tr>
+				<tr><td colspan="2">&nbsp;</td></tr>
+				<tr>
+					<td width="20px">&nbsp;</td>
+					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
+						<?php
+						print_unescaped($l->t('Hey there,<br><br>the admin enabled server-side-encryption. Your files were encrypted using the password <strong>%s</strong>.<br><br>Please login to the web interface, go to the section "ownCloud basic encryption module" of your personal settings and update your encryption password by entering this password into the "old log-in password" field and your current login-password.<br><br>', array($_['password'])));
+						// TRANSLATORS term at the end of a mail
+						p($l->t('Cheers!'));
+						?>
+					</td>
+				</tr>
+				<tr><td colspan="2">&nbsp;</td></tr>
+				<tr>
+					<td width="20px">&nbsp;</td>
+					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
+						<?php p($theme->getName()); ?> -
+						<?php p($theme->getSlogan()); ?>
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2">&nbsp;</td>
+				</tr>
+			</table>
+		</td></tr>
+</table>
diff --git a/apps/encryption/tests/command/testenablemasterkey.php b/apps/encryption/tests/command/testenablemasterkey.php
new file mode 100644
index 0000000000..c905329269
--- /dev/null
+++ b/apps/encryption/tests/command/testenablemasterkey.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Encryption\Tests\Command;
+
+
+use OCA\Encryption\Command\EnableMasterKey;
+use Test\TestCase;
+
+class TestEnableMasterKey extends TestCase {
+
+	/** @var  EnableMasterKey */
+	protected $enableMasterKey;
+
+	/** @var  Util | \PHPUnit_Framework_MockObject_MockObject */
+	protected $util;
+
+	/** @var \OCP\IConfig | \PHPUnit_Framework_MockObject_MockObject  */
+	protected $config;
+
+	/** @var \Symfony\Component\Console\Helper\QuestionHelper | \PHPUnit_Framework_MockObject_MockObject */
+	protected $questionHelper;
+
+	/** @var  \Symfony\Component\Console\Output\OutputInterface | \PHPUnit_Framework_MockObject_MockObject */
+	protected $output;
+
+	/** @var  \Symfony\Component\Console\Input\InputInterface | \PHPUnit_Framework_MockObject_MockObject */
+	protected $input;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->util = $this->getMockBuilder('OCA\Encryption\Util')
+			->disableOriginalConstructor()->getMock();
+		$this->config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$this->questionHelper = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
+			->disableOriginalConstructor()->getMock();
+		$this->output = $this->getMockBuilder('Symfony\Component\Console\Output\OutputInterface')
+			->disableOriginalConstructor()->getMock();
+		$this->input = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')
+			->disableOriginalConstructor()->getMock();
+
+		$this->enableMasterKey = new EnableMasterKey($this->util, $this->config, $this->questionHelper);
+	}
+
+	/**
+	 * @dataProvider dataTestExecute
+	 *
+	 * @param bool $isAlreadyEnabled
+	 * @param string $answer
+	 */
+	public function testExecute($isAlreadyEnabled, $answer) {
+
+		$this->util->expects($this->once())->method('isMasterKeyEnabled')
+			->willReturn($isAlreadyEnabled);
+
+		if ($isAlreadyEnabled) {
+			$this->output->expects($this->once())->method('writeln')
+				->with('Master key already enabled');
+		} else {
+			if ($answer === 'y') {
+				$this->questionHelper->expects($this->once())->method('ask')->willReturn(true);
+				$this->config->expects($this->once())->method('setAppValue')
+					->with('encryption', 'useMasterKey', '1');
+			} else {
+				$this->questionHelper->expects($this->once())->method('ask')->willReturn(false);
+				$this->config->expects($this->never())->method('setAppValue');
+
+			}
+		}
+
+		$this->invokePrivate($this->enableMasterKey, 'execute', [$this->input, $this->output]);
+	}
+
+	public function dataTestExecute() {
+		return [
+			[true, ''],
+			[false, 'y'],
+			[false, 'n'],
+			[false, '']
+		];
+	}
+}
diff --git a/apps/encryption/tests/controller/SettingsControllerTest.php b/apps/encryption/tests/controller/SettingsControllerTest.php
index ed8135b9c4..34aa5a27a7 100644
--- a/apps/encryption/tests/controller/SettingsControllerTest.php
+++ b/apps/encryption/tests/controller/SettingsControllerTest.php
@@ -54,6 +54,9 @@ class SettingsControllerTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	private $sessionMock;
 
+	/** @var  \PHPUnit_Framework_MockObject_MockObject */
+	private $ocSessionMock;
+
 	protected function setUp() {
 
 		parent::setUp();
@@ -91,9 +94,11 @@ class SettingsControllerTest extends TestCase {
 			])
 			->getMock();
 
+		$this->ocSessionMock = $this->getMockBuilder('\OCP\ISession')->disableOriginalConstructor()->getMock();
+
 		$this->userSessionMock->expects($this->any())
 			->method('getUID')
-			->willReturn('testUser');
+			->willReturn('testUserUid');
 
 		$this->userSessionMock->expects($this->any())
 			->method($this->anything())
@@ -110,7 +115,8 @@ class SettingsControllerTest extends TestCase {
 			$this->userSessionMock,
 			$this->keyManagerMock,
 			$this->cryptMock,
-			$this->sessionMock
+			$this->sessionMock,
+			$this->ocSessionMock
 		);
 	}
 
@@ -122,8 +128,10 @@ class SettingsControllerTest extends TestCase {
 		$oldPassword = 'old';
 		$newPassword = 'new';
 
+		$this->userSessionMock->expects($this->once())->method('getUID')->willReturn('uid');
+
 		$this->userManagerMock
-			->expects($this->once())
+			->expects($this->exactly(2))
 			->method('checkPassword')
 			->willReturn(false);
 
@@ -171,16 +179,22 @@ class SettingsControllerTest extends TestCase {
 		$oldPassword = 'old';
 		$newPassword = 'new';
 
-		$this->userSessionMock
-			->expects($this->once())
-			->method('getUID')
-			->willReturn('testUser');
+		$this->ocSessionMock->expects($this->once())
+			->method('get')->with('loginname')->willReturn('testUser');
 
 		$this->userManagerMock
-			->expects($this->once())
+			->expects($this->at(0))
 			->method('checkPassword')
+			->with('testUserUid', 'new')
+			->willReturn(false);
+		$this->userManagerMock
+			->expects($this->at(1))
+			->method('checkPassword')
+			->with('testUser', 'new')
 			->willReturn(true);
 
+
+
 		$this->cryptMock
 			->expects($this->once())
 			->method('decryptPrivateKey')
@@ -188,7 +202,7 @@ class SettingsControllerTest extends TestCase {
 
 		$this->cryptMock
 			->expects($this->once())
-			->method('symmetricEncryptFileContent')
+			->method('encryptPrivateKey')
 			->willReturn('encryptedKey');
 
 		$this->cryptMock
@@ -200,7 +214,7 @@ class SettingsControllerTest extends TestCase {
 		$this->keyManagerMock
 			->expects($this->once())
 			->method('setPrivateKey')
-			->with($this->equalTo('testUser'), $this->equalTo('header.encryptedKey'));
+			->with($this->equalTo('testUserUid'), $this->equalTo('header.encryptedKey'));
 
 		$this->sessionMock
 			->expects($this->once())
diff --git a/apps/encryption/tests/hooks/UserHooksTest.php b/apps/encryption/tests/hooks/UserHooksTest.php
index 921c924d01..aa16a4d870 100644
--- a/apps/encryption/tests/hooks/UserHooksTest.php
+++ b/apps/encryption/tests/hooks/UserHooksTest.php
@@ -114,7 +114,7 @@ class UserHooksTest extends TestCase {
 			->willReturnOnConsecutiveCalls(true, false);
 
 		$this->cryptMock->expects($this->exactly(4))
-			->method('symmetricEncryptFileContent')
+			->method('encryptPrivateKey')
 			->willReturn(true);
 
 		$this->cryptMock->expects($this->any())
diff --git a/apps/encryption/tests/lib/KeyManagerTest.php b/apps/encryption/tests/lib/KeyManagerTest.php
index 0bac5e0341..8f1da623ef 100644
--- a/apps/encryption/tests/lib/KeyManagerTest.php
+++ b/apps/encryption/tests/lib/KeyManagerTest.php
@@ -27,6 +27,7 @@ namespace OCA\Encryption\Tests;
 
 
 use OCA\Encryption\KeyManager;
+use OCA\Encryption\Session;
 use Test\TestCase;
 
 class KeyManagerTest extends TestCase {
@@ -237,30 +238,68 @@ class KeyManagerTest extends TestCase {
 
 	}
 
+	/**
+	 * @dataProvider dataTestInit
+	 *
+	 * @param bool $useMasterKey
+	 */
+	public function testInit($useMasterKey) {
 
-	public function testInit() {
-		$this->keyStorageMock->expects($this->any())
-			->method('getUserKey')
-			->with($this->equalTo($this->userId), $this->equalTo('privateKey'))
-			->willReturn('privateKey');
-		$this->cryptMock->expects($this->any())
-			->method('decryptPrivateKey')
-			->with($this->equalTo('privateKey'), $this->equalTo('pass'))
-			->willReturn('decryptedPrivateKey');
+		$instance = $this->getMockBuilder('OCA\Encryption\KeyManager')
+			->setConstructorArgs(
+				[
+					$this->keyStorageMock,
+					$this->cryptMock,
+					$this->configMock,
+					$this->userMock,
+					$this->sessionMock,
+					$this->logMock,
+					$this->utilMock
+				]
+			)->setMethods(['getMasterKeyId', 'getMasterKeyPassword', 'getSystemPrivateKey', 'getPrivateKey'])
+			->getMock();
 
+		$this->utilMock->expects($this->once())->method('isMasterKeyEnabled')
+			->willReturn($useMasterKey);
 
-		$this->assertTrue(
-			$this->instance->init($this->userId, 'pass')
-		);
+		$this->sessionMock->expects($this->at(0))->method('setStatus')
+			->with(Session::INIT_EXECUTED);
 
+		$instance->expects($this->any())->method('getMasterKeyId')->willReturn('masterKeyId');
+		$instance->expects($this->any())->method('getMasterKeyPassword')->willReturn('masterKeyPassword');
+		$instance->expects($this->any())->method('getSystemPrivateKey')->with('masterKeyId')->willReturn('privateMasterKey');
+		$instance->expects($this->any())->method('getPrivateKey')->with($this->userId)->willReturn('privateUserKey');
+
+		if($useMasterKey) {
+			$this->cryptMock->expects($this->once())->method('decryptPrivateKey')
+				->with('privateMasterKey', 'masterKeyPassword', 'masterKeyId')
+				->willReturn('key');
+		} else {
+			$this->cryptMock->expects($this->once())->method('decryptPrivateKey')
+				->with('privateUserKey', 'pass', $this->userId)
+				->willReturn('key');
+		}
+
+		$this->sessionMock->expects($this->once())->method('setPrivateKey')
+			->with('key');
+
+		$this->assertTrue($instance->init($this->userId, 'pass'));
 	}
 
+	public function dataTestInit() {
+		return [
+			[true],
+			[false]
+		];
+	}
+
+
 	public function testSetRecoveryKey() {
 		$this->keyStorageMock->expects($this->exactly(2))
 			->method('setSystemUserKey')
 			->willReturn(true);
 		$this->cryptMock->expects($this->any())
-			->method('symmetricEncryptFileContent')
+			->method('encryptPrivateKey')
 			->with($this->equalTo('privateKey'), $this->equalTo('pass'))
 			->willReturn('decryptedPrivateKey');
 
@@ -401,5 +440,92 @@ class KeyManagerTest extends TestCase {
 		);
 	}
 
+	public function testGetMasterKeyId() {
+		$this->assertSame('systemKeyId', $this->instance->getMasterKeyId());
+	}
+
+	public function testGetPublicMasterKey() {
+		$this->keyStorageMock->expects($this->once())->method('getSystemUserKey')
+			->with('systemKeyId.publicKey', \OCA\Encryption\Crypto\Encryption::ID)
+			->willReturn(true);
+
+		$this->assertTrue(
+			$this->instance->getPublicMasterKey()
+		);
+	}
+
+	public function testGetMasterKeyPassword() {
+		$this->configMock->expects($this->once())->method('getSystemValue')->with('secret')
+			->willReturn('password');
+
+		$this->assertSame('password',
+			$this->invokePrivate($this->instance, 'getMasterKeyPassword', [])
+		);
+	}
+
+	/**
+	 * @expectedException \Exception
+	 */
+	public function testGetMasterKeyPasswordException() {
+		$this->configMock->expects($this->once())->method('getSystemValue')->with('secret')
+			->willReturn('');
+
+		$this->invokePrivate($this->instance, 'getMasterKeyPassword', []);
+	}
+
+	/**
+	 * @dataProvider dataTestValidateMasterKey
+	 *
+	 * @param $masterKey
+	 */
+	public function testValidateMasterKey($masterKey) {
+
+		/** @var \OCA\Encryption\KeyManager | \PHPUnit_Framework_MockObject_MockObject $instance */
+		$instance = $this->getMockBuilder('OCA\Encryption\KeyManager')
+			->setConstructorArgs(
+				[
+					$this->keyStorageMock,
+					$this->cryptMock,
+					$this->configMock,
+					$this->userMock,
+					$this->sessionMock,
+					$this->logMock,
+					$this->utilMock
+				]
+			)->setMethods(['getPublicMasterKey', 'setSystemPrivateKey', 'getMasterKeyPassword'])
+			->getMock();
+
+		$instance->expects($this->once())->method('getPublicMasterKey')
+			->willReturn($masterKey);
+
+		$instance->expects($this->any())->method('getMasterKeyPassword')->willReturn('masterKeyPassword');
+		$this->cryptMock->expects($this->any())->method('generateHeader')->willReturn('header');
+
+		if(empty($masterKey)) {
+			$this->cryptMock->expects($this->once())->method('createKeyPair')
+				->willReturn(['publicKey' => 'public', 'privateKey' => 'private']);
+			$this->keyStorageMock->expects($this->once())->method('setSystemUserKey')
+				->with('systemKeyId.publicKey', 'public', \OCA\Encryption\Crypto\Encryption::ID);
+			$this->cryptMock->expects($this->once())->method('encryptPrivateKey')
+				->with('private', 'masterKeyPassword', 'systemKeyId')
+				->willReturn('EncryptedKey');
+			$instance->expects($this->once())->method('setSystemPrivateKey')
+				->with('systemKeyId', 'headerEncryptedKey');
+		} else {
+			$this->cryptMock->expects($this->never())->method('createKeyPair');
+			$this->keyStorageMock->expects($this->never())->method('setSystemUserKey');
+			$this->cryptMock->expects($this->never())->method('encryptPrivateKey');
+			$instance->expects($this->never())->method('setSystemPrivateKey');
+		}
+
+		$instance->validateMasterKey();
+	}
+
+	public function dataTestValidateMasterKey() {
+		return [
+			['masterKey'],
+			['']
+		];
+	}
 
 }
diff --git a/apps/encryption/tests/lib/RecoveryTest.php b/apps/encryption/tests/lib/RecoveryTest.php
index 8d5d31af0b..c0624a36be 100644
--- a/apps/encryption/tests/lib/RecoveryTest.php
+++ b/apps/encryption/tests/lib/RecoveryTest.php
@@ -96,7 +96,7 @@ class RecoveryTest extends TestCase {
 			->method('decryptPrivateKey');
 
 		$this->cryptMock->expects($this->once())
-			->method('symmetricEncryptFileContent')
+			->method('encryptPrivateKey')
 			->willReturn(true);
 
 		$this->assertTrue($this->instance->changeRecoveryKeyPassword('password',
diff --git a/apps/encryption/tests/lib/UtilTest.php b/apps/encryption/tests/lib/UtilTest.php
index e75e8ea36b..9988ff93f4 100644
--- a/apps/encryption/tests/lib/UtilTest.php
+++ b/apps/encryption/tests/lib/UtilTest.php
@@ -132,4 +132,25 @@ class UtilTest extends TestCase {
 		return $default ?: null;
 	}
 
+	/**
+	 * @dataProvider dataTestIsMasterKeyEnabled
+	 *
+	 * @param string $value
+	 * @param bool $expect
+	 */
+	public function testIsMasterKeyEnabled($value, $expect) {
+		$this->configMock->expects($this->once())->method('getAppValue')
+			->with('encryption', 'useMasterKey', '0')->willReturn($value);
+		$this->assertSame($expect,
+			$this->instance->isMasterKeyEnabled()
+		);
+	}
+
+	public function dataTestIsMasterKeyEnabled() {
+		return [
+			['0', false],
+			['1', true]
+		];
+	}
+
 }
diff --git a/apps/encryption/tests/lib/crypto/cryptTest.php b/apps/encryption/tests/lib/crypto/cryptTest.php
index 14ed1513e1..c6f16e952d 100644
--- a/apps/encryption/tests/lib/crypto/cryptTest.php
+++ b/apps/encryption/tests/lib/crypto/cryptTest.php
@@ -98,18 +98,41 @@ class cryptTest extends TestCase {
 
 
 	/**
-	 * test generateHeader
+	 * test generateHeader with valid key formats
+	 *
+	 * @dataProvider dataTestGenerateHeader
 	 */
-	public function testGenerateHeader() {
+	public function testGenerateHeader($keyFormat, $expected) {
 
 		$this->config->expects($this->once())
 			->method('getSystemValue')
 			->with($this->equalTo('cipher'), $this->equalTo('AES-256-CFB'))
 			->willReturn('AES-128-CFB');
 
-		$this->assertSame('HBEGIN:cipher:AES-128-CFB:HEND',
-			$this->crypt->generateHeader()
-		);
+		if ($keyFormat) {
+			$result = $this->crypt->generateHeader($keyFormat);
+		} else {
+			$result = $this->crypt->generateHeader();
+		}
+
+		$this->assertSame($expected, $result);
+	}
+
+	/**
+	 * test generateHeader with invalid key format
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testGenerateHeaderInvalid() {
+		$this->crypt->generateHeader('unknown');
+	}
+
+	public function dataTestGenerateHeader() {
+		return [
+			[null, 'HBEGIN:cipher:AES-128-CFB:keyFormat:hash:HEND'],
+			['password', 'HBEGIN:cipher:AES-128-CFB:keyFormat:password:HEND'],
+			['hash', 'HBEGIN:cipher:AES-128-CFB:keyFormat:hash:HEND']
+		];
 	}
 
 	/**
@@ -262,4 +285,97 @@ class cryptTest extends TestCase {
 
 	}
 
+	/**
+	 * test return values of valid ciphers
+	 *
+	 * @dataProvider dataTestGetKeySize
+	 */
+	public function testGetKeySize($cipher, $expected) {
+		$result = $this->invokePrivate($this->crypt, 'getKeySize', [$cipher]);
+		$this->assertSame($expected, $result);
+	}
+
+	/**
+	 * test exception if cipher is unknown
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testGetKeySizeFailure() {
+		$this->invokePrivate($this->crypt, 'getKeySize', ['foo']);
+	}
+
+	public function dataTestGetKeySize() {
+		return [
+			['AES-256-CFB', 32],
+			['AES-128-CFB', 16],
+		];
+	}
+
+	/**
+	 * @dataProvider dataTestDecryptPrivateKey
+	 */
+	public function testDecryptPrivateKey($header, $privateKey, $expectedCipher, $isValidKey, $expected) {
+		/** @var \OCA\Encryption\Crypto\Crypt | \PHPUnit_Framework_MockObject_MockObject $crypt */
+		$crypt = $this->getMockBuilder('OCA\Encryption\Crypto\Crypt')
+			->setConstructorArgs(
+				[
+					$this->logger,
+					$this->userSession,
+					$this->config
+				]
+			)
+			->setMethods(
+				[
+					'parseHeader',
+					'generatePasswordHash',
+					'symmetricDecryptFileContent',
+					'isValidPrivateKey'
+				]
+			)
+			->getMock();
+
+		$crypt->expects($this->once())->method('parseHeader')->willReturn($header);
+		if (isset($header['keyFormat']) && $header['keyFormat'] === 'hash') {
+			$crypt->expects($this->once())->method('generatePasswordHash')->willReturn('hash');
+			$password = 'hash';
+		} else {
+			$crypt->expects($this->never())->method('generatePasswordHash');
+			$password = 'password';
+		}
+
+		$crypt->expects($this->once())->method('symmetricDecryptFileContent')
+			->with('privateKey', $password, $expectedCipher)->willReturn('key');
+		$crypt->expects($this->once())->method('isValidPrivateKey')->willReturn($isValidKey);
+
+		$result = $crypt->decryptPrivateKey($privateKey, 'password');
+
+		$this->assertSame($expected, $result);
+	}
+
+	public function dataTestDecryptPrivateKey() {
+		return [
+			[['cipher' => 'AES-128-CFB', 'keyFormat' => 'password'], 'HBEGIN:HENDprivateKey', 'AES-128-CFB', true, 'key'],
+			[['cipher' => 'AES-256-CFB', 'keyFormat' => 'password'], 'HBEGIN:HENDprivateKey', 'AES-256-CFB', true, 'key'],
+			[['cipher' => 'AES-256-CFB', 'keyFormat' => 'password'], 'HBEGIN:HENDprivateKey', 'AES-256-CFB', false, false],
+			[['cipher' => 'AES-256-CFB', 'keyFormat' => 'hash'], 'HBEGIN:HENDprivateKey', 'AES-256-CFB', true, 'key'],
+			[['cipher' => 'AES-256-CFB'], 'HBEGIN:HENDprivateKey', 'AES-256-CFB', true, 'key'],
+			[[], 'privateKey', 'AES-128-CFB', true, 'key'],
+		];
+	}
+
+	public function testIsValidPrivateKey() {
+		$res = openssl_pkey_new();
+		openssl_pkey_export($res, $privateKey);
+
+		// valid private key
+		$this->assertTrue(
+			$this->invokePrivate($this->crypt, 'isValidPrivateKey', [$privateKey])
+		);
+
+		// invalid private key
+		$this->assertFalse(
+			$this->invokePrivate($this->crypt, 'isValidPrivateKey', ['foo'])
+		);
+	}
+
 }
diff --git a/apps/encryption/tests/lib/crypto/encryptalltest.php b/apps/encryption/tests/lib/crypto/encryptalltest.php
new file mode 100644
index 0000000000..e907d154a2
--- /dev/null
+++ b/apps/encryption/tests/lib/crypto/encryptalltest.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Encryption\Tests\lib\Crypto;
+
+
+use OCA\Encryption\Crypto\EncryptAll;
+use Test\TestCase;
+
+class EncryptAllTest extends TestCase {
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCA\Encryption\KeyManager */
+	protected $keyManager;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\IUserManager */
+	protected $userManager;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCA\Encryption\Users\Setup */
+	protected $setupUser;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OC\Files\View */
+	protected $view;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\IConfig */
+	protected $config;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\Mail\IMailer */
+	protected $mailer;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\IL10N */
+	protected $l;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Helper\QuestionHelper */
+	protected $questionHelper;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Input\InputInterface */
+	protected $inputInterface;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Output\OutputInterface */
+	protected $outputInterface;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\UserInterface */
+	protected $userInterface;
+
+	/** @var  \PHPUnit_Framework_MockObject_MockObject | \OCP\Security\ISecureRandom  */
+	protected $secureRandom;
+
+	/** @var  EncryptAll */
+	protected $encryptAll;
+
+	function setUp() {
+		parent::setUp();
+		$this->setupUser = $this->getMockBuilder('OCA\Encryption\Users\Setup')
+			->disableOriginalConstructor()->getMock();
+		$this->keyManager = $this->getMockBuilder('OCA\Encryption\KeyManager')
+			->disableOriginalConstructor()->getMock();
+		$this->userManager = $this->getMockBuilder('OCP\IUserManager')
+			->disableOriginalConstructor()->getMock();
+		$this->view = $this->getMockBuilder('OC\Files\View')
+			->disableOriginalConstructor()->getMock();
+		$this->config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$this->mailer = $this->getMockBuilder('OCP\Mail\IMailer')
+			->disableOriginalConstructor()->getMock();
+		$this->l = $this->getMockBuilder('OCP\IL10N')
+			->disableOriginalConstructor()->getMock();
+		$this->questionHelper = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
+			->disableOriginalConstructor()->getMock();
+		$this->inputInterface = $this->getMockBuilder('Symfony\Component\Console\Input\InputInterface')
+			->disableOriginalConstructor()->getMock();
+		$this->outputInterface = $this->getMockBuilder('Symfony\Component\Console\Output\OutputInterface')
+			->disableOriginalConstructor()->getMock();
+		$this->userInterface = $this->getMockBuilder('OCP\UserInterface')
+			->disableOriginalConstructor()->getMock();
+
+
+		$this->outputInterface->expects($this->any())->method('getFormatter')
+			->willReturn($this->getMock('\Symfony\Component\Console\Formatter\OutputFormatterInterface'));
+
+		$this->userManager->expects($this->any())->method('getBackends')->willReturn([$this->userInterface]);
+		$this->userInterface->expects($this->any())->method('getUsers')->willReturn(['user1', 'user2']);
+
+		$this->secureRandom = $this->getMockBuilder('OCP\Security\ISecureRandom')->disableOriginalConstructor()->getMock();
+		$this->secureRandom->expects($this->any())->method('getMediumStrengthGenerator')->willReturn($this->secureRandom);
+		$this->secureRandom->expects($this->any())->method('getLowStrengthGenerator')->willReturn($this->secureRandom);
+		$this->secureRandom->expects($this->any())->method('generate')->willReturn('12345678');
+
+
+		$this->encryptAll = new EncryptAll(
+			$this->setupUser,
+			$this->userManager,
+			$this->view,
+			$this->keyManager,
+			$this->config,
+			$this->mailer,
+			$this->l,
+			$this->questionHelper,
+			$this->secureRandom
+		);
+	}
+
+	public function testEncryptAll() {
+		/** @var EncryptAll  | \PHPUnit_Framework_MockObject_MockObject  $encryptAll */
+		$encryptAll = $this->getMockBuilder('OCA\Encryption\Crypto\EncryptAll')
+			->setConstructorArgs(
+				[
+					$this->setupUser,
+					$this->userManager,
+					$this->view,
+					$this->keyManager,
+					$this->config,
+					$this->mailer,
+					$this->l,
+					$this->questionHelper,
+					$this->secureRandom
+				]
+			)
+			->setMethods(['createKeyPairs', 'encryptAllUsersFiles', 'outputPasswords'])
+			->getMock();
+
+		$encryptAll->expects($this->at(0))->method('createKeyPairs')->with();
+		$encryptAll->expects($this->at(1))->method('encryptAllUsersFiles')->with();
+		$encryptAll->expects($this->at(2))->method('outputPasswords')->with();
+
+		$encryptAll->encryptAll($this->inputInterface, $this->outputInterface);
+
+	}
+
+	public function testCreateKeyPairs() {
+		/** @var EncryptAll  | \PHPUnit_Framework_MockObject_MockObject  $encryptAll */
+		$encryptAll = $this->getMockBuilder('OCA\Encryption\Crypto\EncryptAll')
+			->setConstructorArgs(
+				[
+					$this->setupUser,
+					$this->userManager,
+					$this->view,
+					$this->keyManager,
+					$this->config,
+					$this->mailer,
+					$this->l,
+					$this->questionHelper,
+					$this->secureRandom
+				]
+			)
+			->setMethods(['setupUserFS', 'generateOneTimePassword'])
+			->getMock();
+
+
+		// set protected property $output
+		$this->invokePrivate($encryptAll, 'output', [$this->outputInterface]);
+
+		$this->keyManager->expects($this->exactly(2))->method('userHasKeys')
+			->willReturnCallback(
+				function ($user) {
+					if ($user === 'user1') {
+						return false;
+					}
+					return true;
+				}
+			);
+
+		$encryptAll->expects($this->once())->method('setupUserFS')->with('user1');
+		$encryptAll->expects($this->once())->method('generateOneTimePassword')->with('user1')->willReturn('password');
+		$this->setupUser->expects($this->once())->method('setupUser')->with('user1', 'password');
+
+		$this->invokePrivate($encryptAll, 'createKeyPairs');
+
+		$userPasswords = $this->invokePrivate($encryptAll, 'userPasswords');
+
+		// we only expect the skipped user, because generateOneTimePassword which
+		// would set the user with the new password was mocked.
+		// This method will be tested separately
+		$this->assertSame(1, count($userPasswords));
+		$this->assertSame('', $userPasswords['user2']);
+	}
+
+	public function testEncryptAllUsersFiles() {
+		/** @var EncryptAll  | \PHPUnit_Framework_MockObject_MockObject  $encryptAll */
+		$encryptAll = $this->getMockBuilder('OCA\Encryption\Crypto\EncryptAll')
+			->setConstructorArgs(
+				[
+					$this->setupUser,
+					$this->userManager,
+					$this->view,
+					$this->keyManager,
+					$this->config,
+					$this->mailer,
+					$this->l,
+					$this->questionHelper,
+					$this->secureRandom
+				]
+			)
+			->setMethods(['encryptUsersFiles'])
+			->getMock();
+
+		// set protected property $output
+		$this->invokePrivate($encryptAll, 'output', [$this->outputInterface]);
+		$this->invokePrivate($encryptAll, 'userPasswords', [['user1' => 'pwd1', 'user2' => 'pwd2']]);
+
+		$encryptAll->expects($this->at(0))->method('encryptUsersFiles')->with('user1');
+		$encryptAll->expects($this->at(1))->method('encryptUsersFiles')->with('user2');
+
+		$this->invokePrivate($encryptAll, 'encryptAllUsersFiles');
+
+	}
+
+	public function testEncryptUsersFiles() {
+		/** @var EncryptAll  | \PHPUnit_Framework_MockObject_MockObject  $encryptAll */
+		$encryptAll = $this->getMockBuilder('OCA\Encryption\Crypto\EncryptAll')
+			->setConstructorArgs(
+				[
+					$this->setupUser,
+					$this->userManager,
+					$this->view,
+					$this->keyManager,
+					$this->config,
+					$this->mailer,
+					$this->l,
+					$this->questionHelper,
+					$this->secureRandom
+				]
+			)
+			->setMethods(['encryptFile'])
+			->getMock();
+
+
+		$this->view->expects($this->at(0))->method('getDirectoryContent')
+			->with('/user1/files')->willReturn(
+				[
+					['name' => 'foo', 'type'=>'dir'],
+					['name' => 'bar', 'type'=>'file'],
+				]
+			);
+
+		$this->view->expects($this->at(3))->method('getDirectoryContent')
+			->with('/user1/files/foo')->willReturn(
+				[
+					['name' => 'subfile', 'type'=>'file']
+				]
+			);
+
+		$this->view->expects($this->any())->method('is_dir')
+			->willReturnCallback(
+				function($path) {
+					if ($path === '/user1/files/foo') {
+						return true;
+					}
+					return false;
+				}
+			);
+
+		$encryptAll->expects($this->at(0))->method('encryptFile')->with('/user1/files/bar');
+		$encryptAll->expects($this->at(1))->method('encryptFile')->with('/user1/files/foo/subfile');
+
+		$progressBar = $this->getMockBuilder('Symfony\Component\Console\Helper\ProgressBar')
+			->disableOriginalConstructor()->getMock();
+
+		$this->invokePrivate($encryptAll, 'encryptUsersFiles', ['user1', $progressBar, '']);
+
+	}
+
+	public function testGenerateOneTimePassword() {
+		$password = $this->invokePrivate($this->encryptAll, 'generateOneTimePassword', ['user1']);
+		$this->assertTrue(is_string($password));
+		$this->assertSame(8, strlen($password));
+
+		$userPasswords = $this->invokePrivate($this->encryptAll, 'userPasswords');
+		$this->assertSame(1, count($userPasswords));
+		$this->assertSame($password, $userPasswords['user1']);
+	}
+
+}
diff --git a/apps/encryption/tests/lib/crypto/encryptionTest.php b/apps/encryption/tests/lib/crypto/encryptionTest.php
index 7b0b29fe19..f58aa5d3cc 100644
--- a/apps/encryption/tests/lib/crypto/encryptionTest.php
+++ b/apps/encryption/tests/lib/crypto/encryptionTest.php
@@ -36,6 +36,9 @@ class EncryptionTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	private $keyManagerMock;
 
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	private $encryptAllMock;
+
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	private $cryptMock;
 
@@ -60,6 +63,9 @@ class EncryptionTest extends TestCase {
 		$this->keyManagerMock = $this->getMockBuilder('OCA\Encryption\KeyManager')
 			->disableOriginalConstructor()
 			->getMock();
+		$this->encryptAllMock = $this->getMockBuilder('OCA\Encryption\Crypto\EncryptAll')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->loggerMock = $this->getMockBuilder('OCP\ILogger')
 			->disableOriginalConstructor()
 			->getMock();
@@ -75,6 +81,7 @@ class EncryptionTest extends TestCase {
 			$this->cryptMock,
 			$this->keyManagerMock,
 			$this->utilMock,
+			$this->encryptAllMock,
 			$this->loggerMock,
 			$this->l10nMock
 		);
diff --git a/apps/encryption/tests/lib/users/SetupTest.php b/apps/encryption/tests/lib/users/SetupTest.php
index e6936c5c12..bca3ff58b0 100644
--- a/apps/encryption/tests/lib/users/SetupTest.php
+++ b/apps/encryption/tests/lib/users/SetupTest.php
@@ -43,6 +43,8 @@ class SetupTest extends TestCase {
 	private $instance;
 
 	public function testSetupServerSide() {
+		$this->keyManagerMock->expects($this->exactly(2))->method('validateShareKey');
+		$this->keyManagerMock->expects($this->exactly(2))->method('validateMasterKey');
 		$this->keyManagerMock->expects($this->exactly(2))
 			->method('userHasKeys')
 			->with('admin')
diff --git a/apps/encryption/vendor/pbkdf2fallback.php b/apps/encryption/vendor/pbkdf2fallback.php
new file mode 100644
index 0000000000..ca579f8e7d
--- /dev/null
+++ b/apps/encryption/vendor/pbkdf2fallback.php
@@ -0,0 +1,87 @@
+<?php
+/* Note; This class can be removed as soon as we drop PHP 5.4 support.
+ *
+ *
+ * Password Hashing With PBKDF2 (http://crackstation.net/hashing-security.htm).
+ * Copyright (c) 2013, Taylor Hornby
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+namespace OCA\Encryption\Vendor;
+
+class PBKDF2Fallback {
+
+	/*
+	 * PBKDF2 key derivation function as defined by RSA's PKCS #5: https://www.ietf.org/rfc/rfc2898.txt
+	 * $algorithm - The hash algorithm to use. Recommended: SHA256
+	 * $password - The password.
+	 * $salt - A salt that is unique to the password.
+	 * $count - Iteration count. Higher is better, but slower. Recommended: At least 1000.
+	 * $key_length - The length of the derived key in bytes.
+	 * $raw_output - If true, the key is returned in raw binary format. Hex encoded otherwise.
+	 * Returns: A $key_length-byte key derived from the password and salt.
+	 *
+	 * Test vectors can be found here: https://www.ietf.org/rfc/rfc6070.txt
+	 *
+	 * This implementation of PBKDF2 was originally created by https://defuse.ca
+	 * With improvements by http://www.variations-of-shadow.com
+	 */
+	public function pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output = false) {
+		$algorithm = strtolower($algorithm);
+		if (!in_array($algorithm, hash_algos(), true))
+			trigger_error('PBKDF2 ERROR: Invalid hash algorithm.', E_USER_ERROR);
+		if ($count <= 0 || $key_length <= 0)
+			trigger_error('PBKDF2 ERROR: Invalid parameters.', E_USER_ERROR);
+
+		if (function_exists("hash_pbkdf2")) {
+			// The output length is in NIBBLES (4-bits) if $raw_output is false!
+			if (!$raw_output) {
+				$key_length = $key_length * 2;
+			}
+			return hash_pbkdf2($algorithm, $password, $salt, $count, $key_length, $raw_output);
+		}
+
+		$hash_length = strlen(hash($algorithm, "", true));
+		$block_count = ceil($key_length / $hash_length);
+
+		$output = "";
+		for ($i = 1; $i <= $block_count; $i++) {
+			// $i encoded as 4 bytes, big endian.
+			$last = $salt . pack("N", $i);
+			// first iteration
+			$last = $xorsum = hash_hmac($algorithm, $last, $password, true);
+			// perform the other $count - 1 iterations
+			for ($j = 1; $j < $count; $j++) {
+				$xorsum ^= ($last = hash_hmac($algorithm, $last, $password, true));
+			}
+			$output .= $xorsum;
+		}
+
+		if ($raw_output)
+			return substr($output, 0, $key_length);
+		else
+			return bin2hex(substr($output, 0, $key_length));
+	}
+}
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 3f430cd27e..7d47a538fa 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -49,10 +49,14 @@ foreach ($users as $user) {
 	$scanner = new \OC\Files\Utils\Scanner($user, \OC::$server->getDatabaseConnection());
 	$scanner->listen('\OC\Files\Utils\Scanner', 'scanFile', array($listener, 'file'));
 	$scanner->listen('\OC\Files\Utils\Scanner', 'scanFolder', array($listener, 'folder'));
-	if ($force) {
-		$scanner->scan($dir);
-	} else {
-		$scanner->backgroundScan($dir);
+	try {
+		if ($force) {
+			$scanner->scan($dir);
+		} else {
+			$scanner->backgroundScan($dir);
+		}
+	} catch (\Exception $e) {
+		$eventSource->send('error', get_class($e) . ': ' . $e->getMessage());
 	}
 }
 
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 4bc2ce8bdf..7ff02d8db8 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -148,7 +148,7 @@ if ($maxUploadFileSize >= 0 and $totalSize > $maxUploadFileSize) {
 }
 
 $result = array();
-if (strpos($dir, '..') === false) {
+if (\OC\Files\Filesystem::isValidPath($dir) === true) {
 	$fileCount = count($files['name']);
 	for ($i = 0; $i < $fileCount; $i++) {
 
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index 2691c05c34..ff1369bb1a 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -94,3 +94,12 @@ if ($installedVersion === '1.1.9' && (
 		}
 	}
 }
+
+/**
+ * migrate old constant DEBUG to new config value 'debug'
+ *
+ * TODO: remove this in ownCloud 8.3
+ */
+if(defined('DEBUG') && DEBUG === true) {
+	\OC::$server->getConfig()->setSystemValue('debug', true);
+}
diff --git a/apps/files/appinfo/version b/apps/files/appinfo/version
index 5ed5faa5f1..9ee1f786d5 100644
--- a/apps/files/appinfo/version
+++ b/apps/files/appinfo/version
@@ -1 +1 @@
-1.1.10
+1.1.11
diff --git a/apps/files/css/detailsView.css b/apps/files/css/detailsView.css
index 76629cb790..8eded7acda 100644
--- a/apps/files/css/detailsView.css
+++ b/apps/files/css/detailsView.css
@@ -9,14 +9,44 @@
 
 #app-sidebar .mainFileInfoView {
 	margin-right: 20px; /* accomodate for close icon */
+	float:left;
+	display:block;
+	width: 100%;
+}
+
+#app-sidebar .file-details-container {
+	display: inline-block;
+	float: left;
+}
+
+#app-sidebar .thumbnailContainer.image {
+	margin-left: -15px;
+	margin-right: -35px; /* 15 + 20 for the close button */
+	margin-top: -15px;
+}
+
+#app-sidebar .image .thumbnail {
+	width:100%;
+	display:block;
+	height: 250px;
+	background-repeat: no-repeat;
+	background-position: 50% top;
+	background-size: 100%;
+	float: none;
+	margin: 0;
+}
+
+#app-sidebar .image.portrait .thumbnail {
+	background-size: contain;
 }
 
 #app-sidebar .thumbnail {
-	width: 50px;
-	height: 50px;
+	width: 75px;
+	height: 75px;
+	display: inline-block;
 	float: left;
 	margin-right: 10px;
-	background-size: 50px;
+	background-size: 75px;
 }
 
 #app-sidebar .ellipsis {
@@ -27,13 +57,20 @@
 
 #app-sidebar .fileName {
 	font-size: 16px;
-	padding-top: 3px;
+	padding-top: 13px;
+	padding-bottom: 3px;
+}
+
+#app-sidebar .fileName h3 {
+	max-width: 300px;
+	float:left;
 }
 
 #app-sidebar .file-details {
 	margin-top: 3px;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
 	opacity: .5;
+	float:left;
 }
 #app-sidebar .action-favorite {
 	vertical-align: text-bottom;
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index d66eece94d..05033dc2fe 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -18,11 +18,6 @@
 	z-index: -30;
 }
 
-#new {
-	z-index: 1010;
-	float: left;
-	padding: 0 !important; /* override default control bar button padding */
-}
 #trash {
 	margin-right: 8px;
 	float: right;
@@ -30,49 +25,8 @@
 	padding: 10px;
 	font-weight: normal;
 }
-#new > a {
-	padding: 14px 10px;
-	position: relative;
-	top: 7px;
-}
-#new.active {
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-	border-bottom: none;
-	background: #f8f8f8;
-}
-#new > ul {
-	display: none;
-	position: fixed;
-	min-width: 112px;
-	z-index: -10;
-	padding: 8px;
-	padding-bottom: 0;
-	margin-top: 13.5px;
-	margin-left: -1px;
-	text-align: left;
-	background: #f8f8f8;
-	border: 1px solid #ddd;
-	border: 1px solid rgba(190, 190, 190, 0.901961);
-	border-radius: 5px;
-	border-top-left-radius: 0;
-	box-shadow: 0 2px 7px rgba(170,170,170,.4);
-}
-#new > ul > li {
-	height: 36px;
-	margin: 5px;
-	padding-left: 42px;
-	padding-bottom: 2px;
-	background-position: left center;
-	cursor: pointer;
-}
-#new > ul > li > p {
-	cursor: pointer;
-	padding-top: 7px;
-	padding-bottom: 7px;
-}
 
-#new .error, #fileList .error {
+.newFileMenu .error, #fileList .error {
 	color: #e9322d;
 	border-color: #e9322d;
 	-webkit-box-shadow: 0 0 6px #f8b9b7;
@@ -96,7 +50,10 @@
 	min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
 }
 
-#filestable tbody tr { background-color:#fff; height:51px; }
+#filestable tbody tr {
+	background-color: #fff;
+	height: 51px;
+}
 
 /* fit app list view heights */
 .app-files #app-content>.viewcontainer {
@@ -133,26 +90,52 @@
 	position: fixed !important;
 	bottom: 44px;
 	width: inherit !important;
-	background-color: #f5f5f5;
+	background-color: #fff;
+	border-right: 1px solid #eee;
 }
 /* double padding to account for Deleted files entry, issue with Firefox */
 .app-files #app-navigation > ul li:nth-last-child(2) {
 	margin-bottom: 44px;
 }
 
-#filestable tbody tr { background-color:#fff; height:40px; }
+#app-navigation .nav-files a.nav-icon-files {
+	width: auto;
+}
+/* button needs overrides due to navigation styles */
+#app-navigation .nav-files a.new {
+	width: 40px;
+	height: 32px;
+	padding: 0 10px;
+	margin: 0;
+	cursor: pointer;
+}
+
+#app-navigation .nav-files a {
+	display: inline-block;
+}
+
+#app-navigation .nav-files a.new.hidden {
+	display: none;
+}
+
+#app-navigation .nav-files a.new.disabled {
+	opacity: 0.3;
+}
+
+#filestable tbody tr {
+	background-color: #fff;
+	height: 40px;
+}
 #filestable tbody tr:hover,
 #filestable tbody tr:focus,
 #filestable tbody .name:focus,
-#filestable tbody tr:active {
-	background-color: rgb(240,240,240);
-}
+#filestable tbody tr:active,
 #filestable tbody tr.highlighted,
-#filestable tbody tr.selected {
-	background-color: rgb(230,230,230);
-}
-#filestable tbody tr.searchresult {
-	background-color: rgb(240,240,240);
+#filestable tbody tr.highlighted .name:focus,
+#filestable tbody tr.selected,
+#filestable tbody tr.searchresult,
+table tr.mouseOver td {
+	background-color: #f8f8f8;
 }
 tbody a { color:#000; }
 
@@ -177,9 +160,6 @@ tr:focus span.extension {
 	color: #777;
 }
 
-table tr.mouseOver td {
-	background-color: #eee;
-}
 table th, table th a {
 	color: #999;
 }
@@ -218,10 +198,14 @@ table th:focus .sort-indicator.hidden {
 	visibility: visible;
 }
 
-table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
+table th,
+table td {
+	border-bottom: 1px solid #eee;
+	text-align: left;
+	font-weight: normal;
+}
 table td {
 	padding: 0 15px;
-	border-bottom: 1px solid #eee;
 	font-style: normal;
 	background-position: 8px center;
 	background-repeat: no-repeat;
@@ -270,7 +254,7 @@ table thead th {
 	background-color: #fff;
 }
 table.multiselect thead th {
-	background-color: rgba(220,220,220,.8);
+	background-color: rgba(248,248,248,.8); /* #f8f8f8 like other hover style */
 	color: #000;
 	font-weight: bold;
 	border-bottom: 0;
@@ -368,30 +352,53 @@ table td.filename .nametext .innernametext {
 	max-width: 47%;
 }
 
-@media only screen and (min-width: 1366px) {
+@media only screen and (min-width: 1500px) {
+	table td.filename .nametext .innernametext {
+		max-width: 790px;
+	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 390px;
+	}
+}
+@media only screen and (min-width: 1366px) and (max-width: 1500px) {
 	table td.filename .nametext .innernametext {
 		max-width: 660px;
 	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 290px;
+	}
 }
 @media only screen and (min-width: 1200px) and (max-width: 1366px) {
 	table td.filename .nametext .innernametext {
 		max-width: 500px;
 	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 230px;
+	}
 }
 @media only screen and (min-width: 1100px) and (max-width: 1200px) {
 	table td.filename .nametext .innernametext {
 		max-width: 400px;
 	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 230px;
+	}
 }
 @media only screen and (min-width: 1000px) and (max-width: 1100px) {
 	table td.filename .nametext .innernametext {
 		max-width: 310px;
 	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 230px;
+	}
 }
 @media only screen and (min-width: 768px) and (max-width: 1000px) {
 	table td.filename .nametext .innernametext {
 		max-width: 240px;
 	}
+	.with-app-sidebar table td.filename .nametext .innernametext {
+		max-width: 230px;
+	}
 }
 
 /* for smaller resolutions - see mobile.css */
@@ -494,7 +501,6 @@ table td.filename .uploadtext {
 .fileactions {
 	position: absolute;
 	right: 0;
-	font-size: 11px;
 }
 
 .busy .fileactions, .busy .action {
@@ -568,6 +574,14 @@ a.action > img {
 	opacity: 0;
 	display:none;
 }
+#fileList a.action.action-share,
+#fileList a.action.action-menu {
+	padding: 17px 14px;
+}
+
+#fileList .popovermenu {
+	margin-right: 21px;
+}
 
 .ie8 #fileList a.action img,
 #fileList tr:hover a.action,
@@ -583,9 +597,9 @@ a.action > img {
 #fileList tr:focus a.action.disabled:focus,
 #fileList .name:focus a.action.disabled:focus,
 #fileList a.action.disabled img {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-	filter: alpha(opacity=50);
-	opacity: .5;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+	filter: alpha(opacity=30);
+	opacity: .3;
 	display:inline;
 }
 .ie8 #fileList a.action:hover img,
@@ -595,15 +609,44 @@ a.action > img {
 #fileList tr:hover a.action:hover,
 #fileList tr:focus a.action:focus,
 #fileList .name:focus a.action:focus {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	filter: alpha(opacity=100);
-	opacity: 1;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+	filter: alpha(opacity=70);
+	opacity: 7;
 	display:inline;
 }
 #fileList tr a.action.disabled {
 	background: none;
 }
 
+/* show share action of shared items darker to distinguish from non-shared */
+#fileList a.action.permanent.shared-style,
+#fileList a.action.action-favorite.permanent {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
+	filter: alpha(opacity=70) !important;
+	opacity: .7 !important;
+}
+/* always show actions on mobile, not only on hover */
+#fileList a.action.action-menu.permanent {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)" !important;
+	filter: alpha(opacity=30) !important;
+	opacity: .3 !important;
+	display: inline !important;
+}
+
+/* properly display actions in the popover menu */
+#fileList .popovermenu .action {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)" !important;
+	filter: alpha(opacity=50) !important;
+	opacity: .5 !important;
+}
+#fileList .popovermenu .action:hover,
+#fileList .popovermenu .action:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important;
+	filter: alpha(opacity=100) !important;
+	opacity: 1 !important;
+}
+
+
 #selectedActionsList a.download.disabled,
 #fileList tr a.action.action-download.disabled {
 	color: #000000;
@@ -666,7 +709,7 @@ table.dragshadow td.size {
 	left: 0;
 	right: 0;
 	bottom: 0;
-	background-color: white;
+	background-color: #fff;
 	background-repeat: no-repeat no-repeat;
 	background-position: 50%;
 	opacity: 0.7;
@@ -681,43 +724,56 @@ table.dragshadow td.size {
 	opacity: 0;
 }
 
-.fileActionsMenu {
-	padding: 4px 12px;
-}
-.fileActionsMenu li {
-	padding: 5px 0;
-}
-#fileList .fileActionsMenu a.action img {
+#fileList .popovermenu a.action img {
 	padding: initial;
 }
-#fileList .fileActionsMenu a.action {
+
+#fileList .popovermenu a.action {
 	padding: 10px;
 	margin: -10px;
 }
 
-.fileActionsMenu.hidden {
-	display: none;
+.newFileMenu {
+	width: 140px;
+	margin-left: -56px;
+	margin-top: 25px;
 }
 
-#fileList .fileActionsMenu .action {
+.newFileMenu .menuitem {
+	white-space: nowrap;
+	overflow: hidden;
+}
+.newFileMenu.popovermenu .menuitem .icon {
+	margin-bottom: -2px;
+}
+.newFileMenu.popovermenu a.menuitem,
+.newFileMenu.popovermenu label.menuitem,
+.newFileMenu.popovermenu .menuitem {
+	padding: 0;
+	margin: 0;
+}
+
+.newFileMenu.bubble:after {
+	left: 75px;
+	right: auto;
+}
+.newFileMenu.bubble:before {
+	left: 75px;
+	right: auto;
+}
+
+.newFileMenu .filenameform {
+	display: inline-block;
+}
+
+.newFileMenu .filenameform input {
+	width: 100px;
+}
+
+#fileList .popovermenu .action {
 	display: block;
 	line-height: 30px;
 	padding-left: 5px;
 	color: #000;
 	padding: 0;
 }
-
-.fileActionsMenu .action img,
-.fileActionsMenu .action .no-icon {
-	display: inline-block;
-	width: 16px;
-	margin-right: 5px;
-}
-
-.fileActionsMenu .action {
-	opacity: 0.5;
-}
-
-.fileActionsMenu li:hover .action {
-	opacity: 1;
-}
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
index dd8244a291..0641304d21 100644
--- a/apps/files/css/mobile.css
+++ b/apps/files/css/mobile.css
@@ -32,35 +32,25 @@ table td.filename .nametext {
 	width: 100%;
 }
 
-/* always show actions on mobile, not only on hover */
-#fileList a.action,
-#fileList a.action.action-menu.permanent {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)" !important;
-	filter: alpha(opacity=20) !important;
-	opacity: .2 !important;
-	display: inline !important;
-}
-/* show share action of shared items darker to distinguish from non-shared */
-#fileList a.action.permanent {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
-	filter: alpha(opacity=70) !important;
-	opacity: .7 !important;
-}
 #fileList a.action.action-menu img {
-	padding-left: 2px;
+	padding-left: 0;
 }
 
 #fileList .fileActionsMenu {
-	margin-right: 5px;
-}
-/* some padding for better clickability */
-#fileList a.action img {
-	padding: 0 6px 0 12px;
+	margin-right: 6px;
 }
 /* hide text of the share action on mobile */
 #fileList a.action-share span {
 	display: none;
 }
+#fileList a.action.action-favorite {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)" !important;
+	opacity: .7 !important;
+}
+#fileList a.action.action-favorite {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)" !important;
+	opacity: .3 !important;
+}
 
 /* ellipsis on file names */
 table td.filename .nametext .innernametext {
diff --git a/apps/files/css/upload.css b/apps/files/css/upload.css
index bd60f83138..07b788b937 100644
--- a/apps/files/css/upload.css
+++ b/apps/files/css/upload.css
@@ -24,20 +24,6 @@
 }
 .file_upload_target { display:none; }
 .file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
-#file_upload_start {
-	position: relative;
-	left: 0;
-	top: 0;
-	width: 44px;
-	height: 44px;
-	margin: -5px -3px;
-	padding: 0;
-	font-size: 16px;
-	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
-	z-index: 20;
-	cursor: pointer;
-	overflow: hidden;
-}
 
 #uploadprogresswrapper, #uploadprogresswrapper * {
 	-moz-box-sizing: border-box;
diff --git a/apps/files/img/delete.png b/apps/files/img/delete.png
index b2ab8c5efe..20e894c7f7 100644
Binary files a/apps/files/img/delete.png and b/apps/files/img/delete.png differ
diff --git a/apps/files/img/delete.svg b/apps/files/img/delete.svg
index b6dc2cc417..f0a3cd4db8 100644
--- a/apps/files/img/delete.svg
+++ b/apps/files/img/delete.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path opacity=".5" d="m6.5 1-0.5 1h-3c-0.554 0-1 0.446-1 1v1h12v-1c0-0.554-0.446-1-1-1h-3l-0.5-1zm-3.5 4 0.875 9c0.061 0.549 0.5729 1 1.125 1h6c0.55232 0 1.064-0.45102 1.125-1l0.875-9z" fill-rule="evenodd"/>
+ <path d="m6.5 1-0.5 1h-3c-0.554 0-1 0.446-1 1v1h12v-1c0-0.554-0.446-1-1-1h-3l-0.5-1zm-3.5 4 0.875 9c0.061 0.549 0.5729 1 1.125 1h6c0.55232 0 1.064-0.45102 1.125-1l0.875-9z" fill-rule="evenodd"/>
 </svg>
diff --git a/apps/files/img/external.png b/apps/files/img/external.png
index 2ac5e9344c..af03dbf3e0 100644
Binary files a/apps/files/img/external.png and b/apps/files/img/external.png differ
diff --git a/apps/files/img/external.svg b/apps/files/img/external.svg
index d1940f2f1b..80eba5b996 100644
--- a/apps/files/img/external.svg
+++ b/apps/files/img/external.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path opacity=".5" d="m7.4515 1.6186 2.3806 2.2573-3.5709 3.386 2.3806 2.2573 3.5709-3.386 2.3806 2.2573v-6.7725h-7.1422zm-4.7612 1.1286c-0.65945 0-1.1903 0.5034-1.1903 1.1286v9.029c0 0.6253 0.53085 1.1286 1.1903 1.1286h9.522c0.6594 0 1.1903-0.5034 1.1903-1.1286v-3.386l-1.19-1.1287v4.5146h-9.5217v-9.029h4.761l-1.1905-1.1287h-3.5707z"/>
+ <path d="m7.4515 1.6186 2.3806 2.2573-3.5709 3.386 2.3806 2.2573 3.5709-3.386 2.3806 2.2573v-6.7725h-7.1422zm-4.7612 1.1286c-0.65945 0-1.1903 0.5034-1.1903 1.1286v9.029c0 0.6253 0.53085 1.1286 1.1903 1.1286h9.522c0.6594 0 1.1903-0.5034 1.1903-1.1286v-3.386l-1.19-1.1287v4.5146h-9.5217v-9.029h4.761l-1.1905-1.1287h-3.5707z"/>
 </svg>
diff --git a/apps/files/img/folder.png b/apps/files/img/folder.png
index ada4c4c2f8..287a0c9ba6 100644
Binary files a/apps/files/img/folder.png and b/apps/files/img/folder.png differ
diff --git a/apps/files/img/folder.svg b/apps/files/img/folder.svg
index 1a97808443..0cf4b3499d 100644
--- a/apps/files/img/folder.svg
+++ b/apps/files/img/folder.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.04 -864.43)">
-  <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2327 0.53125-0.5312l0.0004-8.1661c0-0.289-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.2771-0.30237 0.5638-0.57937 0.5638s-0.57447-0.2867-0.57447-0.5638l0.0004-7.0055c0-0.2771 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
+ <g fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.05 -864.43)">
+  <path d="m200.2 999.72c-0.28913 0-0.53125 0.2421-0.53125 0.53117v12.784c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53124-0.2327 0.53124-0.5312l0.0004-10.474c0-0.2889-0.24211-0.5338-0.53124-0.5338l-7.5457 0.0005-2.3076-2.3078z" fill-rule="evenodd"/>
  </g>
 </svg>
diff --git a/apps/files/img/public.png b/apps/files/img/public.png
index f49c5fb1ee..772838ad20 100644
Binary files a/apps/files/img/public.png and b/apps/files/img/public.png differ
diff --git a/apps/files/img/public.svg b/apps/files/img/public.svg
index 23ac51d836..7721c9e340 100644
--- a/apps/files/img/public.svg
+++ b/apps/files/img/public.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" transform="matrix(.67042 -.67042 .67042 .67042 .62542 93.143)">
+ <g transform="matrix(.67042 -.67042 .67042 .67042 .62542 93.143)">
   <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m69.5-61.5c-1.9217 0-3.5 1.5783-3.5 3.5 0 0.17425 0.0062 0.33232 0.03125 0.5h2.0625c-0.053-0.156-0.094-0.323-0.094-0.5 0-0.8483 0.6517-1.5 1.5-1.5h5c0.8483 0 1.5 0.6517 1.5 1.5s-0.6517 1.5-1.5 1.5h-1.6875c-0.28733 0.79501-0.78612 1.4793-1.4375 2h3.125c1.9217 0 3.5-1.5783 3.5-3.5s-1.5783-3.5-3.5-3.5h-5z"/>
   <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m68.5-54.5c1.9217 0 3.5-1.5783 3.5-3.5 0-0.17425-0.0062-0.33232-0.03125-0.5h-2.0625c0.053 0.156 0.094 0.323 0.094 0.5 0 0.8483-0.6517 1.5-1.5 1.5h-5c-0.8483 0-1.5-0.6517-1.5-1.5s0.6517-1.5 1.5-1.5h1.6875c0.28733-0.79501 0.78612-1.4793 1.4375-2h-3.125c-1.9217 0-3.5 1.5783-3.5 3.5s1.5783 3.5 3.5 3.5h5z"/>
  </g>
diff --git a/apps/files/img/share.png b/apps/files/img/share.png
index 61c87e78b6..fdacbbabeb 100644
Binary files a/apps/files/img/share.png and b/apps/files/img/share.png differ
diff --git a/apps/files/img/share.svg b/apps/files/img/share.svg
index 97f52f2e78..d67d35c6e5 100644
--- a/apps/files/img/share.svg
+++ b/apps/files/img/share.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" transform="translate(0 -1036.4)">
+ <g transform="translate(0 -1036.4)">
   <path d="m12.228 1037.4c-1.3565 0-2.4592 1.0977-2.4592 2.4542 0 0.075 0.0084 0.1504 0.0149 0.2236l-4.7346 2.4145c-0.4291-0.3667-0.98611-0.5863-1.5947-0.5863-1.3565 0-2.4542 1.0977-2.4542 2.4543 0 1.3565 1.0977 2.4542 2.4542 2.4542 0.54607 0 1.0528-0.1755 1.4606-0.477l4.8637 2.4741c-0.0024 0.044-0.0099 0.089-0.0099 0.1342 0 1.3565 1.1027 2.4542 2.4592 2.4542s2.4542-1.0977 2.4542-2.4542-1.0977-2.4592-2.4542-2.4592c-0.63653 0-1.218 0.2437-1.6544 0.6409l-4.6953-2.4c0.01892-0.1228 0.03478-0.2494 0.03478-0.3775 0-0.072-0.0089-0.1437-0.0149-0.2137l4.7395-2.4145c0.42802 0.3627 0.98488 0.5813 1.5898 0.5813 1.3565 0 2.4542-1.1027 2.4542-2.4592s-1.0977-2.4542-2.4542-2.4542z"/>
  </g>
 </svg>
diff --git a/apps/files/img/star.png b/apps/files/img/star.png
index 6b0ec67ec1..8b24c4441c 100644
Binary files a/apps/files/img/star.png and b/apps/files/img/star.png differ
diff --git a/apps/files/img/star.svg b/apps/files/img/star.svg
index fb3eef1e45..ba0f54f8eb 100644
--- a/apps/files/img/star.svg
+++ b/apps/files/img/star.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g opacity=".5" transform="matrix(.049689 0 0 .049689 -7.3558 -36.792)">
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="matrix(.068322 0 0 .068322 -10.114 -50.902)">
   <path d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)"/>
  </g>
 </svg>
diff --git a/apps/files/index.php b/apps/files/index.php
index a73caa50fb..cc007ebdb0 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -38,6 +38,7 @@ OCP\Util::addStyle('files', 'upload');
 OCP\Util::addStyle('files', 'mobile');
 OCP\Util::addscript('files', 'app');
 OCP\Util::addscript('files', 'file-upload');
+OCP\Util::addscript('files', 'newfilemenu');
 OCP\Util::addscript('files', 'jquery.iframe-transport');
 OCP\Util::addscript('files', 'jquery.fileupload');
 OCP\Util::addscript('files', 'jquery-visibility');
diff --git a/apps/files/js/app.js b/apps/files/js/app.js
index adb1893bb0..f31770466f 100644
--- a/apps/files/js/app.js
+++ b/apps/files/js/app.js
@@ -162,6 +162,7 @@
 					dir: '/'
 				};
 				this._changeUrl(params.view, params.dir);
+				OC.Apps.hideAppSidebar($('.detailsView'));
 				this.navigation.getActiveContainer().trigger(new $.Event('urlChanged', params));
 			}
 		},
@@ -181,6 +182,9 @@
 		 */
 		_onChangeViewerMode: function(e) {
 			var state = !!e.viewerModeEnabled;
+			if (e.viewerModeEnabled) {
+				OC.Apps.hideAppSidebar($('.detailsView'));
+			}
 			$('#app-navigation').toggleClass('hidden', state);
 			$('.app-files').toggleClass('viewer-mode no-sidebar', state);
 		},
diff --git a/apps/files/js/detailsview.js b/apps/files/js/detailsview.js
index a4ebe90cd6..3a775c29ec 100644
--- a/apps/files/js/detailsview.js
+++ b/apps/files/js/detailsview.js
@@ -10,24 +10,20 @@
 
 (function() {
 	var TEMPLATE =
-		'<div>' +
 		'	<div class="detailFileInfoContainer">' +
 		'	</div>' +
-		'	<div>' +
-		'		{{#if tabHeaders}}' +
-		'		<ul class="tabHeaders">' +
+		'	{{#if tabHeaders}}' +
+		'	<ul class="tabHeaders">' +
 		'		{{#each tabHeaders}}' +
 		'		<li class="tabHeader" data-tabid="{{tabId}}" data-tabindex="{{tabIndex}}">' +
 		'			<a href="#">{{label}}</a>' +
 		'		</li>' +
 		'		{{/each}}' +
-		'		</ul>' +
-		'		{{/if}}' +
-		'		<div class="tabsContainer">' +
-		'		</div>' +
+		'	</ul>' +
+		'	{{/if}}' +
+		'	<div class="tabsContainer">' +
 		'	</div>' +
-		'	<a class="close icon-close" href="#" alt="{{closeLabel}}"></a>' +
-		'</div>';
+		'	<a class="close icon-close" href="#" alt="{{closeLabel}}"></a>';
 
 	/**
 	 * @class OCA.Files.DetailsView
@@ -39,7 +35,7 @@
 	var DetailsView = OC.Backbone.View.extend({
 		id: 'app-sidebar',
 		tabName: 'div',
-		className: 'detailsView',
+		className: 'detailsView scroll-container',
 
 		_template: null,
 
@@ -268,4 +264,3 @@
 
 	OCA.Files.DetailsView = DetailsView;
 })();
-
diff --git a/apps/files/js/detailtabview.js b/apps/files/js/detailtabview.js
index b0e170bc4e..449047cf25 100644
--- a/apps/files/js/detailtabview.js
+++ b/apps/files/js/detailtabview.js
@@ -84,6 +84,13 @@
 		 */
 		getFileInfo: function() {
 			return this.model;
+		},
+
+		/**
+		 * Load the next page of results
+		 */
+		nextPage: function() {
+			// load the next page, if applicable
 		}
 	});
 	DetailTabView._TAB_COUNT = 0;
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 6b6acdb5e0..17f0f77716 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -551,155 +551,6 @@ OC.Upload = {
 			$('#file_upload_start').attr('multiple', 'multiple');
 		}
 
-		$(document).click(function(ev) {
-			// do not close when clicking in the dropdown
-			if ($(ev.target).closest('#new').length){
-				return;
-			}
-			$('#new>ul').hide();
-			$('#new').removeClass('active');
-			if ($('#new .error').length > 0) {
-				$('#new .error').tipsy('hide');
-			}
-			$('#new li').each(function(i,element) {
-				if ($(element).children('p').length === 0) {
-					$(element).children('form').remove();
-					$(element).append('<p>' + $(element).data('text') + '</p>');
-				}
-			});
-		});
-		$('#new').click(function(event) {
-			event.stopPropagation();
-		});
-		$('#new>a').click(function() {
-			$('#new>ul').toggle();
-			$('#new').toggleClass('active');
-		});
-		$('#new li').click(function() {
-			if ($(this).children('p').length === 0) {
-				return;
-			}
-
-			$('#new .error').tipsy('hide');
-
-			$('#new li').each(function(i, element) {
-				if ($(element).children('p').length === 0) {
-					$(element).children('form').remove();
-					$(element).append('<p>' + $(element).data('text') + '</p>');
-				}
-			});
-
-			var type = $(this).data('type');
-			var text = $(this).children('p').text();
-			$(this).data('text', text);
-			$(this).children('p').remove();
-
-			// add input field
-			var form = $('<form></form>');
-			var input = $('<input type="text">');
-			var newName = $(this).attr('data-newname') || '';
-			var fileType = 'input-' + $(this).attr('data-type');
-			if (newName) {
-				input.val(newName);
-				input.attr('id', fileType);
-			}
-			var label = $('<label class="hidden-visually" for="">' + escapeHTML(newName) + '</label>');
-			label.attr('for', fileType);
-
-			form.append(label).append(input);
-			$(this).append(form);
-			var lastPos;
-			var checkInput = function () {
-				var filename = input.val();
-				if (!Files.isFileNameValid(filename)) {
-					// Files.isFileNameValid(filename) throws an exception itself
-				} else if (FileList.inList(filename)) {
-					throw t('files', '{new_name} already exists', {new_name: filename});
-				} else {
-					return true;
-				}
-			};
-
-			// verify filename on typing
-			input.keyup(function(event) {
-				try {
-					checkInput();
-					input.tipsy('hide');
-					input.removeClass('error');
-				} catch (error) {
-					input.attr('title', error);
-					input.tipsy({gravity: 'w', trigger: 'manual'});
-					input.tipsy('show');
-					input.addClass('error');
-				}
-			});
-
-			input.focus();
-			// pre select name up to the extension
-			lastPos = newName.lastIndexOf('.');
-			if (lastPos === -1) {
-				lastPos = newName.length;
-			}
-			input.selectRange(0, lastPos);
-			form.submit(function(event) {
-				event.stopPropagation();
-				event.preventDefault();
-				try {
-					checkInput();
-					var newname = input.val();
-					if (FileList.lastAction) {
-						FileList.lastAction();
-					}
-					var name = FileList.getUniqueName(newname);
-					switch(type) {
-						case 'file':
-							$.post(
-								OC.filePath('files', 'ajax', 'newfile.php'),
-								{
-									dir: FileList.getCurrentDirectory(),
-									filename: name
-								},
-								function(result) {
-									if (result.status === 'success') {
-										FileList.add(result.data, {animate: true, scrollTo: true});
-									} else {
-										OC.dialogs.alert(result.data.message, t('core', 'Could not create file'));
-									}
-								}
-							);
-							break;
-						case 'folder':
-							$.post(
-								OC.filePath('files','ajax','newfolder.php'),
-								{
-									dir: FileList.getCurrentDirectory(),
-									foldername: name
-								},
-								function(result) {
-									if (result.status === 'success') {
-										FileList.add(result.data, {animate: true, scrollTo: true});
-									} else {
-										OC.dialogs.alert(result.data.message, t('core', 'Could not create folder'));
-									}
-								}
-							);
-							break;
-					}
-					var li = form.parent();
-					form.remove();
-					/* workaround for IE 9&10 click event trap, 2 lines: */
-					$('input').first().focus();
-					$('#content').focus();
-					li.append('<p>' + li.data('text') + '</p>');
-					$('#new>a').click();
-				} catch (error) {
-					input.attr('title', error);
-					input.tipsy({gravity: 'w', trigger: 'manual'});
-					input.tipsy('show');
-					input.addClass('error');
-				}
-			});
-		});
 		window.file_upload_param = file_upload_param;
 		return file_upload_param;
 	}
diff --git a/apps/files/js/fileactionsmenu.js b/apps/files/js/fileactionsmenu.js
index 623ebde544..5ab0e42f93 100644
--- a/apps/files/js/fileactionsmenu.js
+++ b/apps/files/js/fileactionsmenu.js
@@ -14,7 +14,7 @@
 		'<ul>' +
 		'{{#each items}}' +
 		'<li>' +
-		'<a href="#" class="action action-{{nameLowerCase}} permanent" data-action="{{name}}">{{#if icon}}<img src="{{icon}}"/>{{else}}<span class="no-icon"></span>{{/if}}<span>{{displayName}}</span></a>' +
+		'<a href="#" class="menuitem action action-{{nameLowerCase}} permanent" data-action="{{name}}">{{#if icon}}<img class="icon" src="{{icon}}"/>{{else}}<span class="no-icon"></span>{{/if}}<span>{{displayName}}</span></a>' +
 		'</li>' +
 		'{{/each}}' +
 		'</ul>';
@@ -26,7 +26,7 @@
 	 */
 	var FileActionsMenu = OC.Backbone.View.extend({
 		tagName: 'div',
-		className: 'fileActionsMenu bubble hidden open menu',
+		className: 'fileActionsMenu popovermenu bubble hidden open menu',
 
 		/**
 		 * Current context
diff --git a/apps/files/js/fileinfomodel.js b/apps/files/js/fileinfomodel.js
index 05060854fb..22b1ca9ff0 100644
--- a/apps/files/js/fileinfomodel.js
+++ b/apps/files/js/fileinfomodel.js
@@ -31,16 +31,15 @@
 	 */
 	var FileInfoModel = OC.Backbone.Model.extend({
 
+		defaults: {
+			mimetype: 'application/octet-stream',
+			path: ''
+		},
+
 		initialize: function(data) {
 			if (!_.isUndefined(data.id)) {
 				data.id = parseInt(data.id, 10);
 			}
-
-			// TODO: normalize path
-			data.path = data.path || '';
-			data.name = data.name;
-
-			data.mimetype = data.mimetype || 'application/octet-stream';
 		},
 
 		/**
@@ -52,6 +51,15 @@
 			return this.get('mimetype') === 'httpd/unix-directory';
 		},
 
+		/**
+		 * Returns whether this file is an image
+		 *
+		 * @return {boolean} true if this is an image, false otherwise
+		 */
+		isImage: function() {
+			return this.has('mimetype') ? this.get('mimetype').substr(0, 6) === 'image/' : false;
+		},
+
 		/**
 		 * Returns the full path to this file
 		 *
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index eb46f15526..3e12573c04 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -9,6 +9,9 @@
  */
 
 (function() {
+
+	var TEMPLATE_ADDBUTTON = '<a href="#" class="button new" title="{{addText}}"><img src="{{iconUrl}}"></img></a>';
+
 	/**
 	 * @class OCA.Files.FileList
 	 * @classdesc
@@ -190,7 +193,19 @@
 			this.$container = options.scrollContainer || $(window);
 			this.$table = $el.find('table:first');
 			this.$fileList = $el.find('#fileList');
+
+			if (_.isUndefined(options.detailsViewEnabled) || options.detailsViewEnabled) {
+				this._detailsView = new OCA.Files.DetailsView();
+				this._detailsView.$el.insertBefore(this.$el);
+				this._detailsView.$el.addClass('disappear');
+			}
+
 			this._initFileActions(options.fileActions);
+
+			if (this._detailsView) {
+				this._detailsView.addDetailView(new OCA.Files.MainFileInfoDetailView({fileList: this, fileActions: this.fileActions}));
+			}
+
 			this.files = [];
 			this._selectedFiles = {};
 			this._selectionSummary = new OCA.Files.FileSummary();
@@ -211,15 +226,10 @@
 			}
 			this.breadcrumb = new OCA.Files.BreadCrumb(breadcrumbOptions);
 
-			if (_.isUndefined(options.detailsViewEnabled) || options.detailsViewEnabled) {
-				this._detailsView = new OCA.Files.DetailsView();
-				this._detailsView.addDetailView(new OCA.Files.MainFileInfoDetailView({fileList: this, fileActions: this.fileActions}));
-				this._detailsView.$el.insertBefore(this.$el);
-				this._detailsView.$el.addClass('disappear');
-			}
-
 			this.$el.find('#controls').prepend(this.breadcrumb.$el);
 
+			this._renderNewButton();
+
 			this.$el.find('thead th .columntitle').click(_.bind(this._onClickHeader, this));
 
 			this._onResize = _.debounce(_.bind(this._onResize, this), 100);
@@ -262,6 +272,12 @@
 		 * Destroy / uninitialize this instance.
 		 */
 		destroy: function() {
+			if (this._newFileMenu) {
+				this._newFileMenu.remove();
+			}
+			if (this._newButton) {
+				this._newButton.remove();
+			}
 			// TODO: also unregister other event handlers
 			this.fileActions.off('registerAction', this._onFileActionsUpdated);
 			this.fileActions.off('setDefault', this._onFileActionsUpdated);
@@ -274,11 +290,25 @@
 		 * @param {OCA.Files.FileActions} fileActions file actions
 		 */
 		_initFileActions: function(fileActions) {
+			var self = this;
 			this.fileActions = fileActions;
 			if (!this.fileActions) {
 				this.fileActions = new OCA.Files.FileActions();
 				this.fileActions.registerDefaultActions();
 			}
+
+			if (this._detailsView) {
+				this.fileActions.registerAction({
+					name: 'Details',
+					mime: 'all',
+					permissions: OC.PERMISSION_READ,
+					actionHandler: function(fileName, context) {
+						self._updateDetailsView(fileName);
+						OC.Apps.showAppSidebar();
+					}
+				});
+			}
+
 			this._onFileActionsUpdated = _.debounce(_.bind(this._onFileActionsUpdated, this), 100);
 			this.fileActions.on('registerAction', this._onFileActionsUpdated);
 			this.fileActions.on('setDefault', this._onFileActionsUpdated);
@@ -291,6 +321,7 @@
 		 * @return {OCA.Files.FileInfoModel} file info model
 		 */
 		getModelForFile: function(fileName) {
+			var self = this;
 			var $tr;
 			// jQuery object ?
 			if (fileName.is) {
@@ -318,6 +349,21 @@
 			if (!model.has('path')) {
 				model.set('path', this.getCurrentDirectory(), {silent: true});
 			}
+
+			model.on('change', function(model) {
+				// re-render row
+				var highlightState = $tr.hasClass('highlighted');
+				$tr = self.updateRow(
+					$tr,
+					_.extend({isPreviewAvailable: true}, model.toJSON()),
+					{updateSummary: true, silent: false, animate: true}
+				);
+				$tr.toggleClass('highlighted', highlightState);
+			});
+			model.on('busy', function(model, state) {
+				self.showFileBusyState($tr, state);
+			});
+
 			return model;
 		},
 
@@ -339,8 +385,10 @@
 			}
 
 			if (!fileName) {
-				OC.Apps.hideAppSidebar();
 				this._detailsView.setFileInfo(null);
+				if (this._currentFileModel) {
+					this._currentFileModel.off();
+				}
 				this._currentFileModel = null;
 				return;
 			}
@@ -354,7 +402,6 @@
 
 			this._detailsView.setFileInfo(model);
 			this._detailsView.$el.scrollTop(0);
-			_.defer(OC.Apps.showAppSidebar);
 		},
 
 		/**
@@ -673,6 +720,7 @@
 				id: parseInt($el.attr('data-id'), 10),
 				name: $el.attr('data-file'),
 				mimetype: $el.attr('data-mime'),
+				mtime: parseInt($el.attr('data-mtime'), 10),
 				type: $el.attr('data-type'),
 				size: parseInt($el.attr('data-size'), 10),
 				etag: $el.attr('data-etag'),
@@ -1222,6 +1270,10 @@
 		reload: function() {
 			this._selectedFiles = {};
 			this._selectionSummary.clear();
+			if (this._currentFileModel) {
+				this._currentFileModel.off();
+			}
+			this._currentFileModel = null;
 			this.$el.find('.select-all').prop('checked', false);
 			this.showMask();
 			if (this._reloadCall) {
@@ -1358,6 +1410,12 @@
 			if (options.y) {
 				urlSpec.y = options.y;
 			}
+			if (options.a) {
+				urlSpec.a = options.a;
+			}
+			if (options.mode) {
+				urlSpec.mode = options.mode;
+			}
 
 			if (etag){
 				// use etag as cache buster
@@ -1376,9 +1434,14 @@
 			img.onload = function(){
 				// if loading the preview image failed (no preview for the mimetype) then img.width will < 5
 				if (img.width > 5) {
-					ready(previewURL);
+					ready(previewURL, img);
+				} else if (options.error) {
+					options.error();
 				}
 			};
+			if (options.error) {
+				img.onerror = options.error;
+			}
 			img.src = previewURL;
 		},
 
@@ -1542,6 +1605,23 @@
 
 		},
 
+		/**
+		 * Updates the given row with the given file info
+		 *
+		 * @param {Object} $tr row element
+		 * @param {OCA.Files.FileInfo} fileInfo file info
+		 * @param {Object} options options
+		 *
+		 * @return {Object} new row element
+		 */
+		updateRow: function($tr, fileInfo, options) {
+			this.files.splice($tr.index(), 1);
+			$tr.remove();
+			$tr = this.add(fileInfo, _.extend({updateSummary: false, silent: true}, options));
+			this.$fileList.trigger($.Event('fileActionsReady', {fileList: this, $files: $tr}));
+			return $tr;
+		},
+
 		/**
 		 * Triggers file rename input field for the given file name.
 		 * If the user enters a new name, the file will be renamed.
@@ -1678,6 +1758,106 @@
 				form.trigger('submit');
 			});
 		},
+
+		/**
+		 * Create an empty file inside the current directory.
+		 *
+		 * @param {string} name name of the file
+		 *
+		 * @return {Promise} promise that will be resolved after the
+		 * file was created
+		 *
+		 * @since 8.2
+		 */
+		createFile: function(name) {
+			var self = this;
+			var deferred = $.Deferred();
+			var promise = deferred.promise();
+
+			OCA.Files.Files.isFileNameValid(name);
+			name = this.getUniqueName(name);
+
+			if (this.lastAction) {
+				this.lastAction();
+			}
+
+			$.post(
+				OC.generateUrl('/apps/files/ajax/newfile.php'),
+				{
+					dir: this.getCurrentDirectory(),
+					filename: name
+				},
+				function(result) {
+					if (result.status === 'success') {
+						self.add(result.data, {animate: true, scrollTo: true});
+						deferred.resolve(result.status, result.data);
+					} else {
+						if (result.data && result.data.message) {
+							OC.Notification.showTemporary(result.data.message);
+						} else {
+							OC.Notification.showTemporary(t('core', 'Could not create file'));
+						}
+						deferred.reject(result.status, result.data);
+					}
+				}
+			);
+
+			return promise;
+		},
+
+		/**
+		 * Create a directory inside the current directory.
+		 *
+		 * @param {string} name name of the directory
+		 *
+		 * @return {Promise} promise that will be resolved after the
+		 * directory was created
+		 *
+		 * @since 8.2
+		 */
+		createDirectory: function(name) {
+			var self = this;
+			var deferred = $.Deferred();
+			var promise = deferred.promise();
+
+			OCA.Files.Files.isFileNameValid(name);
+			name = this.getUniqueName(name);
+
+			if (this.lastAction) {
+				this.lastAction();
+			}
+
+			$.post(
+				OC.generateUrl('/apps/files/ajax/newfolder.php'),
+				{
+					dir: this.getCurrentDirectory(),
+					foldername: name
+				},
+				function(result) {
+					if (result.status === 'success') {
+						self.add(result.data, {animate: true, scrollTo: true});
+						deferred.resolve(result.status, result.data);
+					} else {
+						if (result.data && result.data.message) {
+							OC.Notification.showTemporary(result.data.message);
+						} else {
+							OC.Notification.showTemporary(t('core', 'Could not create folder'));
+						}
+						deferred.reject(result.status);
+					}
+				}
+			);
+
+			return promise;
+		},
+
+		/**
+		 * Returns whether the given file name exists in the list
+		 *
+		 * @param {string} file file name
+		 *
+		 * @return {bool} true if the file exists in the list, false otherwise
+		 */
 		inList:function(file) {
 			return this.findFileEl(file).length;
 		},
@@ -2339,6 +2519,47 @@
 			});
 		},
 
+		_renderNewButton: function() {
+			// if an upload button (legacy) already exists, skip
+			if ($('#controls .button.upload').length) {
+				return;
+			}
+			if (!this._addButtonTemplate) {
+				this._addButtonTemplate = Handlebars.compile(TEMPLATE_ADDBUTTON);
+			}
+			var $newButton = $(this._addButtonTemplate({
+				addText: t('files', 'New'),
+				iconUrl: OC.imagePath('core', 'actions/add')
+			}));
+
+			$('#controls .actions').prepend($newButton);
+			$newButton.tooltip({'placement': 'bottom'});
+
+			$newButton.click(_.bind(this._onClickNewButton, this));
+			this._newButton = $newButton;
+		},
+
+		_onClickNewButton: function(event) {
+			var $target = $(event.target);
+			if (!$target.hasClass('.button')) {
+				$target = $target.closest('.button');
+			}
+			this._newButton.tooltip('hide');
+			event.preventDefault();
+			if ($target.hasClass('disabled')) {
+				return false;
+			}
+			if (!this._newFileMenu) {
+				this._newFileMenu = new OCA.Files.NewFileMenu({
+					fileList: this
+				});
+				$('body').append(this._newFileMenu.$el);
+			}
+			this._newFileMenu.showAt($target);
+
+			return false;
+		},
+
 		/**
 		 * Register a tab view to be added to all views
 		 */
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 245648a79e..4fdc9eb211 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -333,6 +333,9 @@ function scanFiles(force, dir, users) {
 	scannerEventSource.listen('folder',function(path) {
 		console.log('now scanning ' + path);
 	});
+	scannerEventSource.listen('error',function(message) {
+		console.error('Scanner error: ', message);
+	});
 	scannerEventSource.listen('done',function(count) {
 		scanFiles.scanning=false;
 		console.log('done after ' + count + ' files');
diff --git a/apps/files/js/mainfileinfodetailview.js b/apps/files/js/mainfileinfodetailview.js
index 6910e5f2be..efdbb5e2ad 100644
--- a/apps/files/js/mainfileinfodetailview.js
+++ b/apps/files/js/mainfileinfodetailview.js
@@ -10,14 +10,17 @@
 
 (function() {
 	var TEMPLATE =
-		'<a href="#" class="thumbnail action-default"></a><div title="{{name}}" class="fileName ellipsis">{{name}}</div>' +
-		'<div class="file-details ellipsis">' +
-		'    <a href="#" ' +
-		'    alt="{{starAltText}}"' +
-		'    class="action action-favorite favorite">' +
-		'    <img class="svg" src="{{starIcon}}" />' +
-		'    </a>' +
-		'    <span class="size" title="{{altSize}}">{{size}}</span>, <span class="date" title="{{altDate}}">{{date}}</span>' +
+		'<div class="thumbnailContainer"><a href="#" class="thumbnail action-default"></a></div>' +
+		'<div class="file-details-container">' +
+		'<div class="fileName"><h3 title="{{name}}" class="ellipsis">{{name}}</h3></div>' +
+		'	<div class="file-details ellipsis">' +
+		'		<a href="#" ' +
+		'		alt="{{starAltText}}"' +
+		'		class="action action-favorite favorite">' +
+		'			<img class="svg" src="{{starIcon}}" />' +
+		'		</a>' +
+		'		{{#if hasSize}}<span class="size" title="{{altSize}}">{{size}}</span>, {{/if}}<span class="date" title="{{altDate}}">{{date}}</span>' +
+		'	</div>' +
 		'</div>';
 
 	/**
@@ -103,10 +106,12 @@
 			if (this.model) {
 				var isFavorite = (this.model.get('tags') || []).indexOf(OC.TAG_FAVORITE) >= 0;
 				this.$el.html(this.template({
+					type: this.model.isImage()? 'image': '',
 					nameLabel: t('files', 'Name'),
-					name: this.model.get('name'),
+					name: this.model.get('displayName') || this.model.get('name'),
 					pathLabel: t('files', 'Path'),
 					path: this.model.get('path'),
+					hasSize: this.model.has('size'),
 					sizeLabel: t('files', 'Size'),
 					size: OC.Util.humanFileSize(this.model.get('size'), true),
 					altSize: n('files', '%n byte', '%n bytes', this.model.get('size')),
@@ -119,17 +124,51 @@
 
 				// TODO: we really need OC.Previews
 				var $iconDiv = this.$el.find('.thumbnail');
+				$iconDiv.addClass('icon-loading icon-32');
+				$container = this.$el.find('.thumbnailContainer');
 				if (!this.model.isDirectory()) {
-					// TODO: inject utility class?
-					FileList.lazyLoadPreview({
+					this._fileList.lazyLoadPreview({
 						path: this.model.getFullPath(),
 						mime: this.model.get('mimetype'),
 						etag: this.model.get('etag'),
-						x: 50,
-						y: 50,
-						callback: function(previewUrl) {
-							$iconDiv.css('background-image', 'url("' + previewUrl + '")');
-						}
+						y: this.model.isImage() ? 250: 75,
+						x: this.model.isImage() ? 99999 /* only limit on y */ : 75,
+						a: this.model.isImage() ? 1 : null,
+						callback: function(previewUrl, img) {
+							$iconDiv.previewImg = previewUrl;
+							if (img) {
+								$iconDiv.removeClass('icon-loading icon-32');
+								if(img.height > img.width) {
+									$container.addClass('portrait');
+								}
+							}
+							if (this.model.isImage() && img) {
+								$iconDiv.parent().addClass('image');
+								var targetHeight = img.height / window.devicePixelRatio;
+								if (targetHeight <= 75) {
+									$container.removeClass('image'); // small enough to fit in normaly
+									targetHeight = 75;
+								}
+							} else {
+								targetHeight = 75;
+							}
+
+							// only set background when we have an actual preview
+							// when we dont have a preview we show the mime icon in the error handler
+							if (img) {
+								$iconDiv.css({
+									'background-image': 'url("' + previewUrl + '")',
+									'height': targetHeight
+								});
+							}
+						}.bind(this),
+						error: function() {
+							$iconDiv.removeClass('icon-loading icon-32');
+							this.$el.find('.thumbnailContainer').removeClass('image'); //fall back to regular view
+							$iconDiv.css({
+								'background-image': 'url("' + $iconDiv.previewImg + '")'
+							});
+						}.bind(this)
 					});
 				} else {
 					// TODO: special icons / shared / external
diff --git a/apps/files/js/newfilemenu.js b/apps/files/js/newfilemenu.js
new file mode 100644
index 0000000000..4c021e6b87
--- /dev/null
+++ b/apps/files/js/newfilemenu.js
@@ -0,0 +1,235 @@
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+/* global Files */
+
+(function() {
+
+	var TEMPLATE_MENU =
+		'<ul>' +
+		'<li>' +
+		'<label for="file_upload_start" class="menuitem" data-action="upload" title="{{uploadMaxHumanFilesize}}"><span class="svg icon icon-upload"></span><span class="displayname">{{uploadLabel}}</span></label>' +
+		'</li>' +
+		'{{#each items}}' +
+		'<li>' +
+		'<a href="#" class="menuitem" data-templatename="{{templateName}}" data-filetype="{{fileType}}" data-action="{{id}}"><span class="icon {{iconClass}} svg"></span><span class="displayname">{{displayName}}</span></a>' +
+		'</li>' +
+		'{{/each}}' +
+		'</ul>';
+
+	var TEMPLATE_FILENAME_FORM =
+		'<form class="filenameform">' +
+		'<label class="hidden-visually" for="{{cid}}-input-{{fileType}}">{{fileName}}</label>' +
+		'<input id="{{cid}}-input-{{fileType}}" type="text" value="{{fileName}}">' +
+		'</form>';
+
+	/**
+	 * Construct a new NewFileMenu instance
+	 * @constructs NewFileMenu
+	 *
+	 * @memberof OCA.Files
+	 */
+	var NewFileMenu = OC.Backbone.View.extend({
+		tagName: 'div',
+		className: 'newFileMenu popovermenu bubble hidden open menu',
+
+		events: {
+			'click .menuitem': '_onClickAction'
+		},
+
+		initialize: function(options) {
+			var self = this;
+			var $uploadEl = $('#file_upload_start');
+			if ($uploadEl.length) {
+				$uploadEl.on('fileuploadstart', function() {
+					self.trigger('actionPerformed', 'upload');
+				});
+			} else {
+				console.warn('Missing upload element "file_upload_start"');
+			}
+
+			this._fileList = options && options.fileList;
+		},
+
+		template: function(data) {
+			if (!OCA.Files.NewFileMenu._TEMPLATE) {
+				OCA.Files.NewFileMenu._TEMPLATE = Handlebars.compile(TEMPLATE_MENU);
+			}
+			return OCA.Files.NewFileMenu._TEMPLATE(data);
+		},
+
+		/**
+		 * Event handler whenever an action has been clicked within the menu
+		 *
+		 * @param {Object} event event object
+		 */
+		_onClickAction: function(event) {
+			var $target = $(event.target);
+			if (!$target.hasClass('menuitem')) {
+				$target = $target.closest('.menuitem');
+			}
+			var action = $target.attr('data-action');
+			// note: clicking the upload label will automatically
+			// set the focus on the "file_upload_start" hidden field
+			// which itself triggers the upload dialog.
+			// Currently the upload logic is still in file-upload.js and filelist.js
+			if (action === 'upload') {
+				OC.hideMenus();
+			} else {
+				event.preventDefault();
+				this._promptFileName($target);
+			}
+		},
+
+		_promptFileName: function($target) {
+			var self = this;
+			if (!OCA.Files.NewFileMenu._TEMPLATE_FORM) {
+				OCA.Files.NewFileMenu._TEMPLATE_FORM = Handlebars.compile(TEMPLATE_FILENAME_FORM);
+			}
+
+			if ($target.find('form').length) {
+				$target.find('input').focus();
+				return;
+			}
+
+			// discard other forms
+			this.$el.find('form').remove();
+			this.$el.find('.displayname').removeClass('hidden');
+
+			$target.find('.displayname').addClass('hidden');
+
+			var newName = $target.attr('data-templatename');
+			var fileType = $target.attr('data-filetype');
+			var $form = $(OCA.Files.NewFileMenu._TEMPLATE_FORM({
+				fileName: newName,
+				cid: this.cid,
+				fileType: fileType
+			}));
+
+			//this.trigger('actionPerformed', action);
+			$target.append($form);
+
+			// here comes the OLD code
+			var $input = $form.find('input');
+
+			var lastPos;
+			var checkInput = function () {
+				var filename = $input.val();
+				try {
+					if (!Files.isFileNameValid(filename)) {
+						// Files.isFileNameValid(filename) throws an exception itself
+					} else if (self._fileList.inList(filename)) {
+						throw t('files', '{newname} already exists', {newname: filename});
+					} else {
+						return true;
+					}
+				} catch (error) {
+					$input.attr('title', error);
+					$input.tooltip({placement: 'right', trigger: 'manual'});
+					$input.tooltip('show');
+					$input.addClass('error');
+				}
+				return false;
+			};
+
+			// verify filename on typing
+			$input.keyup(function() {
+				if (checkInput()) {
+					$input.tooltip('hide');
+					$input.removeClass('error');
+				}
+			});
+
+			$input.focus();
+			// pre select name up to the extension
+			lastPos = newName.lastIndexOf('.');
+			if (lastPos === -1) {
+				lastPos = newName.length;
+			}
+			$input.selectRange(0, lastPos);
+
+			$form.submit(function(event) {
+				event.stopPropagation();
+				event.preventDefault();
+
+				if (checkInput()) {
+					var newname = $input.val();
+					self._createFile(fileType, newname);
+					$form.remove();
+					$target.find('.displayname').removeClass('hidden');
+					OC.hideMenus();
+				}
+			});
+		},
+
+		/**
+		 * Creates a file with the given type and name.
+		 * This calls the matching methods on the attached file list.
+		 *
+		 * @param {string} fileType file type
+		 * @param {string} name file name
+		 */
+		_createFile: function(fileType, name) {
+			switch(fileType) {
+				case 'file':
+					this._fileList.createFile(name);
+					break;
+				case 'folder':
+					this._fileList.createDirectory(name);
+					break;
+				default:
+					console.warn('Unknown file type "' + fileType + '"');
+			}
+		},
+
+		/**
+		 * Renders the menu with the currently set items
+		 */
+		render: function() {
+			this.$el.html(this.template({
+				uploadMaxHumanFileSize: 'TODO',
+				uploadLabel: t('files', 'Upload'),
+				items: [{
+					id: 'file',
+					displayName: t('files', 'Text file'),
+					templateName: t('files', 'New text file.txt'),
+					iconClass: 'icon-filetype-text',
+					fileType: 'file'
+				}, {
+					id: 'folder',
+					displayName: t('files', 'Folder'),
+					templateName: t('files', 'New folder'),
+					iconClass: 'icon-folder',
+					fileType: 'folder'
+				}]
+			}));
+		},
+
+		/**
+		 * Displays the menu under the given element
+		 *
+		 * @param {Object} $target target element
+		 */
+		showAt: function($target) {
+			this.render();
+			var targetOffset = $target.offset();
+			this.$el.css({
+				left: targetOffset.left,
+				top: targetOffset.top + $target.height()
+			});
+			this.$el.removeClass('hidden');
+
+			OC.showMenu(null, this.$el);
+		}
+	});
+
+	OCA.Files.NewFileMenu = NewFileMenu;
+
+})();
diff --git a/apps/files/js/tagsplugin.js b/apps/files/js/tagsplugin.js
index ed1105a170..9f45da9a6e 100644
--- a/apps/files/js/tagsplugin.js
+++ b/apps/files/js/tagsplugin.js
@@ -92,6 +92,7 @@
 				actionHandler: function(fileName, context) {
 					var $actionEl = context.$file.find('.action-favorite');
 					var $file = context.$file;
+					var fileInfo = context.fileList.files[$file.index()];
 					var dir = context.dir || context.fileList.getCurrentDirectory();
 					var tags = $file.attr('data-tags');
 					if (_.isUndefined(tags)) {
@@ -106,9 +107,11 @@
 					} else {
 						tags.push(OC.TAG_FAVORITE);
 					}
+
+					// pre-toggle the star
 					toggleStar($actionEl, !isFavorite);
 
-					context.fileInfoModel.set('tags', tags);
+					context.fileInfoModel.trigger('busy', context.fileInfoModel, true);
 
 					self.applyFileTags(
 						dir + '/' + fileName,
@@ -116,17 +119,16 @@
 						$actionEl,
 						isFavorite
 					).then(function(result) {
+						context.fileInfoModel.trigger('busy', context.fileInfoModel, false);
 						// response from server should contain updated tags
 						var newTags = result.tags;
 						if (_.isUndefined(newTags)) {
 							newTags = tags;
 						}
-						var fileInfo = context.fileList.files[$file.index()];
-						// read latest state from result
-						toggleStar($actionEl, (newTags.indexOf(OC.TAG_FAVORITE) >= 0));
-						$file.attr('data-tags', newTags.join('|'));
-						$file.attr('data-favorite', !isFavorite);
-						fileInfo.tags = newTags;
+						context.fileInfoModel.set({
+							'tags': newTags,
+							'favorite': !isFavorite
+						});
 					});
 				}
 			});
@@ -150,7 +152,13 @@
 			var oldElementToFile = fileList.elementToFile;
 			fileList.elementToFile = function($el) {
 				var fileInfo = oldElementToFile.apply(this, arguments);
-				fileInfo.tags = $el.attr('data-tags') || [];
+				var tags = $el.attr('data-tags');
+				if (_.isUndefined(tags)) {
+					tags = '';
+				}
+				tags = tags.split('|');
+				tags = _.without(tags, '');
+				fileInfo.tags = tags;
 				return fileInfo;
 			};
 		},
diff --git a/apps/files/l10n/af.js b/apps/files/l10n/af.js
deleted file mode 100644
index 5bdf101699..0000000000
--- a/apps/files/l10n/af.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : "[ ,]",
-    "_%n file_::_%n files_" : "[ ,]",
-    "_Uploading %n file_::_Uploading %n files_" : "[ ,]"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/af.json b/apps/files/l10n/af.json
deleted file mode 100644
index 26e5833738..0000000000
--- a/apps/files/l10n/af.json
+++ /dev/null
@@ -1 +0,0 @@
-{"translations":{"_%n folder_::_%n folders_":["",""],"_%n file_::_%n files_":["",""],"_Uploading %n file_::_Uploading %n files_":["",""]},"pluralForm":"nplurals=2; plural=(n != 1);"}
\ No newline at end of file
diff --git a/apps/files/l10n/af_ZA.js b/apps/files/l10n/af_ZA.js
index 0bb44ef953..2061e5ec49 100644
--- a/apps/files/l10n/af_ZA.js
+++ b/apps/files/l10n/af_ZA.js
@@ -1,9 +1,8 @@
 OC.L10N.register(
     "files",
     {
-    "Unshare" : "Deel terug neem",
     "Error" : "Fout",
-    "Settings" : "Instellings",
-    "Folder" : "Omslag"
+    "Folder" : "Omslag",
+    "Settings" : "Instellings"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/af_ZA.json b/apps/files/l10n/af_ZA.json
index 8e3cc3ef4f..95096fd551 100644
--- a/apps/files/l10n/af_ZA.json
+++ b/apps/files/l10n/af_ZA.json
@@ -1,7 +1,6 @@
 { "translations": {
-    "Unshare" : "Deel terug neem",
     "Error" : "Fout",
-    "Settings" : "Instellings",
-    "Folder" : "Omslag"
+    "Folder" : "Omslag",
+    "Settings" : "Instellings"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js
index 412f339a4b..6dab5f6ba2 100644
--- a/apps/files/l10n/ar.js
+++ b/apps/files/l10n/ar.js
@@ -19,31 +19,36 @@ OC.L10N.register(
     "Upload failed. Could not get file info." : "فشلت عملية الرفع. تعذر الحصول على معلومات الملف.",
     "Invalid directory." : "مسار غير صحيح.",
     "Files" : "الملفات",
+    "All files" : "كل الملفات",
     "Favorites" : "المفضلة ",
     "Home" : "البيت",
+    "Close" : "إغلاق",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت",
     "Upload cancelled." : "تم إلغاء عملية رفع الملفات .",
     "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
-    "{new_name} already exists" : "{new_name} موجود مسبقا",
-    "Rename" : "إعادة تسميه",
-    "Delete" : "إلغاء",
-    "Unshare" : "إلغاء المشاركة",
+    "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",
     "Pending" : "قيد الانتظار",
     "Error moving file" : "حدث خطأ أثناء نقل الملف",
     "Error" : "خطأ",
+    "{new_name} already exists" : "{new_name} موجود مسبقا",
     "Name" : "اسم",
     "Size" : "حجم",
     "Modified" : "معدل",
     "_%n folder_::_%n folders_" : ["لا يوجد مجلدات %n","1 مجلد %n","2 مجلد %n","عدد قليل من مجلدات %n","عدد كبير من مجلدات %n","مجلدات %n"],
     "_%n file_::_%n files_" : ["لا يوجد ملفات %n","ملف %n","2 ملف %n","قليل من ملفات %n","الكثير من ملفات %n"," ملفات %n"],
+    "{dirs} and {files}" : "{dirs} و {files}",
     "_Uploading %n file_::_Uploading %n files_" : ["لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"],
+    "New" : "جديد",
     "File name cannot be empty." : "اسم الملف لا يجوز أن يكون فارغا",
     "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
     "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ",
-    "{dirs} and {files}" : "{dirs} و {files}",
     "Favorite" : "المفضلة",
+    "Upload" : "رفع",
+    "Text file" : "ملف",
+    "Folder" : "مجلد",
+    "New folder" : "مجلد جديد",
     "A new file or folder has been <strong>created</strong>" : "تم <strong>  إنشاء</strong> ملف جديد أو مجلد ",
     "A file or folder has been <strong>changed</strong>" : "تم  <strong> تغيير</strong> ملف أو مجلد",
     "A file or folder has been <strong>deleted</strong>" : "تم <strong>حذف </strong> ملف أو مجلد",
@@ -65,12 +70,8 @@ OC.L10N.register(
     "Settings" : "إعدادات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
-    "New" : "جديد",
-    "Text file" : "ملف",
-    "New folder" : "مجلد جديد",
-    "Folder" : "مجلد",
-    "Upload" : "رفع",
     "Cancel upload" : "إلغاء الرفع",
+    "Delete" : "إلغاء",
     "Upload too large" : "حجم الترفيع أعلى من المسموح",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.",
     "Files are being scanned, please wait." : "يرجى الانتظار , جاري فحص الملفات ."
diff --git a/apps/files/l10n/ar.json b/apps/files/l10n/ar.json
index 812769a4fb..745d82dc19 100644
--- a/apps/files/l10n/ar.json
+++ b/apps/files/l10n/ar.json
@@ -17,31 +17,36 @@
     "Upload failed. Could not get file info." : "فشلت عملية الرفع. تعذر الحصول على معلومات الملف.",
     "Invalid directory." : "مسار غير صحيح.",
     "Files" : "الملفات",
+    "All files" : "كل الملفات",
     "Favorites" : "المفضلة ",
     "Home" : "البيت",
+    "Close" : "إغلاق",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت",
     "Upload cancelled." : "تم إلغاء عملية رفع الملفات .",
     "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
     "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
-    "{new_name} already exists" : "{new_name} موجود مسبقا",
-    "Rename" : "إعادة تسميه",
-    "Delete" : "إلغاء",
-    "Unshare" : "إلغاء المشاركة",
+    "Actions" : "* تطبيقات.\n* أنشطة.",
     "Download" : "تحميل",
     "Pending" : "قيد الانتظار",
     "Error moving file" : "حدث خطأ أثناء نقل الملف",
     "Error" : "خطأ",
+    "{new_name} already exists" : "{new_name} موجود مسبقا",
     "Name" : "اسم",
     "Size" : "حجم",
     "Modified" : "معدل",
     "_%n folder_::_%n folders_" : ["لا يوجد مجلدات %n","1 مجلد %n","2 مجلد %n","عدد قليل من مجلدات %n","عدد كبير من مجلدات %n","مجلدات %n"],
     "_%n file_::_%n files_" : ["لا يوجد ملفات %n","ملف %n","2 ملف %n","قليل من ملفات %n","الكثير من ملفات %n"," ملفات %n"],
+    "{dirs} and {files}" : "{dirs} و {files}",
     "_Uploading %n file_::_Uploading %n files_" : ["لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"],
+    "New" : "جديد",
     "File name cannot be empty." : "اسم الملف لا يجوز أن يكون فارغا",
     "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
     "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ",
-    "{dirs} and {files}" : "{dirs} و {files}",
     "Favorite" : "المفضلة",
+    "Upload" : "رفع",
+    "Text file" : "ملف",
+    "Folder" : "مجلد",
+    "New folder" : "مجلد جديد",
     "A new file or folder has been <strong>created</strong>" : "تم <strong>  إنشاء</strong> ملف جديد أو مجلد ",
     "A file or folder has been <strong>changed</strong>" : "تم  <strong> تغيير</strong> ملف أو مجلد",
     "A file or folder has been <strong>deleted</strong>" : "تم <strong>حذف </strong> ملف أو مجلد",
@@ -63,12 +68,8 @@
     "Settings" : "إعدادات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
-    "New" : "جديد",
-    "Text file" : "ملف",
-    "New folder" : "مجلد جديد",
-    "Folder" : "مجلد",
-    "Upload" : "رفع",
     "Cancel upload" : "إلغاء الرفع",
+    "Delete" : "إلغاء",
     "Upload too large" : "حجم الترفيع أعلى من المسموح",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.",
     "Files are being scanned, please wait." : "يرجى الانتظار , جاري فحص الملفات ."
diff --git a/apps/files/l10n/ast.js b/apps/files/l10n/ast.js
index 297ebd6048..33bf5e37c0 100644
--- a/apps/files/l10n/ast.js
+++ b/apps/files/l10n/ast.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Tolos ficheros",
     "Favorites" : "Favoritos",
     "Home" : "Casa",
+    "Close" : "Zarrar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nun pudo xubise {filename}, paez que ye un directoriu o tien 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "El tamañu de ficheru total {size1} perpasa la llende de xuba {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}",
     "Upload cancelled." : "Xuba encaboxada.",
     "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
-    "{new_name} already exists" : "{new_name} yá existe",
-    "Could not create file" : "Nun pudo crease'l ficheru",
-    "Could not create folder" : "Nun pudo crease la carpeta",
-    "Rename" : "Renomar",
-    "Delete" : "Desaniciar",
-    "Disconnect storage" : "Desconeutar almacenamientu",
-    "Unshare" : "Dexar de compartir",
-    "No permission to delete" : "Ensin permisos pa desaniciar",
+    "Actions" : "Aiciones",
     "Download" : "Descargar",
     "Select" : "Esbillar",
     "Pending" : "Pendiente",
@@ -51,21 +45,29 @@ OC.L10N.register(
     "Error moving file." : "Fallu moviendo'l ficheru.",
     "Error moving file" : "Fallu moviendo'l ficheru",
     "Error" : "Fallu",
+    "{new_name} already exists" : "{new_name} yá existe",
     "Could not rename file" : "Nun pudo renomase'l ficheru",
+    "Could not create file" : "Nun pudo crease'l ficheru",
+    "Could not create folder" : "Nun pudo crease la carpeta",
     "Error deleting file." : "Fallu desaniciando'l ficheru.",
     "Name" : "Nome",
     "Size" : "Tamañu",
     "Modified" : "Modificáu",
     "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
     "_%n file_::_%n files_" : ["%n ficheru","%n ficheros"],
+    "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "Nun tienes permisu pa xubir o crear ficheros equí",
     "_Uploading %n file_::_Uploading %n files_" : ["Xubiendo %n ficheru","Xubiendo %n ficheros"],
+    "New" : "Nuevu",
     "\"{name}\" is an invalid file name." : "\"{name}\" ye un nome de ficheru inválidu.",
     "File name cannot be empty." : "El nome de ficheru nun pue quedar baleru.",
     "Your storage is full, files can not be updated or synced anymore!" : "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!",
     "Your storage is almost full ({usedSpacePercent}%)" : "L'almacenamientu ta casi completu ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} y {files}",
     "Favorite" : "Favoritu",
+    "Upload" : "Xubir",
+    "Text file" : "Ficheru de testu",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creóse</strong> un ficheru o carpeta nuevos",
     "A file or folder has been <strong>changed</strong>" : "<strong>Camudóse</strong> un ficheru o carpeta",
     "A file or folder has been <strong>deleted</strong>" : "<strong>Desanicióse</strong> un ficheru o carpeta",
@@ -89,13 +91,8 @@ OC.L10N.register(
     "Settings" : "Axustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usa esta direición <a href=\"%s\" target=\"_blank\">p'acceder a los ficheros a traviés de WebDAV</a>",
-    "New" : "Nuevu",
-    "New text file" : "Ficheru de testu nuevu",
-    "Text file" : "Ficheru de testu",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Xubir",
     "Cancel upload" : "Encaboxar xuba",
+    "Delete" : "Desaniciar",
     "Upload too large" : "La xuba ye abondo grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubíes de ficheros nesti servidor.",
     "Files are being scanned, please wait." : "Tan escaniándose los ficheros, espera por favor.",
diff --git a/apps/files/l10n/ast.json b/apps/files/l10n/ast.json
index b242d62a52..601bf2d85f 100644
--- a/apps/files/l10n/ast.json
+++ b/apps/files/l10n/ast.json
@@ -27,20 +27,14 @@
     "All files" : "Tolos ficheros",
     "Favorites" : "Favoritos",
     "Home" : "Casa",
+    "Close" : "Zarrar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nun pudo xubise {filename}, paez que ye un directoriu o tien 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "El tamañu de ficheru total {size1} perpasa la llende de xuba {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}",
     "Upload cancelled." : "Xuba encaboxada.",
     "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
-    "{new_name} already exists" : "{new_name} yá existe",
-    "Could not create file" : "Nun pudo crease'l ficheru",
-    "Could not create folder" : "Nun pudo crease la carpeta",
-    "Rename" : "Renomar",
-    "Delete" : "Desaniciar",
-    "Disconnect storage" : "Desconeutar almacenamientu",
-    "Unshare" : "Dexar de compartir",
-    "No permission to delete" : "Ensin permisos pa desaniciar",
+    "Actions" : "Aiciones",
     "Download" : "Descargar",
     "Select" : "Esbillar",
     "Pending" : "Pendiente",
@@ -49,21 +43,29 @@
     "Error moving file." : "Fallu moviendo'l ficheru.",
     "Error moving file" : "Fallu moviendo'l ficheru",
     "Error" : "Fallu",
+    "{new_name} already exists" : "{new_name} yá existe",
     "Could not rename file" : "Nun pudo renomase'l ficheru",
+    "Could not create file" : "Nun pudo crease'l ficheru",
+    "Could not create folder" : "Nun pudo crease la carpeta",
     "Error deleting file." : "Fallu desaniciando'l ficheru.",
     "Name" : "Nome",
     "Size" : "Tamañu",
     "Modified" : "Modificáu",
     "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
     "_%n file_::_%n files_" : ["%n ficheru","%n ficheros"],
+    "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "Nun tienes permisu pa xubir o crear ficheros equí",
     "_Uploading %n file_::_Uploading %n files_" : ["Xubiendo %n ficheru","Xubiendo %n ficheros"],
+    "New" : "Nuevu",
     "\"{name}\" is an invalid file name." : "\"{name}\" ye un nome de ficheru inválidu.",
     "File name cannot be empty." : "El nome de ficheru nun pue quedar baleru.",
     "Your storage is full, files can not be updated or synced anymore!" : "L'almacenamientu ta completu, ¡yá nun se pueden anovar o sincronizar ficheros!",
     "Your storage is almost full ({usedSpacePercent}%)" : "L'almacenamientu ta casi completu ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} y {files}",
     "Favorite" : "Favoritu",
+    "Upload" : "Xubir",
+    "Text file" : "Ficheru de testu",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creóse</strong> un ficheru o carpeta nuevos",
     "A file or folder has been <strong>changed</strong>" : "<strong>Camudóse</strong> un ficheru o carpeta",
     "A file or folder has been <strong>deleted</strong>" : "<strong>Desanicióse</strong> un ficheru o carpeta",
@@ -87,13 +89,8 @@
     "Settings" : "Axustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usa esta direición <a href=\"%s\" target=\"_blank\">p'acceder a los ficheros a traviés de WebDAV</a>",
-    "New" : "Nuevu",
-    "New text file" : "Ficheru de testu nuevu",
-    "Text file" : "Ficheru de testu",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Xubir",
     "Cancel upload" : "Encaboxar xuba",
+    "Delete" : "Desaniciar",
     "Upload too large" : "La xuba ye abondo grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los ficheros que tas intentando xubir perpasen el tamañu máximu pa les xubíes de ficheros nesti servidor.",
     "Files are being scanned, please wait." : "Tan escaniándose los ficheros, espera por favor.",
diff --git a/apps/files/l10n/az.js b/apps/files/l10n/az.js
index 3f76fd9a32..54b17d6df5 100644
--- a/apps/files/l10n/az.js
+++ b/apps/files/l10n/az.js
@@ -29,28 +29,27 @@ OC.L10N.register(
     "All files" : "Bütün fayllar",
     "Favorites" : "Sevimlilər",
     "Home" : "Ev",
+    "Close" : "Bağla",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Yükləmək olmur {filename} ona görə ki, ya qovluqdur yada ki, həcmi 0 baytdır ",
     "Total file size {size1} exceeds upload limit {size2}" : "Ümumi fayl həcmi {size1}  yüklənmə limiti {size2} -ni aşır",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Kifayət qədər boş yer yoxdur, siz yükləyirsiniz {size1} ancaq  {size2} var. ",
     "Upload cancelled." : "Yüklənmə dayandırıldı.",
     "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.",
-    "{new_name} already exists" : "{new_name} artıq mövcuddur",
-    "Could not create file" : "Faylı yaratmaq olmur",
-    "Could not create folder" : "Qovluğu yaratmaq olmur",
-    "Rename" : "Adı dəyiş",
-    "Delete" : "Sil",
-    "Disconnect storage" : "Daşıyıcını ayır",
-    "Unshare" : "Paylaşımı durdur",
-    "No permission to delete" : "Silmək üçün yetki yoxdur",
+    "Actions" : "İşlər",
     "Download" : "Yüklə",
     "Select" : "Seç",
     "Pending" : "Gözləmə",
     "Unable to determine date" : "Tarixi təyin etmək mümkün olmadı",
+    "This operation is forbidden" : "Bu əməliyyat qadağandır",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Bu qovluq tapılmir. Xahiş olunur jurnalları yoxlayın ya da inzibatçı ilə əlaqə saxlayın",
     "Error moving file." : "Faylın köçürülməsində səhv baş verdi.",
     "Error moving file" : "Faylın köçürülməsində səhv baş verdi",
     "Error" : "Səhv",
+    "{new_name} already exists" : "{new_name} artıq mövcuddur",
     "Could not rename file" : "Faylın adını dəyişmək mümkün olmadı",
+    "Could not create file" : "Faylı yaratmaq olmur",
+    "Could not create folder" : "Qovluğu yaratmaq olmur",
     "Error deleting file." : "Faylın silinməsində səhv baş verdi.",
     "No entries in this folder match '{filter}'" : "Bu qovluqda '{filter}' uyğunluğunda heç bir verilən tapılmadı",
     "Name" : "Ad",
@@ -58,16 +57,27 @@ OC.L10N.register(
     "Modified" : "Dəyişdirildi",
     "_%n folder_::_%n folders_" : ["%n qovluq","%n qovluqlar"],
     "_%n file_::_%n files_" : ["%n fayllar","%n fayllar"],
+    "{dirs} and {files}" : "{dirs} və {files}",
     "You don’t have permission to upload or create files here" : "Sizin burda yükləməyə və ya fayl yaratmağa yetkiniz yoxdur  ",
     "_Uploading %n file_::_Uploading %n files_" : ["%n fayllar yüklənilir","%n fayllar yüklənilir"],
+    "New" : "Yeni",
     "\"{name}\" is an invalid file name." : "\"{name}\" yalnış fayl adıdır.",
     "File name cannot be empty." : "Faylın adı boş ola bilməz.",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} məlumat anbarı doludur, fayllar artıq yenilənə və ya sinxronizasiya edilə bilməz!",
     "Your storage is full, files can not be updated or synced anymore!" : "Sizin deponuz doludur, fayllar artıq yenilənə və sinxronizasiya edilə bilməz!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} məlumat anbari demək olar ki, doludur ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Sizin depo depo demək olar ki, doludur ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["uyğun '{filter}'","uyğun '{filter}'"],
-    "{dirs} and {files}" : "{dirs} və {files}",
+    "Path" : "Ünvan",
+    "_%n byte_::_%n bytes_" : ["%n baytlar","%n bytes"],
     "Favorited" : "İstəkləndi",
     "Favorite" : "İstəkli",
+    "{newname} already exists" : "{newname} artıq mövcuddur",
+    "Upload" : "Serverə yüklə",
+    "Text file" : "Tekst faylı",
+    "New text file.txt" : "Yeni mətn file.txt",
+    "Folder" : "Qovluq",
+    "New folder" : "Yeni qovluq",
     "An error occurred while trying to update the tags" : "Qeydlərin yenilənməsi müddətində səhv baş verdi ",
     "A new file or folder has been <strong>created</strong>" : "Yeni fayl və ya direktoriya <strong>yaradılmışdır</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fayl və ya direktoriya <strong>dəyişdirilib</strong>",
@@ -89,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Fayl emalı",
     "Maximum upload size" : "Maksimal yükləmə həcmi",
     "max. possible: " : "maks. ola bilər: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM ilə bu məna yadda saxladıldıqından 5 dəqiqə sonra işə düşə bilər. ",
     "Save" : "Saxlamaq",
     "Can not be edited from here due to insufficient permissions." : "Yetki çatışmamazlığına görə, burdan başlayaraq dəyişiklik edə bilməzsiniz.",
     "Settings" : "Quraşdırmalar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Bu ünvanı <a href=\"%s\" target=\"_blank\">WebDAV vasitəsilə fayllarınızı əldə etmək üçün</a> istifadə edə bilərsiniz. ",
-    "New" : "Yeni",
-    "New text file" : "Yeni tekst faylı",
-    "Text file" : "Tekst faylı",
-    "New folder" : "Yeni qovluq",
-    "Folder" : "Qovluq",
-    "Upload" : "Serverə yüklə",
     "Cancel upload" : "Yüklənməni dayandır",
     "No files in here" : "Burda fayl yoxdur",
     "Upload some content or sync with your devices!" : "Bezi kontenti yüklə yada, öz avadanlıqlarınızla sinxronizasiya edin!",
     "No entries found in this folder" : "Bu qovluqda heç bir verilən tapılmadı",
     "Select all" : "Hamısıı seç",
+    "Delete" : "Sil",
     "Upload too large" : "Yüklənmə şox böyükdür",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yükləmək istədiyiniz faylların həcmi, bu serverdə izin verilmiş maksimal yüklənmə həcmindən böyükdür.",
     "Files are being scanned, please wait." : "Faylların skanı başlanıb, xahiş olunur gözləyəsiniz.",
diff --git a/apps/files/l10n/az.json b/apps/files/l10n/az.json
index ec7c41a00f..14d728f248 100644
--- a/apps/files/l10n/az.json
+++ b/apps/files/l10n/az.json
@@ -27,28 +27,27 @@
     "All files" : "Bütün fayllar",
     "Favorites" : "Sevimlilər",
     "Home" : "Ev",
+    "Close" : "Bağla",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Yükləmək olmur {filename} ona görə ki, ya qovluqdur yada ki, həcmi 0 baytdır ",
     "Total file size {size1} exceeds upload limit {size2}" : "Ümumi fayl həcmi {size1}  yüklənmə limiti {size2} -ni aşır",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Kifayət qədər boş yer yoxdur, siz yükləyirsiniz {size1} ancaq  {size2} var. ",
     "Upload cancelled." : "Yüklənmə dayandırıldı.",
     "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.",
-    "{new_name} already exists" : "{new_name} artıq mövcuddur",
-    "Could not create file" : "Faylı yaratmaq olmur",
-    "Could not create folder" : "Qovluğu yaratmaq olmur",
-    "Rename" : "Adı dəyiş",
-    "Delete" : "Sil",
-    "Disconnect storage" : "Daşıyıcını ayır",
-    "Unshare" : "Paylaşımı durdur",
-    "No permission to delete" : "Silmək üçün yetki yoxdur",
+    "Actions" : "İşlər",
     "Download" : "Yüklə",
     "Select" : "Seç",
     "Pending" : "Gözləmə",
     "Unable to determine date" : "Tarixi təyin etmək mümkün olmadı",
+    "This operation is forbidden" : "Bu əməliyyat qadağandır",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Bu qovluq tapılmir. Xahiş olunur jurnalları yoxlayın ya da inzibatçı ilə əlaqə saxlayın",
     "Error moving file." : "Faylın köçürülməsində səhv baş verdi.",
     "Error moving file" : "Faylın köçürülməsində səhv baş verdi",
     "Error" : "Səhv",
+    "{new_name} already exists" : "{new_name} artıq mövcuddur",
     "Could not rename file" : "Faylın adını dəyişmək mümkün olmadı",
+    "Could not create file" : "Faylı yaratmaq olmur",
+    "Could not create folder" : "Qovluğu yaratmaq olmur",
     "Error deleting file." : "Faylın silinməsində səhv baş verdi.",
     "No entries in this folder match '{filter}'" : "Bu qovluqda '{filter}' uyğunluğunda heç bir verilən tapılmadı",
     "Name" : "Ad",
@@ -56,16 +55,27 @@
     "Modified" : "Dəyişdirildi",
     "_%n folder_::_%n folders_" : ["%n qovluq","%n qovluqlar"],
     "_%n file_::_%n files_" : ["%n fayllar","%n fayllar"],
+    "{dirs} and {files}" : "{dirs} və {files}",
     "You don’t have permission to upload or create files here" : "Sizin burda yükləməyə və ya fayl yaratmağa yetkiniz yoxdur  ",
     "_Uploading %n file_::_Uploading %n files_" : ["%n fayllar yüklənilir","%n fayllar yüklənilir"],
+    "New" : "Yeni",
     "\"{name}\" is an invalid file name." : "\"{name}\" yalnış fayl adıdır.",
     "File name cannot be empty." : "Faylın adı boş ola bilməz.",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} məlumat anbarı doludur, fayllar artıq yenilənə və ya sinxronizasiya edilə bilməz!",
     "Your storage is full, files can not be updated or synced anymore!" : "Sizin deponuz doludur, fayllar artıq yenilənə və sinxronizasiya edilə bilməz!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} məlumat anbari demək olar ki, doludur ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Sizin depo depo demək olar ki, doludur ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["uyğun '{filter}'","uyğun '{filter}'"],
-    "{dirs} and {files}" : "{dirs} və {files}",
+    "Path" : "Ünvan",
+    "_%n byte_::_%n bytes_" : ["%n baytlar","%n bytes"],
     "Favorited" : "İstəkləndi",
     "Favorite" : "İstəkli",
+    "{newname} already exists" : "{newname} artıq mövcuddur",
+    "Upload" : "Serverə yüklə",
+    "Text file" : "Tekst faylı",
+    "New text file.txt" : "Yeni mətn file.txt",
+    "Folder" : "Qovluq",
+    "New folder" : "Yeni qovluq",
     "An error occurred while trying to update the tags" : "Qeydlərin yenilənməsi müddətində səhv baş verdi ",
     "A new file or folder has been <strong>created</strong>" : "Yeni fayl və ya direktoriya <strong>yaradılmışdır</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fayl və ya direktoriya <strong>dəyişdirilib</strong>",
@@ -87,22 +97,18 @@
     "File handling" : "Fayl emalı",
     "Maximum upload size" : "Maksimal yükləmə həcmi",
     "max. possible: " : "maks. ola bilər: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM ilə bu məna yadda saxladıldıqından 5 dəqiqə sonra işə düşə bilər. ",
     "Save" : "Saxlamaq",
     "Can not be edited from here due to insufficient permissions." : "Yetki çatışmamazlığına görə, burdan başlayaraq dəyişiklik edə bilməzsiniz.",
     "Settings" : "Quraşdırmalar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Bu ünvanı <a href=\"%s\" target=\"_blank\">WebDAV vasitəsilə fayllarınızı əldə etmək üçün</a> istifadə edə bilərsiniz. ",
-    "New" : "Yeni",
-    "New text file" : "Yeni tekst faylı",
-    "Text file" : "Tekst faylı",
-    "New folder" : "Yeni qovluq",
-    "Folder" : "Qovluq",
-    "Upload" : "Serverə yüklə",
     "Cancel upload" : "Yüklənməni dayandır",
     "No files in here" : "Burda fayl yoxdur",
     "Upload some content or sync with your devices!" : "Bezi kontenti yüklə yada, öz avadanlıqlarınızla sinxronizasiya edin!",
     "No entries found in this folder" : "Bu qovluqda heç bir verilən tapılmadı",
     "Select all" : "Hamısıı seç",
+    "Delete" : "Sil",
     "Upload too large" : "Yüklənmə şox böyükdür",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yükləmək istədiyiniz faylların həcmi, bu serverdə izin verilmiş maksimal yüklənmə həcmindən böyükdür.",
     "Files are being scanned, please wait." : "Faylların skanı başlanıb, xahiş olunur gözləyəsiniz.",
diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js
index b43dced5cf..f21c5de9dc 100644
--- a/apps/files/l10n/bg_BG.js
+++ b/apps/files/l10n/bg_BG.js
@@ -29,19 +29,14 @@ OC.L10N.register(
     "All files" : "Всички файлове",
     "Favorites" : "Любими",
     "Home" : "Домашен",
+    "Close" : "Затвори",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неуспешно качване на {filename}, защото е директория или е с размер от 0 байта.",
     "Total file size {size1} exceeds upload limit {size2}" : "Общия размер {size1} надминава лимита за качване {size2}.",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Няма достатъчно свободно място, ти се опитваш да качиш {size1}, но са останали само {size2}.",
     "Upload cancelled." : "Качването е прекъснато.",
     "Could not get result from server." : "Не се получи резултат от сървърът.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.",
-    "{new_name} already exists" : "{new_name} вече съществува.",
-    "Could not create file" : "Несупешно създаване на файла.",
-    "Could not create folder" : "Неуспешно създаване на папка.",
-    "Rename" : "Преименуване",
-    "Delete" : "Изтрий",
-    "Disconnect storage" : "Извади дисковото устройство.",
-    "Unshare" : "Премахни Споделяне",
+    "Actions" : "Действия",
     "Download" : "Изтегли",
     "Select" : "Избери",
     "Pending" : "Чакащо",
@@ -49,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Грешка при местенето на файла.",
     "Error moving file" : "Грешка при преместването на файла.",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} вече съществува.",
     "Could not rename file" : "Неуспешно преименуване на файла.",
+    "Could not create file" : "Несупешно създаване на файла.",
+    "Could not create folder" : "Неуспешно създаване на папка.",
     "Error deleting file." : "Грешка при изтриването на файла.",
     "No entries in this folder match '{filter}'" : "Нищо в тази папка не отговаря на '{filter}'",
     "Name" : "Име",
@@ -57,16 +55,21 @@ OC.L10N.register(
     "Modified" : "Променен на",
     "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
     "_%n file_::_%n files_" : ["%n файл","%n файла"],
+    "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "Нямаш разрешение да създаваш или качваш файлове тук.",
     "_Uploading %n file_::_Uploading %n files_" : ["Качване на %n файл","Качване на %n файла."],
+    "New" : "Създай",
     "\"{name}\" is an invalid file name." : "\"{name}\" е непозволено име за файл.",
     "File name cannot be empty." : "Името на файла не може да бъде оставено празно.",
     "Your storage is full, files can not be updated or synced anymore!" : "Заделеното място е запълнено, повече файлове не могат да бъдат синхронизирани или опреснени!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Заделеното място е почити запълнено ({usedSpacePercent}%).",
     "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "],
-    "{dirs} and {files}" : "{dirs} и {files}",
     "Favorited" : "Отбелязано в любими",
     "Favorite" : "Любими",
+    "Upload" : "Качване",
+    "Text file" : "Текстов файл",
+    "Folder" : "Папка",
+    "New folder" : "Нова папка",
     "An error occurred while trying to update the tags" : "Настъпи грешка при опита за промяна на бележките",
     "A new file or folder has been <strong>created</strong>" : "Нов файл или папка беше <strong>създаден/а</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл или папка беше <strong>променен/а</strong>",
@@ -92,17 +95,12 @@ OC.L10N.register(
     "Settings" : "Настройки",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Използвай този адрес, за да получиш <a href=\"%s\" target=\"_blank\">достъп до своите файлове чрез WebDAV</a>.",
-    "New" : "Създай",
-    "New text file" : "Нов текстов файл",
-    "Text file" : "Текстов файл",
-    "New folder" : "Нова папка",
-    "Folder" : "Папка",
-    "Upload" : "Качване",
     "Cancel upload" : "Отказване на качването",
     "No files in here" : "Тук няма файлове",
     "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!",
     "No entries found in this folder" : "Няма намерени записи в тази папка",
     "Select all" : "Избери всички",
+    "Delete" : "Изтрий",
     "Upload too large" : "Прекалено голям файл за качване.",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.",
     "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.",
diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json
index 266f4f08cd..6778eff6da 100644
--- a/apps/files/l10n/bg_BG.json
+++ b/apps/files/l10n/bg_BG.json
@@ -27,19 +27,14 @@
     "All files" : "Всички файлове",
     "Favorites" : "Любими",
     "Home" : "Домашен",
+    "Close" : "Затвори",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неуспешно качване на {filename}, защото е директория или е с размер от 0 байта.",
     "Total file size {size1} exceeds upload limit {size2}" : "Общия размер {size1} надминава лимита за качване {size2}.",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Няма достатъчно свободно място, ти се опитваш да качиш {size1}, но са останали само {size2}.",
     "Upload cancelled." : "Качването е прекъснато.",
     "Could not get result from server." : "Не се получи резултат от сървърът.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.",
-    "{new_name} already exists" : "{new_name} вече съществува.",
-    "Could not create file" : "Несупешно създаване на файла.",
-    "Could not create folder" : "Неуспешно създаване на папка.",
-    "Rename" : "Преименуване",
-    "Delete" : "Изтрий",
-    "Disconnect storage" : "Извади дисковото устройство.",
-    "Unshare" : "Премахни Споделяне",
+    "Actions" : "Действия",
     "Download" : "Изтегли",
     "Select" : "Избери",
     "Pending" : "Чакащо",
@@ -47,7 +42,10 @@
     "Error moving file." : "Грешка при местенето на файла.",
     "Error moving file" : "Грешка при преместването на файла.",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} вече съществува.",
     "Could not rename file" : "Неуспешно преименуване на файла.",
+    "Could not create file" : "Несупешно създаване на файла.",
+    "Could not create folder" : "Неуспешно създаване на папка.",
     "Error deleting file." : "Грешка при изтриването на файла.",
     "No entries in this folder match '{filter}'" : "Нищо в тази папка не отговаря на '{filter}'",
     "Name" : "Име",
@@ -55,16 +53,21 @@
     "Modified" : "Променен на",
     "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
     "_%n file_::_%n files_" : ["%n файл","%n файла"],
+    "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "Нямаш разрешение да създаваш или качваш файлове тук.",
     "_Uploading %n file_::_Uploading %n files_" : ["Качване на %n файл","Качване на %n файла."],
+    "New" : "Създай",
     "\"{name}\" is an invalid file name." : "\"{name}\" е непозволено име за файл.",
     "File name cannot be empty." : "Името на файла не може да бъде оставено празно.",
     "Your storage is full, files can not be updated or synced anymore!" : "Заделеното място е запълнено, повече файлове не могат да бъдат синхронизирани или опреснени!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Заделеното място е почити запълнено ({usedSpacePercent}%).",
     "_matches '{filter}'_::_match '{filter}'_" : ["пасва на '{filter}'","пасват на '{filter}'\n "],
-    "{dirs} and {files}" : "{dirs} и {files}",
     "Favorited" : "Отбелязано в любими",
     "Favorite" : "Любими",
+    "Upload" : "Качване",
+    "Text file" : "Текстов файл",
+    "Folder" : "Папка",
+    "New folder" : "Нова папка",
     "An error occurred while trying to update the tags" : "Настъпи грешка при опита за промяна на бележките",
     "A new file or folder has been <strong>created</strong>" : "Нов файл или папка беше <strong>създаден/а</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл или папка беше <strong>променен/а</strong>",
@@ -90,17 +93,12 @@
     "Settings" : "Настройки",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Използвай този адрес, за да получиш <a href=\"%s\" target=\"_blank\">достъп до своите файлове чрез WebDAV</a>.",
-    "New" : "Създай",
-    "New text file" : "Нов текстов файл",
-    "Text file" : "Текстов файл",
-    "New folder" : "Нова папка",
-    "Folder" : "Папка",
-    "Upload" : "Качване",
     "Cancel upload" : "Отказване на качването",
     "No files in here" : "Тук няма файлове",
     "Upload some content or sync with your devices!" : "Качи съдържание или синхронизирай с твоите устройства!",
     "No entries found in this folder" : "Няма намерени записи в тази папка",
     "Select all" : "Избери всички",
+    "Delete" : "Изтрий",
     "Upload too large" : "Прекалено голям файл за качване.",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.",
     "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.",
diff --git a/apps/files/l10n/bn_BD.js b/apps/files/l10n/bn_BD.js
index 88276ef27f..1272966209 100644
--- a/apps/files/l10n/bn_BD.js
+++ b/apps/files/l10n/bn_BD.js
@@ -24,26 +24,30 @@ OC.L10N.register(
     "All files" : "সব ফাইল",
     "Favorites" : "প্রিয়জন",
     "Home" : "নিবাস",
+    "Close" : "বন্ধ",
     "Upload cancelled." : "আপলোড বাতিল করা হয়েছে।",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
-    "{new_name} already exists" : "{new_name} টি বিদ্যমান",
-    "Rename" : "পূনঃনামকরণ",
-    "Delete" : "মুছে",
-    "Unshare" : "ভাগাভাগি বাতিল ",
+    "Actions" : "পদক্ষেপসমূহ",
     "Download" : "ডাউনলোড",
     "Pending" : "মুলতুবি",
     "Error moving file." : "ফাইল সরাতে সমস্যা হলো।",
     "Error moving file" : "ফাইল সরাতে সমস্যা হলো",
     "Error" : "সমস্যা",
+    "{new_name} already exists" : "{new_name} টি বিদ্যমান",
     "Could not rename file" : "ফাইলের পূণঃনামকরণ করা গেলনা",
     "Name" : "রাম",
     "Size" : "আকার",
     "Modified" : "পরিবর্তিত",
     "_Uploading %n file_::_Uploading %n files_" : ["%n ফাইল আপলোড হচ্ছে","%n ফাইল আপলোড হচ্ছে"],
+    "New" : "নতুন",
     "\"{name}\" is an invalid file name." : "\"{name}\" টি একটি অননুমোদিত ফাইল নাম।",
     "File name cannot be empty." : "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
     "Your storage is almost full ({usedSpacePercent}%)" : "আপনার সংরক্ষণাধার প্রায় পরিপূর্ণ ({usedSpacePercent}%) ",
     "Favorite" : "প্রিয়জন",
+    "Upload" : "আপলোড",
+    "Text file" : "টেক্সট ফাইল",
+    "Folder" : "ফোল্ডার",
+    "New folder" : "নব ফােলডার",
     "A new file or folder has been <strong>created</strong>" : "একটি ফাইল বা ফোলডার <strong>তৈরি</strong> করা হয়েছে",
     "A file or folder has been <strong>changed</strong>" : "একটি ফাইল বা ফোলডার <strong>পরিবরতন</strong> করা হয়েছে",
     "A file or folder has been <strong>deleted</strong>" : "একটি ফাইল বা ফোলডার <strong>মোছা</strong> হয়েছে",
@@ -60,12 +64,8 @@ OC.L10N.register(
     "Save" : "সংরক্ষণ",
     "Settings" : "নিয়ামকসমূহ",
     "WebDAV" : "WebDAV",
-    "New" : "নতুন",
-    "Text file" : "টেক্সট ফাইল",
-    "New folder" : "নব ফােলডার",
-    "Folder" : "ফোল্ডার",
-    "Upload" : "আপলোড",
     "Cancel upload" : "আপলোড বাতিল কর",
+    "Delete" : "মুছে",
     "Upload too large" : "আপলোডের আকারটি অনেক বড়",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ",
     "Files are being scanned, please wait." : "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
diff --git a/apps/files/l10n/bn_BD.json b/apps/files/l10n/bn_BD.json
index 79aa31b1da..472aae7886 100644
--- a/apps/files/l10n/bn_BD.json
+++ b/apps/files/l10n/bn_BD.json
@@ -22,26 +22,30 @@
     "All files" : "সব ফাইল",
     "Favorites" : "প্রিয়জন",
     "Home" : "নিবাস",
+    "Close" : "বন্ধ",
     "Upload cancelled." : "আপলোড বাতিল করা হয়েছে।",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
-    "{new_name} already exists" : "{new_name} টি বিদ্যমান",
-    "Rename" : "পূনঃনামকরণ",
-    "Delete" : "মুছে",
-    "Unshare" : "ভাগাভাগি বাতিল ",
+    "Actions" : "পদক্ষেপসমূহ",
     "Download" : "ডাউনলোড",
     "Pending" : "মুলতুবি",
     "Error moving file." : "ফাইল সরাতে সমস্যা হলো।",
     "Error moving file" : "ফাইল সরাতে সমস্যা হলো",
     "Error" : "সমস্যা",
+    "{new_name} already exists" : "{new_name} টি বিদ্যমান",
     "Could not rename file" : "ফাইলের পূণঃনামকরণ করা গেলনা",
     "Name" : "রাম",
     "Size" : "আকার",
     "Modified" : "পরিবর্তিত",
     "_Uploading %n file_::_Uploading %n files_" : ["%n ফাইল আপলোড হচ্ছে","%n ফাইল আপলোড হচ্ছে"],
+    "New" : "নতুন",
     "\"{name}\" is an invalid file name." : "\"{name}\" টি একটি অননুমোদিত ফাইল নাম।",
     "File name cannot be empty." : "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
     "Your storage is almost full ({usedSpacePercent}%)" : "আপনার সংরক্ষণাধার প্রায় পরিপূর্ণ ({usedSpacePercent}%) ",
     "Favorite" : "প্রিয়জন",
+    "Upload" : "আপলোড",
+    "Text file" : "টেক্সট ফাইল",
+    "Folder" : "ফোল্ডার",
+    "New folder" : "নব ফােলডার",
     "A new file or folder has been <strong>created</strong>" : "একটি ফাইল বা ফোলডার <strong>তৈরি</strong> করা হয়েছে",
     "A file or folder has been <strong>changed</strong>" : "একটি ফাইল বা ফোলডার <strong>পরিবরতন</strong> করা হয়েছে",
     "A file or folder has been <strong>deleted</strong>" : "একটি ফাইল বা ফোলডার <strong>মোছা</strong> হয়েছে",
@@ -58,12 +62,8 @@
     "Save" : "সংরক্ষণ",
     "Settings" : "নিয়ামকসমূহ",
     "WebDAV" : "WebDAV",
-    "New" : "নতুন",
-    "Text file" : "টেক্সট ফাইল",
-    "New folder" : "নব ফােলডার",
-    "Folder" : "ফোল্ডার",
-    "Upload" : "আপলোড",
     "Cancel upload" : "আপলোড বাতিল কর",
+    "Delete" : "মুছে",
     "Upload too large" : "আপলোডের আকারটি অনেক বড়",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন ",
     "Files are being scanned, please wait." : "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
diff --git a/apps/files/l10n/bn_IN.js b/apps/files/l10n/bn_IN.js
index aedeab7399..995c9ad45d 100644
--- a/apps/files/l10n/bn_IN.js
+++ b/apps/files/l10n/bn_IN.js
@@ -14,13 +14,14 @@ OC.L10N.register(
     "Not enough storage available" : "যথেষ্ট স্টোরেজ পাওয়া যায় না",
     "Invalid directory." : "অবৈধ ডিরেক্টরি।",
     "Files" : "ফাইলস",
-    "Rename" : "পুনঃনামকরণ",
-    "Delete" : "মুছে ফেলা",
+    "Close" : "বন্ধ",
     "Download" : "ডাউনলোড করুন",
     "Pending" : "মুলতুবি",
     "Error" : "ভুল",
     "Name" : "নাম",
     "Size" : "আকার",
+    "Folder" : "ফোল্ডার",
+    "New folder" : "নতুন ফোল্ডার",
     "A new file or folder has been <strong>created</strong>" : "একটি নতুন ফাইল বা ফোল্ডার হয়েছে <strong>তৈরি</strong>",
     "A file or folder has been <strong>changed</strong>" : "একটি নতুন ফাইল বা ফোল্ডার <strong>বদলানো হয়েছে</strong>",
     "A file or folder has been <strong>deleted</strong>" : "একটি নতুন ফাইল বা ফোল্ডার <strong>মুছে ফেলা হয়েছে</strong>",
@@ -32,7 +33,6 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s মুছেছে %1$s কে",
     "Save" : "সেভ",
     "Settings" : "সেটিংস",
-    "New folder" : "নতুন ফোল্ডার",
-    "Folder" : "ফোল্ডার"
+    "Delete" : "মুছে ফেলা"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/bn_IN.json b/apps/files/l10n/bn_IN.json
index e79719faa0..17ce39d023 100644
--- a/apps/files/l10n/bn_IN.json
+++ b/apps/files/l10n/bn_IN.json
@@ -12,13 +12,14 @@
     "Not enough storage available" : "যথেষ্ট স্টোরেজ পাওয়া যায় না",
     "Invalid directory." : "অবৈধ ডিরেক্টরি।",
     "Files" : "ফাইলস",
-    "Rename" : "পুনঃনামকরণ",
-    "Delete" : "মুছে ফেলা",
+    "Close" : "বন্ধ",
     "Download" : "ডাউনলোড করুন",
     "Pending" : "মুলতুবি",
     "Error" : "ভুল",
     "Name" : "নাম",
     "Size" : "আকার",
+    "Folder" : "ফোল্ডার",
+    "New folder" : "নতুন ফোল্ডার",
     "A new file or folder has been <strong>created</strong>" : "একটি নতুন ফাইল বা ফোল্ডার হয়েছে <strong>তৈরি</strong>",
     "A file or folder has been <strong>changed</strong>" : "একটি নতুন ফাইল বা ফোল্ডার <strong>বদলানো হয়েছে</strong>",
     "A file or folder has been <strong>deleted</strong>" : "একটি নতুন ফাইল বা ফোল্ডার <strong>মুছে ফেলা হয়েছে</strong>",
@@ -30,7 +31,6 @@
     "%2$s deleted %1$s" : "%2$s মুছেছে %1$s কে",
     "Save" : "সেভ",
     "Settings" : "সেটিংস",
-    "New folder" : "নতুন ফোল্ডার",
-    "Folder" : "ফোল্ডার"
+    "Delete" : "মুছে ফেলা"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/bs.js b/apps/files/l10n/bs.js
index 8856725072..f10c87bfef 100644
--- a/apps/files/l10n/bs.js
+++ b/apps/files/l10n/bs.js
@@ -29,19 +29,14 @@ OC.L10N.register(
     "All files" : "Sve datoteke",
     "Favorites" : "Favoriti",
     "Home" : "Kuća",
+    "Close" : "Zatvori",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemoguće učitati {filename} jer je ili direktorij ili ima 0 bajta",
     "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} prelazi ograničenje unosa {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nedovoljno slobodnog prostora, vi učitavate {size1} a samo je {size2} preostalo",
     "Upload cancelled." : "Učitavanje je prekinuto.",
     "Could not get result from server." : "Nemoguće dobiti rezultat od servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u toku. Napuštanje stranice prekinut će učitavanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Datoteku nije moguće kreirati",
-    "Could not create folder" : "Direktorij nije moguće kreirati",
-    "Rename" : "Preimenuj",
-    "Delete" : "Izbriši",
-    "Disconnect storage" : "Diskonektuj pohranu",
-    "Unshare" : "Prestani dijeliti",
+    "Actions" : "Radnje",
     "Download" : "Preuzmi",
     "Select" : "Izaberi",
     "Pending" : "Na čekanju",
@@ -49,22 +44,30 @@ OC.L10N.register(
     "Error moving file." : "Greška pri premještanju datoteke",
     "Error moving file" : "Greška pri premještanju datoteke",
     "Error" : "Greška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Nemoguće preimenovati datoteku",
+    "Could not create file" : "Datoteku nije moguće kreirati",
+    "Could not create folder" : "Direktorij nije moguće kreirati",
     "Error deleting file." : "Greška pri brisanju datoteke",
     "Name" : "Ime",
     "Size" : "Veličina",
     "Modified" : "Izmijenjeno",
     "_%n folder_::_%n folders_" : ["direktorij","direktoriji","direktoriji"],
     "_%n file_::_%n files_" : ["%n datoteka","%n datoteke","%n datoteke"],
+    "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Ovdje niste ovlašteni učitavati ili kreirati datoteke",
     "_Uploading %n file_::_Uploading %n files_" : ["Prenosim %n datoteku","Prenosim %n datoteke","Prenosim %n datoteke"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime datoteke.",
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša pohrana je puna, datoteke više nije moguće ažurirati niti sinhronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Favorizovano",
     "Favorite" : "Favorit",
+    "Upload" : "Učitaj",
+    "Text file" : "Tekstualna datoteka",
+    "Folder" : "Direktorij",
+    "New folder" : "Novi direktorij",
     "%s could not be renamed as it has been deleted" : "%s nije moguće preimenovati jer je izbrisan",
     "%s could not be renamed" : "%s nije moguće preimenovati",
     "Upload (max. %s)" : "Učitaj (max. %s)",
@@ -75,15 +78,10 @@ OC.L10N.register(
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristi slijedeću adresu za <a href=\"%s\" target=\"_blank\">pristup vašim datotekama putem WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nova tekstualna datoteka",
-    "Text file" : "Tekstualna datoteka",
-    "New folder" : "Novi direktorij",
-    "Folder" : "Direktorij",
-    "Upload" : "Učitaj",
     "Cancel upload" : "Prekini učitavanje",
     "Upload some content or sync with your devices!" : "Učitaj neki sadržaj ili sinhronizuj sa tvojim uređajima!",
     "Select all" : "Označi sve",
+    "Delete" : "Izbriši",
     "Upload too large" : "Učitavanje je preveliko",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati prelaze maksimalnu veličinu za učitavanje datoteka na ovom serveru.",
     "Files are being scanned, please wait." : "Datoteke se provjeravaju, molim pričekajte.",
diff --git a/apps/files/l10n/bs.json b/apps/files/l10n/bs.json
index 30a38102a6..7d8a87f639 100644
--- a/apps/files/l10n/bs.json
+++ b/apps/files/l10n/bs.json
@@ -27,19 +27,14 @@
     "All files" : "Sve datoteke",
     "Favorites" : "Favoriti",
     "Home" : "Kuća",
+    "Close" : "Zatvori",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemoguće učitati {filename} jer je ili direktorij ili ima 0 bajta",
     "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} prelazi ograničenje unosa {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nedovoljno slobodnog prostora, vi učitavate {size1} a samo je {size2} preostalo",
     "Upload cancelled." : "Učitavanje je prekinuto.",
     "Could not get result from server." : "Nemoguće dobiti rezultat od servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u toku. Napuštanje stranice prekinut će učitavanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Datoteku nije moguće kreirati",
-    "Could not create folder" : "Direktorij nije moguće kreirati",
-    "Rename" : "Preimenuj",
-    "Delete" : "Izbriši",
-    "Disconnect storage" : "Diskonektuj pohranu",
-    "Unshare" : "Prestani dijeliti",
+    "Actions" : "Radnje",
     "Download" : "Preuzmi",
     "Select" : "Izaberi",
     "Pending" : "Na čekanju",
@@ -47,22 +42,30 @@
     "Error moving file." : "Greška pri premještanju datoteke",
     "Error moving file" : "Greška pri premještanju datoteke",
     "Error" : "Greška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Nemoguće preimenovati datoteku",
+    "Could not create file" : "Datoteku nije moguće kreirati",
+    "Could not create folder" : "Direktorij nije moguće kreirati",
     "Error deleting file." : "Greška pri brisanju datoteke",
     "Name" : "Ime",
     "Size" : "Veličina",
     "Modified" : "Izmijenjeno",
     "_%n folder_::_%n folders_" : ["direktorij","direktoriji","direktoriji"],
     "_%n file_::_%n files_" : ["%n datoteka","%n datoteke","%n datoteke"],
+    "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Ovdje niste ovlašteni učitavati ili kreirati datoteke",
     "_Uploading %n file_::_Uploading %n files_" : ["Prenosim %n datoteku","Prenosim %n datoteke","Prenosim %n datoteke"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime datoteke.",
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša pohrana je puna, datoteke više nije moguće ažurirati niti sinhronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Favorizovano",
     "Favorite" : "Favorit",
+    "Upload" : "Učitaj",
+    "Text file" : "Tekstualna datoteka",
+    "Folder" : "Direktorij",
+    "New folder" : "Novi direktorij",
     "%s could not be renamed as it has been deleted" : "%s nije moguće preimenovati jer je izbrisan",
     "%s could not be renamed" : "%s nije moguće preimenovati",
     "Upload (max. %s)" : "Učitaj (max. %s)",
@@ -73,15 +76,10 @@
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristi slijedeću adresu za <a href=\"%s\" target=\"_blank\">pristup vašim datotekama putem WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nova tekstualna datoteka",
-    "Text file" : "Tekstualna datoteka",
-    "New folder" : "Novi direktorij",
-    "Folder" : "Direktorij",
-    "Upload" : "Učitaj",
     "Cancel upload" : "Prekini učitavanje",
     "Upload some content or sync with your devices!" : "Učitaj neki sadržaj ili sinhronizuj sa tvojim uređajima!",
     "Select all" : "Označi sve",
+    "Delete" : "Izbriši",
     "Upload too large" : "Učitavanje je preveliko",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati prelaze maksimalnu veličinu za učitavanje datoteka na ovom serveru.",
     "Files are being scanned, please wait." : "Datoteke se provjeravaju, molim pričekajte.",
diff --git a/apps/files/l10n/ca.js b/apps/files/l10n/ca.js
index fc207dd6bb..f838853480 100644
--- a/apps/files/l10n/ca.js
+++ b/apps/files/l10n/ca.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Tots els fitxers",
     "Favorites" : "Preferits",
     "Home" : "Casa",
+    "Close" : "Tanca",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "No es pot pujar {filename} perquè és una carpeta o té 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "Mida total del fitxer {size1} excedeix el límit de pujada {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}",
     "Upload cancelled." : "La pujada s'ha cancel·lat.",
     "Could not get result from server." : "No hi ha resposta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
-    "{new_name} already exists" : "{new_name} ja existeix",
-    "Could not create file" : "No s'ha pogut crear el fitxer",
-    "Could not create folder" : "No s'ha pogut crear la carpeta",
-    "Rename" : "Reanomena",
-    "Delete" : "Esborra",
-    "Disconnect storage" : "Desonnecta l'emmagatzematge",
-    "Unshare" : "Deixa de compartir",
-    "No permission to delete" : "Sense permís per esborrar",
+    "Actions" : "Accions",
     "Download" : "Baixa",
     "Select" : "Selecciona",
     "Pending" : "Pendent",
@@ -50,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Error en moure el fitxer.",
     "Error moving file" : "Error en moure el fitxer",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ja existeix",
     "Could not rename file" : "No es pot canviar el nom de fitxer",
+    "Could not create file" : "No s'ha pogut crear el fitxer",
+    "Could not create folder" : "No s'ha pogut crear la carpeta",
     "Error deleting file." : "Error en esborrar el fitxer.",
     "No entries in this folder match '{filter}'" : "No hi ha resultats que coincideixin amb '{filter}'",
     "Name" : "Nom",
@@ -58,8 +55,10 @@ OC.L10N.register(
     "Modified" : "Modificat",
     "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
     "_%n file_::_%n files_" : ["%n fitxer","%n fitxers"],
+    "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "No teniu permisos per a pujar o crear els fitxers aquí",
     "_Uploading %n file_::_Uploading %n files_" : ["Pujant %n fitxer","Pujant %n fitxers"],
+    "New" : "Nou",
     "\"{name}\" is an invalid file name." : "\"{name}\" no es un fitxer vàlid.",
     "File name cannot be empty." : "El nom del fitxer no pot ser buit.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "L'emmagatzematge de {owner} està ple, els arxius no es poden actualitzar o sincronitzar més!",
@@ -67,9 +66,12 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Emmagatzematge de {owner} està gairebé ple ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidències '{filter}'","coincidència '{filter}'"],
-    "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Agregat a favorits",
     "Favorite" : "Preferits",
+    "Upload" : "Puja",
+    "Text file" : "Fitxer de text",
+    "Folder" : "Carpeta",
+    "New folder" : "Carpeta nova",
     "An error occurred while trying to update the tags" : "S'ha produït un error en tractar d'actualitzar les etiquetes",
     "A new file or folder has been <strong>created</strong>" : "S'ha <strong>creat</strong> un nou fitxer o una nova carpeta",
     "A file or folder has been <strong>changed</strong>" : "S'ha <strong>canviat</strong> un fitxer o una carpeta",
@@ -96,17 +98,12 @@ OC.L10N.register(
     "Settings" : "Arranjament",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
-    "New" : "Nou",
-    "New text file" : "Nou fitxer de text",
-    "Text file" : "Fitxer de text",
-    "New folder" : "Carpeta nova",
-    "Folder" : "Carpeta",
-    "Upload" : "Puja",
     "Cancel upload" : "Cancel·la la pujada",
     "No files in here" : "No hi ha arxius",
     "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.",
     "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
     "Select all" : "Seleccionar tot",
+    "Delete" : "Esborra",
     "Upload too large" : "La pujada és massa gran",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
     "Files are being scanned, please wait." : "S'estan escanejant els fitxers, espereu",
diff --git a/apps/files/l10n/ca.json b/apps/files/l10n/ca.json
index 052e9ecb21..10a39fc941 100644
--- a/apps/files/l10n/ca.json
+++ b/apps/files/l10n/ca.json
@@ -27,20 +27,14 @@
     "All files" : "Tots els fitxers",
     "Favorites" : "Preferits",
     "Home" : "Casa",
+    "Close" : "Tanca",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "No es pot pujar {filename} perquè és una carpeta o té 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "Mida total del fitxer {size1} excedeix el límit de pujada {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}",
     "Upload cancelled." : "La pujada s'ha cancel·lat.",
     "Could not get result from server." : "No hi ha resposta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
-    "{new_name} already exists" : "{new_name} ja existeix",
-    "Could not create file" : "No s'ha pogut crear el fitxer",
-    "Could not create folder" : "No s'ha pogut crear la carpeta",
-    "Rename" : "Reanomena",
-    "Delete" : "Esborra",
-    "Disconnect storage" : "Desonnecta l'emmagatzematge",
-    "Unshare" : "Deixa de compartir",
-    "No permission to delete" : "Sense permís per esborrar",
+    "Actions" : "Accions",
     "Download" : "Baixa",
     "Select" : "Selecciona",
     "Pending" : "Pendent",
@@ -48,7 +42,10 @@
     "Error moving file." : "Error en moure el fitxer.",
     "Error moving file" : "Error en moure el fitxer",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ja existeix",
     "Could not rename file" : "No es pot canviar el nom de fitxer",
+    "Could not create file" : "No s'ha pogut crear el fitxer",
+    "Could not create folder" : "No s'ha pogut crear la carpeta",
     "Error deleting file." : "Error en esborrar el fitxer.",
     "No entries in this folder match '{filter}'" : "No hi ha resultats que coincideixin amb '{filter}'",
     "Name" : "Nom",
@@ -56,8 +53,10 @@
     "Modified" : "Modificat",
     "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
     "_%n file_::_%n files_" : ["%n fitxer","%n fitxers"],
+    "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "No teniu permisos per a pujar o crear els fitxers aquí",
     "_Uploading %n file_::_Uploading %n files_" : ["Pujant %n fitxer","Pujant %n fitxers"],
+    "New" : "Nou",
     "\"{name}\" is an invalid file name." : "\"{name}\" no es un fitxer vàlid.",
     "File name cannot be empty." : "El nom del fitxer no pot ser buit.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "L'emmagatzematge de {owner} està ple, els arxius no es poden actualitzar o sincronitzar més!",
@@ -65,9 +64,12 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Emmagatzematge de {owner} està gairebé ple ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidències '{filter}'","coincidència '{filter}'"],
-    "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Agregat a favorits",
     "Favorite" : "Preferits",
+    "Upload" : "Puja",
+    "Text file" : "Fitxer de text",
+    "Folder" : "Carpeta",
+    "New folder" : "Carpeta nova",
     "An error occurred while trying to update the tags" : "S'ha produït un error en tractar d'actualitzar les etiquetes",
     "A new file or folder has been <strong>created</strong>" : "S'ha <strong>creat</strong> un nou fitxer o una nova carpeta",
     "A file or folder has been <strong>changed</strong>" : "S'ha <strong>canviat</strong> un fitxer o una carpeta",
@@ -94,17 +96,12 @@
     "Settings" : "Arranjament",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
-    "New" : "Nou",
-    "New text file" : "Nou fitxer de text",
-    "Text file" : "Fitxer de text",
-    "New folder" : "Carpeta nova",
-    "Folder" : "Carpeta",
-    "Upload" : "Puja",
     "Cancel upload" : "Cancel·la la pujada",
     "No files in here" : "No hi ha arxius",
     "Upload some content or sync with your devices!" : "Pugi continguts o sincronitzi els seus dispositius.",
     "No entries found in this folder" : "No hi ha entrades en aquesta carpeta",
     "Select all" : "Seleccionar tot",
+    "Delete" : "Esborra",
     "Upload too large" : "La pujada és massa gran",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
     "Files are being scanned, please wait." : "S'estan escanejant els fitxers, espereu",
diff --git a/apps/files/l10n/ca@valencia.js b/apps/files/l10n/ca@valencia.js
deleted file mode 100644
index 7988332fa9..0000000000
--- a/apps/files/l10n/ca@valencia.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ca@valencia.json b/apps/files/l10n/ca@valencia.json
deleted file mode 100644
index ef5fc58675..0000000000
--- a/apps/files/l10n/ca@valencia.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js
index 39f0a9e695..a5c1449e99 100644
--- a/apps/files/l10n/cs_CZ.js
+++ b/apps/files/l10n/cs_CZ.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Všechny soubory",
     "Favorites" : "Oblíbené",
     "Home" : "Domů",
+    "Close" : "Zavřít",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů",
     "Total file size {size1} exceeds upload limit {size2}" : "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}",
     "Upload cancelled." : "Odesílání zrušeno.",
     "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
-    "{new_name} already exists" : "{new_name} již existuje",
-    "Could not create file" : "Nepodařilo se vytvořit soubor",
-    "Could not create folder" : "Nepodařilo se vytvořit složku",
-    "Rename" : "Přejmenovat",
-    "Delete" : "Smazat",
-    "Disconnect storage" : "Odpojit úložiště",
-    "Unshare" : "Zrušit sdílení",
-    "No permission to delete" : "Chybí oprávnění mazat",
+    "Actions" : "Činnosti",
     "Download" : "Stáhnout",
     "Select" : "Vybrat",
     "Pending" : "Nevyřízené",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Chyba při přesunu souboru.",
     "Error moving file" : "Chyba při přesunu souboru",
     "Error" : "Chyba",
+    "{new_name} already exists" : "{new_name} již existuje",
     "Could not rename file" : "Nepodařilo se přejmenovat soubor",
+    "Could not create file" : "Nepodařilo se vytvořit soubor",
+    "Could not create folder" : "Nepodařilo se vytvořit složku",
     "Error deleting file." : "Chyba při mazání souboru.",
     "No entries in this folder match '{filter}'" : "V tomto adresáři nic nesouhlasí s '{filter}'",
     "Name" : "Název",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Upraveno",
     "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek"],
     "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů"],
+    "{dirs} and {files}" : "{dirs} a {files}",
     "You don’t have permission to upload or create files here" : "Nemáte oprávnění sem nahrávat nebo vytvářet soubory",
     "_Uploading %n file_::_Uploading %n files_" : ["Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"],
+    "New" : "Nový",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatným názvem souboru.",
     "File name cannot be empty." : "Název souboru nemůže být prázdný řetězec.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Úložiště uživatele {owner} je zaplněné, soubory nelze aktualizovat a synchronizovat!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Úložiště uživatele {owner} je téměř plné ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["odpovídá '{filter}'","odpovídá '{filter}'","odpovídá '{filter}'"],
-    "{dirs} and {files}" : "{dirs} a {files}",
+    "Path" : "Cesta",
+    "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"],
     "Favorited" : "Přidáno k oblíbeným",
     "Favorite" : "Oblíbené",
+    "{newname} already exists" : "{newname} již existuje",
+    "Upload" : "Odeslat",
+    "Text file" : "Textový soubor",
+    "New text file.txt" : "Nový textový soubor.txt",
+    "Folder" : "Složka",
+    "New folder" : "Nová složka",
     "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba",
     "A new file or folder has been <strong>created</strong>" : "Byl <strong>vytvořen</strong> nový soubor nebo složka",
     "A file or folder has been <strong>changed</strong>" : "Soubor nebo složka byla <strong>změněna</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Zacházení se soubory",
     "Maximum upload size" : "Maximální velikost pro odesílání",
     "max. possible: " : "největší možná: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Při použití PHP-FPM může změna tohoto nastavení trvat až 5 minut po jeho uložení.",
     "Save" : "Uložit",
     "Can not be edited from here due to insufficient permissions." : "Nelze odsud upravovat z důvodu nedostatečných oprávnění.",
     "Settings" : "Nastavení",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\">přístup k vašim souborům přes WebDAV</a>",
-    "New" : "Nový",
-    "New text file" : "Nový textový soubor",
-    "Text file" : "Textový soubor",
-    "New folder" : "Nová složka",
-    "Folder" : "Složka",
-    "Upload" : "Odeslat",
     "Cancel upload" : "Zrušit odesílání",
     "No files in here" : "Žádné soubory",
     "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!",
     "No entries found in this folder" : "V této složce nebylo nic nalezeno",
     "Select all" : "Vybrat vše",
+    "Delete" : "Smazat",
     "Upload too large" : "Odesílaný soubor je příliš velký",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
     "Files are being scanned, please wait." : "Soubory se prohledávají, prosím čekejte.",
diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json
index 8742662c1d..1da4bfb886 100644
--- a/apps/files/l10n/cs_CZ.json
+++ b/apps/files/l10n/cs_CZ.json
@@ -27,20 +27,14 @@
     "All files" : "Všechny soubory",
     "Favorites" : "Oblíbené",
     "Home" : "Domů",
+    "Close" : "Zavřít",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů",
     "Total file size {size1} exceeds upload limit {size2}" : "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}",
     "Upload cancelled." : "Odesílání zrušeno.",
     "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
-    "{new_name} already exists" : "{new_name} již existuje",
-    "Could not create file" : "Nepodařilo se vytvořit soubor",
-    "Could not create folder" : "Nepodařilo se vytvořit složku",
-    "Rename" : "Přejmenovat",
-    "Delete" : "Smazat",
-    "Disconnect storage" : "Odpojit úložiště",
-    "Unshare" : "Zrušit sdílení",
-    "No permission to delete" : "Chybí oprávnění mazat",
+    "Actions" : "Činnosti",
     "Download" : "Stáhnout",
     "Select" : "Vybrat",
     "Pending" : "Nevyřízené",
@@ -50,7 +44,10 @@
     "Error moving file." : "Chyba při přesunu souboru.",
     "Error moving file" : "Chyba při přesunu souboru",
     "Error" : "Chyba",
+    "{new_name} already exists" : "{new_name} již existuje",
     "Could not rename file" : "Nepodařilo se přejmenovat soubor",
+    "Could not create file" : "Nepodařilo se vytvořit soubor",
+    "Could not create folder" : "Nepodařilo se vytvořit složku",
     "Error deleting file." : "Chyba při mazání souboru.",
     "No entries in this folder match '{filter}'" : "V tomto adresáři nic nesouhlasí s '{filter}'",
     "Name" : "Název",
@@ -58,8 +55,10 @@
     "Modified" : "Upraveno",
     "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek"],
     "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů"],
+    "{dirs} and {files}" : "{dirs} a {files}",
     "You don’t have permission to upload or create files here" : "Nemáte oprávnění sem nahrávat nebo vytvářet soubory",
     "_Uploading %n file_::_Uploading %n files_" : ["Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"],
+    "New" : "Nový",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatným názvem souboru.",
     "File name cannot be empty." : "Název souboru nemůže být prázdný řetězec.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Úložiště uživatele {owner} je zaplněné, soubory nelze aktualizovat a synchronizovat!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Úložiště uživatele {owner} je téměř plné ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["odpovídá '{filter}'","odpovídá '{filter}'","odpovídá '{filter}'"],
-    "{dirs} and {files}" : "{dirs} a {files}",
+    "Path" : "Cesta",
+    "_%n byte_::_%n bytes_" : ["%n bajt","%n bajty","%n bajtů"],
     "Favorited" : "Přidáno k oblíbeným",
     "Favorite" : "Oblíbené",
+    "{newname} already exists" : "{newname} již existuje",
+    "Upload" : "Odeslat",
+    "Text file" : "Textový soubor",
+    "New text file.txt" : "Nový textový soubor.txt",
+    "Folder" : "Složka",
+    "New folder" : "Nová složka",
     "An error occurred while trying to update the tags" : "Při pokusu o úpravu tagů nastala chyba",
     "A new file or folder has been <strong>created</strong>" : "Byl <strong>vytvořen</strong> nový soubor nebo složka",
     "A file or folder has been <strong>changed</strong>" : "Soubor nebo složka byla <strong>změněna</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "Zacházení se soubory",
     "Maximum upload size" : "Maximální velikost pro odesílání",
     "max. possible: " : "největší možná: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Při použití PHP-FPM může změna tohoto nastavení trvat až 5 minut po jeho uložení.",
     "Save" : "Uložit",
     "Can not be edited from here due to insufficient permissions." : "Nelze odsud upravovat z důvodu nedostatečných oprávnění.",
     "Settings" : "Nastavení",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Použijte tuto adresu pro <a href=\"%s\" target=\"_blank\">přístup k vašim souborům přes WebDAV</a>",
-    "New" : "Nový",
-    "New text file" : "Nový textový soubor",
-    "Text file" : "Textový soubor",
-    "New folder" : "Nová složka",
-    "Folder" : "Složka",
-    "Upload" : "Odeslat",
     "Cancel upload" : "Zrušit odesílání",
     "No files in here" : "Žádné soubory",
     "Upload some content or sync with your devices!" : "Nahrajte nějaký obsah nebo synchronizujte se svými přístroji!",
     "No entries found in this folder" : "V této složce nebylo nic nalezeno",
     "Select all" : "Vybrat vše",
+    "Delete" : "Smazat",
     "Upload too large" : "Odesílaný soubor je příliš velký",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
     "Files are being scanned, please wait." : "Soubory se prohledávají, prosím čekejte.",
diff --git a/apps/files/l10n/cy_GB.js b/apps/files/l10n/cy_GB.js
index 8d39608457..bdf61e20f2 100644
--- a/apps/files/l10n/cy_GB.js
+++ b/apps/files/l10n/cy_GB.js
@@ -15,31 +15,31 @@ OC.L10N.register(
     "Invalid directory." : "Cyfeiriadur annilys.",
     "Files" : "Ffeiliau",
     "Home" : "Cartref",
+    "Close" : "Cau",
     "Upload cancelled." : "Diddymwyd llwytho i fyny.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
-    "{new_name} already exists" : "{new_name} yn bodoli'n barod",
-    "Rename" : "Ailenwi",
-    "Delete" : "Dileu",
-    "Unshare" : "Dad-rannu",
+    "Actions" : "Gweithredoedd",
     "Download" : "Llwytho i lawr",
     "Pending" : "I ddod",
     "Error" : "Gwall",
+    "{new_name} already exists" : "{new_name} yn bodoli'n barod",
     "Name" : "Enw",
     "Size" : "Maint",
     "Modified" : "Addaswyd",
+    "New" : "Newydd",
     "File name cannot be empty." : "Does dim hawl cael enw ffeil gwag.",
     "Your storage is full, files can not be updated or synced anymore!" : "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)",
+    "Upload" : "Llwytho i fyny",
+    "Text file" : "Ffeil destun",
+    "Folder" : "Plygell",
     "File handling" : "Trafod ffeiliau",
     "Maximum upload size" : "Maint mwyaf llwytho i fyny",
     "max. possible: " : "mwyaf. posib:",
     "Save" : "Cadw",
     "Settings" : "Gosodiadau",
-    "New" : "Newydd",
-    "Text file" : "Ffeil destun",
-    "Folder" : "Plygell",
-    "Upload" : "Llwytho i fyny",
     "Cancel upload" : "Diddymu llwytho i fyny",
+    "Delete" : "Dileu",
     "Upload too large" : "Maint llwytho i fyny'n rhy fawr",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.",
     "Files are being scanned, please wait." : "Arhoswch, mae ffeiliau'n cael eu sganio."
diff --git a/apps/files/l10n/cy_GB.json b/apps/files/l10n/cy_GB.json
index c852d46fe6..eb66c24ec6 100644
--- a/apps/files/l10n/cy_GB.json
+++ b/apps/files/l10n/cy_GB.json
@@ -13,31 +13,31 @@
     "Invalid directory." : "Cyfeiriadur annilys.",
     "Files" : "Ffeiliau",
     "Home" : "Cartref",
+    "Close" : "Cau",
     "Upload cancelled." : "Diddymwyd llwytho i fyny.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
-    "{new_name} already exists" : "{new_name} yn bodoli'n barod",
-    "Rename" : "Ailenwi",
-    "Delete" : "Dileu",
-    "Unshare" : "Dad-rannu",
+    "Actions" : "Gweithredoedd",
     "Download" : "Llwytho i lawr",
     "Pending" : "I ddod",
     "Error" : "Gwall",
+    "{new_name} already exists" : "{new_name} yn bodoli'n barod",
     "Name" : "Enw",
     "Size" : "Maint",
     "Modified" : "Addaswyd",
+    "New" : "Newydd",
     "File name cannot be empty." : "Does dim hawl cael enw ffeil gwag.",
     "Your storage is full, files can not be updated or synced anymore!" : "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)",
+    "Upload" : "Llwytho i fyny",
+    "Text file" : "Ffeil destun",
+    "Folder" : "Plygell",
     "File handling" : "Trafod ffeiliau",
     "Maximum upload size" : "Maint mwyaf llwytho i fyny",
     "max. possible: " : "mwyaf. posib:",
     "Save" : "Cadw",
     "Settings" : "Gosodiadau",
-    "New" : "Newydd",
-    "Text file" : "Ffeil destun",
-    "Folder" : "Plygell",
-    "Upload" : "Llwytho i fyny",
     "Cancel upload" : "Diddymu llwytho i fyny",
+    "Delete" : "Dileu",
     "Upload too large" : "Maint llwytho i fyny'n rhy fawr",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.",
     "Files are being scanned, please wait." : "Arhoswch, mae ffeiliau'n cael eu sganio."
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
index e039bddf6a..7235176c16 100644
--- a/apps/files/l10n/da.js
+++ b/apps/files/l10n/da.js
@@ -29,30 +29,27 @@ OC.L10N.register(
     "All files" : "Alle filer",
     "Favorites" : "Foretrukne",
     "Home" : "Hjemme",
+    "Close" : "Luk",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes.",
     "Total file size {size1} exceeds upload limit {size2}" : "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage",
     "Upload cancelled." : "Upload afbrudt.",
     "Could not get result from server." : "Kunne ikke hente resultat fra server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
-    "{new_name} already exists" : "{new_name} eksisterer allerede",
-    "Could not create file" : "Kunne ikke oprette fil",
-    "Could not create folder" : "Kunne ikke oprette mappe",
-    "Rename" : "Omdøb",
-    "Delete" : "Slet",
-    "Disconnect storage" : "Frakobl lager",
-    "Unshare" : "Fjern deling",
-    "No permission to delete" : "Ingen rettigheder at slette",
+    "Actions" : "Handlinger",
     "Download" : "Download",
     "Select" : "Vælg",
     "Pending" : "Afventer",
     "Unable to determine date" : "Kan ikke fastslå datoen",
     "This operation is forbidden" : "Denne operation er forbudt",
-    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig - tjek venligst loggene eller kontakt administratoren",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig, tjek venligst loggene eller kontakt administratoren",
     "Error moving file." : "Fejl ved flytning af fil",
     "Error moving file" : "Fejl ved flytning af fil",
     "Error" : "Fejl",
+    "{new_name} already exists" : "{new_name} eksisterer allerede",
     "Could not rename file" : "Kunne ikke omdøbe filen",
+    "Could not create file" : "Kunne ikke oprette fil",
+    "Could not create folder" : "Kunne ikke oprette mappe",
     "Error deleting file." : "Fejl ved sletnign af fil.",
     "No entries in this folder match '{filter}'" : "Der er ingen poster i denne mappe, der matcher '{filter}'",
     "Name" : "Navn",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Ændret",
     "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
     "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "{dirs} and {files}" : "{dirs} og {files}",
     "You don’t have permission to upload or create files here" : "Du har ikke tilladelse til at uploade eller oprette filer her",
     "_Uploading %n file_::_Uploading %n files_" : ["Uploader %n fil","Uploader %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "'{name}' er et ugyldigt filnavn.",
     "File name cannot be empty." : "Filnavnet kan ikke stå tomt.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Opbevaringspladsen tilhørende {owner} er fyldt op - filer kan ikke længere opdateres eller synkroniseres!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Opbevaringspladsen tilhørende {owner} er næsten fyldt op ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["match '{filter}'","match '{filter}'"],
-    "{dirs} and {files}" : "{dirs} og {files}",
+    "Path" : "Sti",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Gjort til foretrukken",
     "Favorite" : "Foretrukken",
+    "{newname} already exists" : "{newname} eksistere allerede",
+    "Upload" : "Upload",
+    "Text file" : "Tekstfil",
+    "New text file.txt" : "Ny tekst file.txt",
+    "Folder" : "Mappe",
+    "New folder" : "Ny Mappe",
     "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mapper er blevet <strong>oprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe er blevet <strong>ændret</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Filhåndtering",
     "Maximum upload size" : "Maksimal upload-størrelse",
     "max. possible: " : "max. mulige: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Med PHP-FPM kan denne værdi, kan der gå op til 5 minutter før virkningen indtræffer, efter at der gemmes.",
     "Save" : "Gem",
     "Can not be edited from here due to insufficient permissions." : "Kan ikke redigeres herfra på grund af utilstrækkelige rettigheder.",
     "Settings" : "Indstillinger",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny tekstfil",
-    "Text file" : "Tekstfil",
-    "New folder" : "Ny Mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Upload",
     "Cancel upload" : "Fortryd upload",
     "No files in here" : "Her er ingen filer",
     "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!",
     "No entries found in this folder" : "Der blev ikke fundet poster i denne mappe",
     "Select all" : "Vælg alle",
+    "Delete" : "Slet",
     "Upload too large" : "Upload er for stor",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
     "Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.",
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
index f8e5b4af45..adead6621a 100644
--- a/apps/files/l10n/da.json
+++ b/apps/files/l10n/da.json
@@ -27,30 +27,27 @@
     "All files" : "Alle filer",
     "Favorites" : "Foretrukne",
     "Home" : "Hjemme",
+    "Close" : "Luk",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes.",
     "Total file size {size1} exceeds upload limit {size2}" : "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage",
     "Upload cancelled." : "Upload afbrudt.",
     "Could not get result from server." : "Kunne ikke hente resultat fra server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
-    "{new_name} already exists" : "{new_name} eksisterer allerede",
-    "Could not create file" : "Kunne ikke oprette fil",
-    "Could not create folder" : "Kunne ikke oprette mappe",
-    "Rename" : "Omdøb",
-    "Delete" : "Slet",
-    "Disconnect storage" : "Frakobl lager",
-    "Unshare" : "Fjern deling",
-    "No permission to delete" : "Ingen rettigheder at slette",
+    "Actions" : "Handlinger",
     "Download" : "Download",
     "Select" : "Vælg",
     "Pending" : "Afventer",
     "Unable to determine date" : "Kan ikke fastslå datoen",
     "This operation is forbidden" : "Denne operation er forbudt",
-    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig - tjek venligst loggene eller kontakt administratoren",
+    "This directory is unavailable, please check the logs or contact the administrator" : "Denne mappe er utilgængelig, tjek venligst loggene eller kontakt administratoren",
     "Error moving file." : "Fejl ved flytning af fil",
     "Error moving file" : "Fejl ved flytning af fil",
     "Error" : "Fejl",
+    "{new_name} already exists" : "{new_name} eksisterer allerede",
     "Could not rename file" : "Kunne ikke omdøbe filen",
+    "Could not create file" : "Kunne ikke oprette fil",
+    "Could not create folder" : "Kunne ikke oprette mappe",
     "Error deleting file." : "Fejl ved sletnign af fil.",
     "No entries in this folder match '{filter}'" : "Der er ingen poster i denne mappe, der matcher '{filter}'",
     "Name" : "Navn",
@@ -58,8 +55,10 @@
     "Modified" : "Ændret",
     "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
     "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "{dirs} and {files}" : "{dirs} og {files}",
     "You don’t have permission to upload or create files here" : "Du har ikke tilladelse til at uploade eller oprette filer her",
     "_Uploading %n file_::_Uploading %n files_" : ["Uploader %n fil","Uploader %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "'{name}' er et ugyldigt filnavn.",
     "File name cannot be empty." : "Filnavnet kan ikke stå tomt.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Opbevaringspladsen tilhørende {owner} er fyldt op - filer kan ikke længere opdateres eller synkroniseres!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Opbevaringspladsen tilhørende {owner} er næsten fyldt op ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["match '{filter}'","match '{filter}'"],
-    "{dirs} and {files}" : "{dirs} og {files}",
+    "Path" : "Sti",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Gjort til foretrukken",
     "Favorite" : "Foretrukken",
+    "{newname} already exists" : "{newname} eksistere allerede",
+    "Upload" : "Upload",
+    "Text file" : "Tekstfil",
+    "New text file.txt" : "Ny tekst file.txt",
+    "Folder" : "Mappe",
+    "New folder" : "Ny Mappe",
     "An error occurred while trying to update the tags" : "Der opstod en fejl under forsøg på at opdatere mærkerne",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mapper er blevet <strong>oprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe er blevet <strong>ændret</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "Filhåndtering",
     "Maximum upload size" : "Maksimal upload-størrelse",
     "max. possible: " : "max. mulige: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Med PHP-FPM kan denne værdi, kan der gå op til 5 minutter før virkningen indtræffer, efter at der gemmes.",
     "Save" : "Gem",
     "Can not be edited from here due to insufficient permissions." : "Kan ikke redigeres herfra på grund af utilstrækkelige rettigheder.",
     "Settings" : "Indstillinger",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny tekstfil",
-    "Text file" : "Tekstfil",
-    "New folder" : "Ny Mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Upload",
     "Cancel upload" : "Fortryd upload",
     "No files in here" : "Her er ingen filer",
     "Upload some content or sync with your devices!" : "Overfør indhold eller synkronisér med dine enheder!",
     "No entries found in this folder" : "Der blev ikke fundet poster i denne mappe",
     "Select all" : "Vælg alle",
+    "Delete" : "Slet",
     "Upload too large" : "Upload er for stor",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
     "Files are being scanned, please wait." : "Filerne bliver indlæst, vent venligst.",
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
index 00d88d5291..5e22e05f80 100644
--- a/apps/files/l10n/de.js
+++ b/apps/files/l10n/de.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Alle Dateien",
     "Favorites" : "Favoriten",
     "Home" : "Home",
+    "Close" : "Schließen",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
     "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Upload cancelled." : "Upload abgebrochen.",
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Could not create file" : "Die Datei konnte nicht erstellt werden",
-    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
-    "Rename" : "Umbenennen",
-    "Delete" : "Löschen",
-    "Disconnect storage" : "Speicher trennen",
-    "Unshare" : "Freigabe aufheben",
-    "No permission to delete" : "Keine Berechtigung zum Löschen",
+    "Actions" : "Aktionen",
     "Download" : "Herunterladen",
     "Select" : "Auswählen",
     "Pending" : "Ausstehend",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Fehler beim Verschieben der Datei.",
     "Error moving file" : "Fehler beim Verschieben der Datei",
     "Error" : "Fehler",
+    "{new_name} already exists" : "{new_name} existiert bereits",
     "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Could not create file" : "Die Datei konnte nicht erstellt werden",
+    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Error deleting file." : "Fehler beim Löschen der Datei.",
     "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein",
     "Name" : "Name",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Geändert",
     "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
     "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "{dirs} and {files}" : "{dirs} und {files}",
     "You don’t have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
     "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
+    "New" : "Neu",
     "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Der Speicher von {owner} ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!",
@@ -69,9 +68,14 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Der Speicher von {owner} ist beinahe voll ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Dein Speicher ist fast voll ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"],
-    "{dirs} and {files}" : "{dirs} und {files}",
+    "Path" : "Pfad",
+    "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"],
     "Favorited" : "Favorisiert",
     "Favorite" : "Favorit",
+    "Upload" : "Hochladen",
+    "Text file" : "Textdatei",
+    "Folder" : "Ordner",
+    "New folder" : "Neuer Ordner",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
@@ -98,17 +102,12 @@ OC.L10N.register(
     "Settings" : "Einstellungen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Benutze diese Adresse, um <a href=\"%s\" target=\"_blank\">über WebDAV auf Deine Dateien zuzugreifen</a>",
-    "New" : "Neu",
-    "New text file" : "Neue Textdatei",
-    "Text file" : "Textdatei",
-    "New folder" : "Neuer Ordner",
-    "Folder" : "Ordner",
-    "Upload" : "Hochladen",
     "Cancel upload" : "Upload abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Lade Inhalte hoch oder synchronisiere mit Deinen Geräten!",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner",
     "Select all" : "Alle auswählen",
+    "Delete" : "Löschen",
     "Upload too large" : "Der Upload ist zu groß",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
     "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.",
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
index 7d75fb70ea..5e93d2b385 100644
--- a/apps/files/l10n/de.json
+++ b/apps/files/l10n/de.json
@@ -27,20 +27,14 @@
     "All files" : "Alle Dateien",
     "Favorites" : "Favoriten",
     "Home" : "Home",
+    "Close" : "Schließen",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
     "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Upload cancelled." : "Upload abgebrochen.",
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Could not create file" : "Die Datei konnte nicht erstellt werden",
-    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
-    "Rename" : "Umbenennen",
-    "Delete" : "Löschen",
-    "Disconnect storage" : "Speicher trennen",
-    "Unshare" : "Freigabe aufheben",
-    "No permission to delete" : "Keine Berechtigung zum Löschen",
+    "Actions" : "Aktionen",
     "Download" : "Herunterladen",
     "Select" : "Auswählen",
     "Pending" : "Ausstehend",
@@ -50,7 +44,10 @@
     "Error moving file." : "Fehler beim Verschieben der Datei.",
     "Error moving file" : "Fehler beim Verschieben der Datei",
     "Error" : "Fehler",
+    "{new_name} already exists" : "{new_name} existiert bereits",
     "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Could not create file" : "Die Datei konnte nicht erstellt werden",
+    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Error deleting file." : "Fehler beim Löschen der Datei.",
     "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein",
     "Name" : "Name",
@@ -58,8 +55,10 @@
     "Modified" : "Geändert",
     "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
     "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "{dirs} and {files}" : "{dirs} und {files}",
     "You don’t have permission to upload or create files here" : "Du hast keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
     "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
+    "New" : "Neu",
     "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Der Speicher von {owner} ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!",
@@ -67,9 +66,14 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Der Speicher von {owner} ist beinahe voll ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Dein Speicher ist fast voll ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"],
-    "{dirs} and {files}" : "{dirs} und {files}",
+    "Path" : "Pfad",
+    "_%n byte_::_%n bytes_" : ["%n Byte","%n Bytes"],
     "Favorited" : "Favorisiert",
     "Favorite" : "Favorit",
+    "Upload" : "Hochladen",
+    "Text file" : "Textdatei",
+    "Folder" : "Ordner",
+    "New folder" : "Neuer Ordner",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
@@ -96,17 +100,12 @@
     "Settings" : "Einstellungen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Benutze diese Adresse, um <a href=\"%s\" target=\"_blank\">über WebDAV auf Deine Dateien zuzugreifen</a>",
-    "New" : "Neu",
-    "New text file" : "Neue Textdatei",
-    "Text file" : "Textdatei",
-    "New folder" : "Neuer Ordner",
-    "Folder" : "Ordner",
-    "Upload" : "Hochladen",
     "Cancel upload" : "Upload abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Lade Inhalte hoch oder synchronisiere mit Deinen Geräten!",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner",
     "Select all" : "Alle auswählen",
+    "Delete" : "Löschen",
     "Upload too large" : "Der Upload ist zu groß",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
     "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.",
diff --git a/apps/files/l10n/de_AT.js b/apps/files/l10n/de_AT.js
index 046e993f7f..70adef6bb0 100644
--- a/apps/files/l10n/de_AT.js
+++ b/apps/files/l10n/de_AT.js
@@ -3,10 +3,10 @@ OC.L10N.register(
     {
     "Unknown error" : "Unbekannter Fehler",
     "Files" : "Dateien",
-    "Delete" : "Löschen",
-    "Unshare" : "Teilung zurücknehmen",
     "Download" : "Herunterladen",
     "Error" : "Fehler",
+    "Upload" : "Hochladen",
+    "New folder" : "Neuer Ordner",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner hat sich <strong>geändert</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>",
@@ -18,8 +18,7 @@ OC.L10N.register(
     "%2$s deleted %1$s" : "%2$s löschte %1$s",
     "Save" : "Speichern",
     "Settings" : "Einstellungen",
-    "New folder" : "Neuer Ordner",
-    "Upload" : "Hochladen",
-    "Cancel upload" : "Hochladen abbrechen"
+    "Cancel upload" : "Hochladen abbrechen",
+    "Delete" : "Löschen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/de_AT.json b/apps/files/l10n/de_AT.json
index b31eb12c49..8766f26474 100644
--- a/apps/files/l10n/de_AT.json
+++ b/apps/files/l10n/de_AT.json
@@ -1,10 +1,10 @@
 { "translations": {
     "Unknown error" : "Unbekannter Fehler",
     "Files" : "Dateien",
-    "Delete" : "Löschen",
-    "Unshare" : "Teilung zurücknehmen",
     "Download" : "Herunterladen",
     "Error" : "Fehler",
+    "Upload" : "Hochladen",
+    "New folder" : "Neuer Ordner",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner hat sich <strong>geändert</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>",
@@ -16,8 +16,7 @@
     "%2$s deleted %1$s" : "%2$s löschte %1$s",
     "Save" : "Speichern",
     "Settings" : "Einstellungen",
-    "New folder" : "Neuer Ordner",
-    "Upload" : "Hochladen",
-    "Cancel upload" : "Hochladen abbrechen"
+    "Cancel upload" : "Hochladen abbrechen",
+    "Delete" : "Löschen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/de_CH.js b/apps/files/l10n/de_CH.js
deleted file mode 100644
index 7bccd43530..0000000000
--- a/apps/files/l10n/de_CH.js
+++ /dev/null
@@ -1,56 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Unknown error" : "Unbekannter Fehler",
-    "Could not move %s - File with this name already exists" : "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
-    "Could not move %s" : "Konnte %s nicht verschieben",
-    "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
-    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.",
-    "Unable to set upload directory." : "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
-    "Invalid Token" : "Ungültiges Merkmal",
-    "No file was uploaded. Unknown error" : "Keine Datei hochgeladen. Unbekannter Fehler",
-    "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist grösser, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
-    "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden",
-    "No file was uploaded" : "Keine Datei konnte übertragen werden.",
-    "Missing a temporary folder" : "Kein temporärer Ordner vorhanden",
-    "Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte",
-    "Not enough storage available" : "Nicht genug Speicher vorhanden.",
-    "Invalid directory." : "Ungültiges Verzeichnis.",
-    "Files" : "Dateien",
-    "Upload cancelled." : "Upload abgebrochen.",
-    "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Share" : "Teilen",
-    "Delete" : "Löschen",
-    "Unshare" : "Teilung aufheben",
-    "Delete permanently" : "Endgültig löschen",
-    "Rename" : "Umbenennen",
-    "Pending" : "Ausstehend",
-    "Error" : "Fehler",
-    "Name" : "Name",
-    "Size" : "Grösse",
-    "Modified" : "Geändert",
-    "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
-    "Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
-    "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
-    "%s could not be renamed" : "%s konnte nicht umbenannt werden",
-    "File handling" : "Dateibehandlung",
-    "Maximum upload size" : "Maximale Upload-Grösse",
-    "max. possible: " : "maximal möglich:",
-    "Save" : "Speichern",
-    "WebDAV" : "WebDAV",
-    "New" : "Neu",
-    "Text file" : "Textdatei",
-    "New folder" : "Neues Verzeichnis",
-    "Folder" : "Ordner",
-    "From link" : "Von einem Link",
-    "Nothing in here. Upload something!" : "Alles leer. Laden Sie etwas hoch!",
-    "Download" : "Herunterladen",
-    "Upload too large" : "Der Upload ist zu gross",
-    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.",
-    "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/de_CH.json b/apps/files/l10n/de_CH.json
deleted file mode 100644
index c7a64d52c8..0000000000
--- a/apps/files/l10n/de_CH.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{ "translations": {
-    "Unknown error" : "Unbekannter Fehler",
-    "Could not move %s - File with this name already exists" : "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
-    "Could not move %s" : "Konnte %s nicht verschieben",
-    "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
-    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.",
-    "Unable to set upload directory." : "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
-    "Invalid Token" : "Ungültiges Merkmal",
-    "No file was uploaded. Unknown error" : "Keine Datei hochgeladen. Unbekannter Fehler",
-    "There is no error, the file uploaded with success" : "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Die Datei ist grösser, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist",
-    "The uploaded file was only partially uploaded" : "Die Datei konnte nur teilweise übertragen werden",
-    "No file was uploaded" : "Keine Datei konnte übertragen werden.",
-    "Missing a temporary folder" : "Kein temporärer Ordner vorhanden",
-    "Failed to write to disk" : "Fehler beim Schreiben auf die Festplatte",
-    "Not enough storage available" : "Nicht genug Speicher vorhanden.",
-    "Invalid directory." : "Ungültiges Verzeichnis.",
-    "Files" : "Dateien",
-    "Upload cancelled." : "Upload abgebrochen.",
-    "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Share" : "Teilen",
-    "Delete" : "Löschen",
-    "Unshare" : "Teilung aufheben",
-    "Delete permanently" : "Endgültig löschen",
-    "Rename" : "Umbenennen",
-    "Pending" : "Ausstehend",
-    "Error" : "Fehler",
-    "Name" : "Name",
-    "Size" : "Grösse",
-    "Modified" : "Geändert",
-    "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
-    "Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
-    "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
-    "%s could not be renamed" : "%s konnte nicht umbenannt werden",
-    "File handling" : "Dateibehandlung",
-    "Maximum upload size" : "Maximale Upload-Grösse",
-    "max. possible: " : "maximal möglich:",
-    "Save" : "Speichern",
-    "WebDAV" : "WebDAV",
-    "New" : "Neu",
-    "Text file" : "Textdatei",
-    "New folder" : "Neues Verzeichnis",
-    "Folder" : "Ordner",
-    "From link" : "Von einem Link",
-    "Nothing in here. Upload something!" : "Alles leer. Laden Sie etwas hoch!",
-    "Download" : "Herunterladen",
-    "Upload too large" : "Der Upload ist zu gross",
-    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.",
-    "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
index 69699135b8..34c6c8fb4a 100644
--- a/apps/files/l10n/de_DE.js
+++ b/apps/files/l10n/de_DE.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Alle Dateien",
     "Favorites" : "Favoriten",
     "Home" : "Zuhause",
+    "Close" : "Schließen",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
     "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Upload cancelled." : "Upload abgebrochen.",
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Could not create file" : "Die Datei konnte nicht erstellt werden",
-    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
-    "Rename" : "Umbenennen",
-    "Delete" : "Löschen",
-    "Disconnect storage" : "Speicher trennen",
-    "Unshare" : "Freigabe aufheben",
-    "No permission to delete" : "Keine Berechtigung zum Löschen",
+    "Actions" : "Aktionen",
     "Download" : "Herunterladen",
     "Select" : "Auswählen",
     "Pending" : "Ausstehend",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Fehler beim Verschieben der Datei.",
     "Error moving file" : "Fehler beim Verschieben der Datei",
     "Error" : "Fehler",
+    "{new_name} already exists" : "{new_name} existiert bereits",
     "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Could not create file" : "Die Datei konnte nicht erstellt werden",
+    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Error deleting file." : "Fehler beim Löschen der Datei.",
     "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein",
     "Name" : "Name",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Geändert",
     "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
     "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "{dirs} and {files}" : "{dirs} und {files}",
     "You don’t have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
     "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hoch geladen"],
+    "New" : "Neu",
     "\"{name}\" is an invalid file name." : "„{name}“ ist kein gültiger Dateiname.",
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Der Speicher von {owner} ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!",
@@ -69,9 +68,12 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Der Speicher von {owner} ist beinahe voll ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"],
-    "{dirs} and {files}" : "{dirs} und {files}",
     "Favorited" : "Favorisiert",
     "Favorite" : "Favorit",
+    "Upload" : "Hochladen",
+    "Text file" : "Textdatei",
+    "Folder" : "Ordner",
+    "New folder" : "Neuer Ordner",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
@@ -98,17 +100,12 @@ OC.L10N.register(
     "Settings" : "Einstellungen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Benutzen Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">über WebDAV auf Ihre Dateien zuzugreifen</a>",
-    "New" : "Neu",
-    "New text file" : "Neue Textdatei",
-    "Text file" : "Textdatei",
-    "New folder" : "Neuer Ordner",
-    "Folder" : "Ordner",
-    "Upload" : "Hochladen",
     "Cancel upload" : "Upload abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden",
     "Select all" : "Alle auswählen",
+    "Delete" : "Löschen",
     "Upload too large" : "Der Upload ist zu groß",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
     "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.",
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
index 2a1e548ec5..390e5e0e57 100644
--- a/apps/files/l10n/de_DE.json
+++ b/apps/files/l10n/de_DE.json
@@ -27,20 +27,14 @@
     "All files" : "Alle Dateien",
     "Favorites" : "Favoriten",
     "Home" : "Zuhause",
+    "Close" : "Schließen",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
     "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
     "Upload cancelled." : "Upload abgebrochen.",
     "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
-    "{new_name} already exists" : "{new_name} existiert bereits",
-    "Could not create file" : "Die Datei konnte nicht erstellt werden",
-    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
-    "Rename" : "Umbenennen",
-    "Delete" : "Löschen",
-    "Disconnect storage" : "Speicher trennen",
-    "Unshare" : "Freigabe aufheben",
-    "No permission to delete" : "Keine Berechtigung zum Löschen",
+    "Actions" : "Aktionen",
     "Download" : "Herunterladen",
     "Select" : "Auswählen",
     "Pending" : "Ausstehend",
@@ -50,7 +44,10 @@
     "Error moving file." : "Fehler beim Verschieben der Datei.",
     "Error moving file" : "Fehler beim Verschieben der Datei",
     "Error" : "Fehler",
+    "{new_name} already exists" : "{new_name} existiert bereits",
     "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Could not create file" : "Die Datei konnte nicht erstellt werden",
+    "Could not create folder" : "Der Ordner konnte nicht erstellt werden",
     "Error deleting file." : "Fehler beim Löschen der Datei.",
     "No entries in this folder match '{filter}'" : "Keine Einträge in diesem Ordner stimmen mit '{filter}' überein",
     "Name" : "Name",
@@ -58,8 +55,10 @@
     "Modified" : "Geändert",
     "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
     "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "{dirs} and {files}" : "{dirs} und {files}",
     "You don’t have permission to upload or create files here" : "Sie haben keine Berechtigung, hier Dateien hochzuladen oder zu erstellen",
     "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hoch geladen"],
+    "New" : "Neu",
     "\"{name}\" is an invalid file name." : "„{name}“ ist kein gültiger Dateiname.",
     "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Der Speicher von {owner} ist voll, Dateien können nicht mehr aktualisiert oder synchronisiert werden!",
@@ -67,9 +66,12 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Der Speicher von {owner} ist beinahe voll ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["stimmt mit '{filter}' überein","stimmen mit '{filter}' überein"],
-    "{dirs} and {files}" : "{dirs} und {files}",
     "Favorited" : "Favorisiert",
     "Favorite" : "Favorit",
+    "Upload" : "Hochladen",
+    "Text file" : "Textdatei",
+    "Folder" : "Ordner",
+    "New folder" : "Neuer Ordner",
     "An error occurred while trying to update the tags" : "Es ist ein Fehler beim Aktualisieren der Tags aufgetreten",
     "A new file or folder has been <strong>created</strong>" : "Eine neue Datei oder ein neuer Ordner wurde <strong>erstellt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Eine Datei oder ein Ordner wurde <strong>geändert</strong>",
@@ -96,17 +98,12 @@
     "Settings" : "Einstellungen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Benutzen Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">über WebDAV auf Ihre Dateien zuzugreifen</a>",
-    "New" : "Neu",
-    "New text file" : "Neue Textdatei",
-    "Text file" : "Textdatei",
-    "New folder" : "Neuer Ordner",
-    "Folder" : "Ordner",
-    "Upload" : "Hochladen",
     "Cancel upload" : "Upload abbrechen",
     "No files in here" : "Keine Dateien vorhanden",
     "Upload some content or sync with your devices!" : "Laden Sie Inhalte hoch oder synchronisieren Sie mit Ihren Geräten!",
     "No entries found in this folder" : "Keine Einträge in diesem Ordner gefunden",
     "Select all" : "Alle auswählen",
+    "Delete" : "Löschen",
     "Upload too large" : "Der Upload ist zu groß",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
     "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten.",
diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js
index 255f70f29e..fe65869c3b 100644
--- a/apps/files/l10n/el.js
+++ b/apps/files/l10n/el.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Όλα τα αρχεία",
     "Favorites" : "Αγαπημένες",
     "Home" : "Σπίτι",
+    "Close" : "Κλείσιμο",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}",
     "Upload cancelled." : "Η αποστολή ακυρώθηκε.",
     "Could not get result from server." : "Αδυναμία λήψης αποτελέσματος από το διακομιστή.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
-    "{new_name} already exists" : "{new_name} υπάρχει ήδη",
-    "Could not create file" : "Αδυναμία δημιουργίας αρχείου",
-    "Could not create folder" : "Αδυναμία δημιουργίας φακέλου",
-    "Rename" : "Μετονομασία",
-    "Delete" : "Διαγραφή",
-    "Disconnect storage" : "Αποσυνδεδεμένος αποθηκευτικός χώρος",
-    "Unshare" : "Διακοπή διαμοιρασμού",
-    "No permission to delete" : "Δεν έχετε άδεια να το διαγράψετε",
+    "Actions" : "Ενέργειες",
     "Download" : "Λήψη",
     "Select" : "Επιλογή",
     "Pending" : "Εκκρεμεί",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Σφάλμα κατά τη μετακίνηση του αρχείου.",
     "Error moving file" : "Σφάλμα κατά τη μετακίνηση του αρχείου",
     "Error" : "Σφάλμα",
+    "{new_name} already exists" : "{new_name} υπάρχει ήδη",
     "Could not rename file" : "Αδυναμία μετονομασίας αρχείου",
+    "Could not create file" : "Αδυναμία δημιουργίας αρχείου",
+    "Could not create folder" : "Αδυναμία δημιουργίας φακέλου",
     "Error deleting file." : "Σφάλμα διαγραφής αρχείου.",
     "No entries in this folder match '{filter}'" : "Δεν ταιριάζουν καταχωρήσεις σε αυτόν το φάκελο '{filter}'",
     "Name" : "Όνομα",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Τροποποιήθηκε",
     "_%n folder_::_%n folders_" : ["%n φάκελος","%n φάκελοι"],
     "_%n file_::_%n files_" : ["%n αρχείο","%n αρχεία"],
+    "{dirs} and {files}" : "{Κατάλογοι αρχείων} και {αρχεία}",
     "You don’t have permission to upload or create files here" : "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ",
     "_Uploading %n file_::_Uploading %n files_" : ["Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"],
+    "New" : "Νέο",
     "\"{name}\" is an invalid file name." : "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου.",
     "File name cannot be empty." : "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Ο αποθηκευτικός χώρος του {owner} είναι πλήρης, τα αρχεία δεν δύναται να ενημερωθούν ή να συγχρονίσουν!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Ο αποθηκευτικός χώρος του {owner} είναι σχεδόν πλήρης ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["ταιριάζουν '{filter}' ","ταιριάζουν '{filter}'"],
-    "{dirs} and {files}" : "{Κατάλογοι αρχείων} και {αρχεία}",
+    "Path" : "Διαδρομή",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Προτιμώμενα",
     "Favorite" : "Αγαπημένο",
+    "{newname} already exists" : "το {newname} υπάρχει ήδη",
+    "Upload" : "Μεταφόρτωση",
+    "Text file" : "Αρχείο κειμένου",
+    "New text file.txt" : "Νέο αρχείο κειμένου.txt",
+    "Folder" : "Φάκελος",
+    "New folder" : "Νέος κατάλογος",
     "An error occurred while trying to update the tags" : "Ένα σφάλμα προέκυψε κατά τη διάρκεια ενημέρωσης των ετικετών",
     "A new file or folder has been <strong>created</strong>" : "Ένα νέο αρχείο ή κατάλογος έχουν <strong>δημιουργηθεί</strong>",
     "A file or folder has been <strong>changed</strong>" : "Ένα αρχείο ή κατάλογος έχουν <strong>αλλάξει</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Διαχείριση αρχείων",
     "Maximum upload size" : "Μέγιστο μέγεθος αποστολής",
     "max. possible: " : "μέγιστο δυνατό:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Με την PHP-FPM αυτή η τιμή μπορεί να χρειαστεί μέχρι και 5 λεπτά για να ενεργοποιηθεί μετά την αποθήκευση.",
     "Save" : "Αποθήκευση",
     "Can not be edited from here due to insufficient permissions." : "Δεν υπάρχει εδώ η δυνατότητα επεξεργασίας λόγω μη επαρκών δικαιωμάτων",
     "Settings" : "Ρυθμίσεις",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Χρησιμοποιήστε αυτήν την διεύθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">πρόσβαση στα αρχεία σας μέσω WebDAV</a>",
-    "New" : "Νέο",
-    "New text file" : "Νέο αρχείο κειμένου",
-    "Text file" : "Αρχείο κειμένου",
-    "New folder" : "Νέος κατάλογος",
-    "Folder" : "Φάκελος",
-    "Upload" : "Μεταφόρτωση",
     "Cancel upload" : "Ακύρωση μεταφόρτωσης",
     "No files in here" : "Δεν υπάρχουν αρχεία",
     "Upload some content or sync with your devices!" : "Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας!",
     "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο",
     "Select all" : "Επιλογή όλων",
+    "Delete" : "Διαγραφή",
     "Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
     "Files are being scanned, please wait." : "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json
index 2b72213e53..37ff95b406 100644
--- a/apps/files/l10n/el.json
+++ b/apps/files/l10n/el.json
@@ -27,20 +27,14 @@
     "All files" : "Όλα τα αρχεία",
     "Favorites" : "Αγαπημένες",
     "Home" : "Σπίτι",
+    "Close" : "Κλείσιμο",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}",
     "Upload cancelled." : "Η αποστολή ακυρώθηκε.",
     "Could not get result from server." : "Αδυναμία λήψης αποτελέσματος από το διακομιστή.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
-    "{new_name} already exists" : "{new_name} υπάρχει ήδη",
-    "Could not create file" : "Αδυναμία δημιουργίας αρχείου",
-    "Could not create folder" : "Αδυναμία δημιουργίας φακέλου",
-    "Rename" : "Μετονομασία",
-    "Delete" : "Διαγραφή",
-    "Disconnect storage" : "Αποσυνδεδεμένος αποθηκευτικός χώρος",
-    "Unshare" : "Διακοπή διαμοιρασμού",
-    "No permission to delete" : "Δεν έχετε άδεια να το διαγράψετε",
+    "Actions" : "Ενέργειες",
     "Download" : "Λήψη",
     "Select" : "Επιλογή",
     "Pending" : "Εκκρεμεί",
@@ -50,7 +44,10 @@
     "Error moving file." : "Σφάλμα κατά τη μετακίνηση του αρχείου.",
     "Error moving file" : "Σφάλμα κατά τη μετακίνηση του αρχείου",
     "Error" : "Σφάλμα",
+    "{new_name} already exists" : "{new_name} υπάρχει ήδη",
     "Could not rename file" : "Αδυναμία μετονομασίας αρχείου",
+    "Could not create file" : "Αδυναμία δημιουργίας αρχείου",
+    "Could not create folder" : "Αδυναμία δημιουργίας φακέλου",
     "Error deleting file." : "Σφάλμα διαγραφής αρχείου.",
     "No entries in this folder match '{filter}'" : "Δεν ταιριάζουν καταχωρήσεις σε αυτόν το φάκελο '{filter}'",
     "Name" : "Όνομα",
@@ -58,8 +55,10 @@
     "Modified" : "Τροποποιήθηκε",
     "_%n folder_::_%n folders_" : ["%n φάκελος","%n φάκελοι"],
     "_%n file_::_%n files_" : ["%n αρχείο","%n αρχεία"],
+    "{dirs} and {files}" : "{Κατάλογοι αρχείων} και {αρχεία}",
     "You don’t have permission to upload or create files here" : "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ",
     "_Uploading %n file_::_Uploading %n files_" : ["Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"],
+    "New" : "Νέο",
     "\"{name}\" is an invalid file name." : "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου.",
     "File name cannot be empty." : "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Ο αποθηκευτικός χώρος του {owner} είναι πλήρης, τα αρχεία δεν δύναται να ενημερωθούν ή να συγχρονίσουν!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Ο αποθηκευτικός χώρος του {owner} είναι σχεδόν πλήρης ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["ταιριάζουν '{filter}' ","ταιριάζουν '{filter}'"],
-    "{dirs} and {files}" : "{Κατάλογοι αρχείων} και {αρχεία}",
+    "Path" : "Διαδρομή",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Προτιμώμενα",
     "Favorite" : "Αγαπημένο",
+    "{newname} already exists" : "το {newname} υπάρχει ήδη",
+    "Upload" : "Μεταφόρτωση",
+    "Text file" : "Αρχείο κειμένου",
+    "New text file.txt" : "Νέο αρχείο κειμένου.txt",
+    "Folder" : "Φάκελος",
+    "New folder" : "Νέος κατάλογος",
     "An error occurred while trying to update the tags" : "Ένα σφάλμα προέκυψε κατά τη διάρκεια ενημέρωσης των ετικετών",
     "A new file or folder has been <strong>created</strong>" : "Ένα νέο αρχείο ή κατάλογος έχουν <strong>δημιουργηθεί</strong>",
     "A file or folder has been <strong>changed</strong>" : "Ένα αρχείο ή κατάλογος έχουν <strong>αλλάξει</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "Διαχείριση αρχείων",
     "Maximum upload size" : "Μέγιστο μέγεθος αποστολής",
     "max. possible: " : "μέγιστο δυνατό:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Με την PHP-FPM αυτή η τιμή μπορεί να χρειαστεί μέχρι και 5 λεπτά για να ενεργοποιηθεί μετά την αποθήκευση.",
     "Save" : "Αποθήκευση",
     "Can not be edited from here due to insufficient permissions." : "Δεν υπάρχει εδώ η δυνατότητα επεξεργασίας λόγω μη επαρκών δικαιωμάτων",
     "Settings" : "Ρυθμίσεις",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Χρησιμοποιήστε αυτήν την διεύθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">πρόσβαση στα αρχεία σας μέσω WebDAV</a>",
-    "New" : "Νέο",
-    "New text file" : "Νέο αρχείο κειμένου",
-    "Text file" : "Αρχείο κειμένου",
-    "New folder" : "Νέος κατάλογος",
-    "Folder" : "Φάκελος",
-    "Upload" : "Μεταφόρτωση",
     "Cancel upload" : "Ακύρωση μεταφόρτωσης",
     "No files in here" : "Δεν υπάρχουν αρχεία",
     "Upload some content or sync with your devices!" : "Μεταφόρτωση περιεχομένου ή συγχρονισμός με τις συσκευές σας!",
     "No entries found in this folder" : "Δεν βρέθηκαν καταχωρήσεις σε αυτόν το φάκελο",
     "Select all" : "Επιλογή όλων",
+    "Delete" : "Διαγραφή",
     "Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
     "Files are being scanned, please wait." : "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js
index 4fa680b5c7..decfe4dcd8 100644
--- a/apps/files/l10n/en_GB.js
+++ b/apps/files/l10n/en_GB.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "All files",
     "Favorites" : "Favourites",
     "Home" : "Home",
+    "Close" : "Close",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left",
     "Upload cancelled." : "Upload cancelled.",
     "Could not get result from server." : "Could not get result from server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
-    "{new_name} already exists" : "{new_name} already exists",
-    "Could not create file" : "Could not create file",
-    "Could not create folder" : "Could not create folder",
-    "Rename" : "Rename",
-    "Delete" : "Delete",
-    "Disconnect storage" : "Disconnect storage",
-    "Unshare" : "Unshare",
-    "No permission to delete" : "No permission to delete",
+    "Actions" : "Actions",
     "Download" : "Download",
     "Select" : "Select",
     "Pending" : "Pending",
@@ -50,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Error moving file.",
     "Error moving file" : "Error moving file",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} already exists",
     "Could not rename file" : "Could not rename file",
+    "Could not create file" : "Could not create file",
+    "Could not create folder" : "Could not create folder",
     "Error deleting file." : "Error deleting file.",
     "No entries in this folder match '{filter}'" : "No entries in this folder match '{filter}'",
     "Name" : "Name",
@@ -58,16 +55,21 @@ OC.L10N.register(
     "Modified" : "Modified",
     "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
     "_%n file_::_%n files_" : ["%n file","%n files"],
+    "{dirs} and {files}" : "{dirs} and {files}",
     "You don’t have permission to upload or create files here" : "You don’t have permission to upload or create files here",
     "_Uploading %n file_::_Uploading %n files_" : ["Uploading %n file","Uploading %n files"],
+    "New" : "New",
     "\"{name}\" is an invalid file name." : "\"{name}\" is an invalid file name.",
     "File name cannot be empty." : "File name cannot be empty.",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Your storage is almost full ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["matches '{filter}'","match '{filter}'"],
-    "{dirs} and {files}" : "{dirs} and {files}",
     "Favorited" : "Favourited",
     "Favorite" : "Favourite",
+    "Upload" : "Upload",
+    "Text file" : "Text file",
+    "Folder" : "Folder",
+    "New folder" : "New folder",
     "An error occurred while trying to update the tags" : "An error occurred whilst trying to update the tags",
     "A new file or folder has been <strong>created</strong>" : "A new file or folder has been <strong>created</strong>",
     "A file or folder has been <strong>changed</strong>" : "A file or folder has been <strong>changed</strong>",
@@ -94,17 +96,12 @@ OC.L10N.register(
     "Settings" : "Settings",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>",
-    "New" : "New",
-    "New text file" : "New text file",
-    "Text file" : "Text file",
-    "New folder" : "New folder",
-    "Folder" : "Folder",
-    "Upload" : "Upload",
     "Cancel upload" : "Cancel upload",
     "No files in here" : "No files in here",
     "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!",
     "No entries found in this folder" : "No entries found in this folder",
     "Select all" : "Select all",
+    "Delete" : "Delete",
     "Upload too large" : "Upload too large",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "The files you are trying to upload exceed the maximum size for file uploads on this server.",
     "Files are being scanned, please wait." : "Files are being scanned, please wait.",
diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json
index 417272a5cd..cf06affa55 100644
--- a/apps/files/l10n/en_GB.json
+++ b/apps/files/l10n/en_GB.json
@@ -27,20 +27,14 @@
     "All files" : "All files",
     "Favorites" : "Favourites",
     "Home" : "Home",
+    "Close" : "Close",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left",
     "Upload cancelled." : "Upload cancelled.",
     "Could not get result from server." : "Could not get result from server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
-    "{new_name} already exists" : "{new_name} already exists",
-    "Could not create file" : "Could not create file",
-    "Could not create folder" : "Could not create folder",
-    "Rename" : "Rename",
-    "Delete" : "Delete",
-    "Disconnect storage" : "Disconnect storage",
-    "Unshare" : "Unshare",
-    "No permission to delete" : "No permission to delete",
+    "Actions" : "Actions",
     "Download" : "Download",
     "Select" : "Select",
     "Pending" : "Pending",
@@ -48,7 +42,10 @@
     "Error moving file." : "Error moving file.",
     "Error moving file" : "Error moving file",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} already exists",
     "Could not rename file" : "Could not rename file",
+    "Could not create file" : "Could not create file",
+    "Could not create folder" : "Could not create folder",
     "Error deleting file." : "Error deleting file.",
     "No entries in this folder match '{filter}'" : "No entries in this folder match '{filter}'",
     "Name" : "Name",
@@ -56,16 +53,21 @@
     "Modified" : "Modified",
     "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
     "_%n file_::_%n files_" : ["%n file","%n files"],
+    "{dirs} and {files}" : "{dirs} and {files}",
     "You don’t have permission to upload or create files here" : "You don’t have permission to upload or create files here",
     "_Uploading %n file_::_Uploading %n files_" : ["Uploading %n file","Uploading %n files"],
+    "New" : "New",
     "\"{name}\" is an invalid file name." : "\"{name}\" is an invalid file name.",
     "File name cannot be empty." : "File name cannot be empty.",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Your storage is almost full ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["matches '{filter}'","match '{filter}'"],
-    "{dirs} and {files}" : "{dirs} and {files}",
     "Favorited" : "Favourited",
     "Favorite" : "Favourite",
+    "Upload" : "Upload",
+    "Text file" : "Text file",
+    "Folder" : "Folder",
+    "New folder" : "New folder",
     "An error occurred while trying to update the tags" : "An error occurred whilst trying to update the tags",
     "A new file or folder has been <strong>created</strong>" : "A new file or folder has been <strong>created</strong>",
     "A file or folder has been <strong>changed</strong>" : "A file or folder has been <strong>changed</strong>",
@@ -92,17 +94,12 @@
     "Settings" : "Settings",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>",
-    "New" : "New",
-    "New text file" : "New text file",
-    "Text file" : "Text file",
-    "New folder" : "New folder",
-    "Folder" : "Folder",
-    "Upload" : "Upload",
     "Cancel upload" : "Cancel upload",
     "No files in here" : "No files in here",
     "Upload some content or sync with your devices!" : "Upload some content or sync with your devices!",
     "No entries found in this folder" : "No entries found in this folder",
     "Select all" : "Select all",
+    "Delete" : "Delete",
     "Upload too large" : "Upload too large",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "The files you are trying to upload exceed the maximum size for file uploads on this server.",
     "Files are being scanned, please wait." : "Files are being scanned, please wait.",
diff --git a/apps/files/l10n/en_NZ.js b/apps/files/l10n/en_NZ.js
deleted file mode 100644
index 7988332fa9..0000000000
--- a/apps/files/l10n/en_NZ.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/en_NZ.json b/apps/files/l10n/en_NZ.json
deleted file mode 100644
index ef5fc58675..0000000000
--- a/apps/files/l10n/en_NZ.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/eo.js b/apps/files/l10n/eo.js
index 56c4d23d90..3c208a6bc1 100644
--- a/apps/files/l10n/eo.js
+++ b/apps/files/l10n/eo.js
@@ -24,34 +24,38 @@ OC.L10N.register(
     "All files" : "Ĉiuj dosieroj",
     "Favorites" : "Favoratoj",
     "Home" : "Hejmo",
+    "Close" : "Fermi",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn",
     "Upload cancelled." : "La alŝuto nuliĝis.",
     "Could not get result from server." : "Ne povis ekhaviĝi rezulto el la servilo.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
-    "{new_name} already exists" : "{new_name} jam ekzistas",
-    "Could not create file" : "Ne povis kreiĝi dosiero",
-    "Could not create folder" : "Ne povis kreiĝi dosierujo",
-    "Rename" : "Alinomigi",
-    "Delete" : "Forigi",
-    "Unshare" : "Malkunhavigi",
+    "Actions" : "Agoj",
     "Download" : "Elŝuti",
     "Select" : "Elekti",
     "Pending" : "Traktotaj",
     "Error moving file" : "Eraris movo de dosiero",
     "Error" : "Eraro",
+    "{new_name} already exists" : "{new_name} jam ekzistas",
     "Could not rename file" : "Ne povis alinomiĝi dosiero",
+    "Could not create file" : "Ne povis kreiĝi dosiero",
+    "Could not create folder" : "Ne povis kreiĝi dosierujo",
     "Name" : "Nomo",
     "Size" : "Grando",
     "Modified" : "Modifita",
     "_%n folder_::_%n folders_" : ["%n dosierujo","%n dosierujoj"],
     "_%n file_::_%n files_" : ["%n dosiero","%n dosieroj"],
+    "{dirs} and {files}" : "{dirs} kaj {files}",
     "You don’t have permission to upload or create files here" : "Vi ne havas permeson alŝuti aŭ krei dosierojn ĉi tie",
     "_Uploading %n file_::_Uploading %n files_" : ["Alŝutatas %n dosiero","Alŝutatas %n dosieroj"],
+    "New" : "Nova",
     "File name cannot be empty." : "Dosiernomo devas ne malpleni.",
     "Your storage is full, files can not be updated or synced anymore!" : "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} kaj {files}",
     "Favorite" : "Favorato",
+    "Upload" : "Alŝuti",
+    "Text file" : "Tekstodosiero",
+    "Folder" : "Dosierujo",
+    "New folder" : "Nova dosierujo",
     "You created %1$s" : "Vi kreis %1$s",
     "%2$s created %1$s" : "%2$s kreis %1$s",
     "%1$s was created in a public folder" : "%1$s kreiĝis en publika dosierujo",
@@ -69,15 +73,10 @@ OC.L10N.register(
     "Settings" : "Agordo",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Uzu ĉi tiun adreson por <a href=\"%s\" target=\"_blank\">aliri viajn Dosierojn per WebDAV</a>",
-    "New" : "Nova",
-    "New text file" : "Nova tekstodosiero",
-    "Text file" : "Tekstodosiero",
-    "New folder" : "Nova dosierujo",
-    "Folder" : "Dosierujo",
-    "Upload" : "Alŝuti",
     "Cancel upload" : "Nuligi alŝuton",
     "No files in here" : "Neniu dosiero estas ĉi tie",
     "Select all" : "Elekti ĉion",
+    "Delete" : "Forigi",
     "Upload too large" : "Alŝuto tro larĝa",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
     "Files are being scanned, please wait." : "Dosieroj estas skanataj, bonvolu atendi."
diff --git a/apps/files/l10n/eo.json b/apps/files/l10n/eo.json
index e3cebced2f..bf69b68d88 100644
--- a/apps/files/l10n/eo.json
+++ b/apps/files/l10n/eo.json
@@ -22,34 +22,38 @@
     "All files" : "Ĉiuj dosieroj",
     "Favorites" : "Favoratoj",
     "Home" : "Hejmo",
+    "Close" : "Fermi",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn",
     "Upload cancelled." : "La alŝuto nuliĝis.",
     "Could not get result from server." : "Ne povis ekhaviĝi rezulto el la servilo.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
-    "{new_name} already exists" : "{new_name} jam ekzistas",
-    "Could not create file" : "Ne povis kreiĝi dosiero",
-    "Could not create folder" : "Ne povis kreiĝi dosierujo",
-    "Rename" : "Alinomigi",
-    "Delete" : "Forigi",
-    "Unshare" : "Malkunhavigi",
+    "Actions" : "Agoj",
     "Download" : "Elŝuti",
     "Select" : "Elekti",
     "Pending" : "Traktotaj",
     "Error moving file" : "Eraris movo de dosiero",
     "Error" : "Eraro",
+    "{new_name} already exists" : "{new_name} jam ekzistas",
     "Could not rename file" : "Ne povis alinomiĝi dosiero",
+    "Could not create file" : "Ne povis kreiĝi dosiero",
+    "Could not create folder" : "Ne povis kreiĝi dosierujo",
     "Name" : "Nomo",
     "Size" : "Grando",
     "Modified" : "Modifita",
     "_%n folder_::_%n folders_" : ["%n dosierujo","%n dosierujoj"],
     "_%n file_::_%n files_" : ["%n dosiero","%n dosieroj"],
+    "{dirs} and {files}" : "{dirs} kaj {files}",
     "You don’t have permission to upload or create files here" : "Vi ne havas permeson alŝuti aŭ krei dosierojn ĉi tie",
     "_Uploading %n file_::_Uploading %n files_" : ["Alŝutatas %n dosiero","Alŝutatas %n dosieroj"],
+    "New" : "Nova",
     "File name cannot be empty." : "Dosiernomo devas ne malpleni.",
     "Your storage is full, files can not be updated or synced anymore!" : "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} kaj {files}",
     "Favorite" : "Favorato",
+    "Upload" : "Alŝuti",
+    "Text file" : "Tekstodosiero",
+    "Folder" : "Dosierujo",
+    "New folder" : "Nova dosierujo",
     "You created %1$s" : "Vi kreis %1$s",
     "%2$s created %1$s" : "%2$s kreis %1$s",
     "%1$s was created in a public folder" : "%1$s kreiĝis en publika dosierujo",
@@ -67,15 +71,10 @@
     "Settings" : "Agordo",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Uzu ĉi tiun adreson por <a href=\"%s\" target=\"_blank\">aliri viajn Dosierojn per WebDAV</a>",
-    "New" : "Nova",
-    "New text file" : "Nova tekstodosiero",
-    "Text file" : "Tekstodosiero",
-    "New folder" : "Nova dosierujo",
-    "Folder" : "Dosierujo",
-    "Upload" : "Alŝuti",
     "Cancel upload" : "Nuligi alŝuton",
     "No files in here" : "Neniu dosiero estas ĉi tie",
     "Select all" : "Elekti ĉion",
+    "Delete" : "Forigi",
     "Upload too large" : "Alŝuto tro larĝa",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
     "Files are being scanned, please wait." : "Dosieroj estas skanataj, bonvolu atendi."
diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
index c7409a25df..318a86e588 100644
--- a/apps/files/l10n/es.js
+++ b/apps/files/l10n/es.js
@@ -7,7 +7,7 @@ OC.L10N.register(
     "Could not move %s - File with this name already exists" : "No se pudo mover %s - Ya existe un archivo con ese nombre.",
     "Could not move %s" : "No se pudo mover %s",
     "Permission denied" : "Permiso denegado",
-    "The target folder has been moved or deleted." : "La carpeta destino fue movida o eliminada.",
+    "The target folder has been moved or deleted." : "La carpeta de destino fue movida o eliminada.",
     "The name %s is already used in the folder %s. Please choose a different name." : "El nombre %s ya está en uso por la carpeta %s. Por favor elija uno diferente.",
     "Error when creating the file" : "Error al crear el archivo",
     "Error when creating the folder" : "Error al crear la carpeta.",
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Todos los archivos",
     "Favorites" : "Favoritos",
     "Home" : "Particular",
+    "Close" : "Cerrar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}",
     "Upload cancelled." : "Subida cancelada.",
     "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear la carpeta",
-    "Rename" : "Renombrar",
-    "Delete" : "Eliminar",
-    "Disconnect storage" : "Desconectar almacenamiento",
-    "Unshare" : "Dejar de compartir",
-    "No permission to delete" : "Permisos insuficientes para borrar",
+    "Actions" : "Acciones",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
     "Pending" : "Pendiente",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Error al mover el archivo.",
     "Error moving file" : "Error moviendo archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear la carpeta",
     "Error deleting file." : "Error al borrar el archivo",
     "No entries in this folder match '{filter}'" : "No hay resultados que coincidan con '{filter}'",
     "Name" : "Nombre",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
     "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "No tiene permisos para subir o crear archivos aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "\"{name}\" is an invalid file name." : "\"{name}\" es un nombre de archivo inválido.",
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "El almacén de {owner} está repleto, ¡los archivos no se actualizarán ni sincronizarán más!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "El almacén de {owner} está casi lleno en un ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidencias '{filter}'","coincidencia '{filter}'"],
-    "{dirs} and {files}" : "{dirs} y {files}",
+    "Path" : "Ruta",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Agregado a Favoritos",
     "Favorite" : "Favorito",
+    "{newname} already exists" : "{new_name} ya existe",
+    "Upload" : "Subir",
+    "Text file" : "Archivo de texto",
+    "New text file.txt" : "Nuevo archivo de texto.txt",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Se ha <strong>creado</strong> un nuevo archivo o carpeta",
     "A file or folder has been <strong>changed</strong>" : "Se ha <strong>modificado</strong> un archivo o carpeta",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Administración de archivos",
     "Maximum upload size" : "Tamaño máximo de subida",
     "max. possible: " : "máx. posible:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Con PHP-FPM este valor se puede demorar hasta 5 minutos para tener efecto después de guardar.",
     "Save" : "Guardar",
     "Can not be edited from here due to insufficient permissions." : "No se puede editar desde aquí por permisos insuficientes.",
     "Settings" : "Ajustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use esta URL <a href=\"%s\" target=\"_blank\">para acceder via WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir",
     "Cancel upload" : "Cancelar la subida",
     "No files in here" : "Aquí no hay archivos",
     "Upload some content or sync with your devices!" : "Suba contenidos o sincronice sus dispositivos.",
     "No entries found in this folder" : "No hay entradas en esta carpeta",
     "Select all" : "Seleccionar todo",
+    "Delete" : "Eliminar",
     "Upload too large" : "Subida demasido grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que está intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
     "Files are being scanned, please wait." : "Los archivos se están escaneando, por favor espere.",
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
index fc7a12fdf0..26761bf207 100644
--- a/apps/files/l10n/es.json
+++ b/apps/files/l10n/es.json
@@ -5,7 +5,7 @@
     "Could not move %s - File with this name already exists" : "No se pudo mover %s - Ya existe un archivo con ese nombre.",
     "Could not move %s" : "No se pudo mover %s",
     "Permission denied" : "Permiso denegado",
-    "The target folder has been moved or deleted." : "La carpeta destino fue movida o eliminada.",
+    "The target folder has been moved or deleted." : "La carpeta de destino fue movida o eliminada.",
     "The name %s is already used in the folder %s. Please choose a different name." : "El nombre %s ya está en uso por la carpeta %s. Por favor elija uno diferente.",
     "Error when creating the file" : "Error al crear el archivo",
     "Error when creating the folder" : "Error al crear la carpeta.",
@@ -27,20 +27,14 @@
     "All files" : "Todos los archivos",
     "Favorites" : "Favoritos",
     "Home" : "Particular",
+    "Close" : "Cerrar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}",
     "Upload cancelled." : "Subida cancelada.",
     "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear la carpeta",
-    "Rename" : "Renombrar",
-    "Delete" : "Eliminar",
-    "Disconnect storage" : "Desconectar almacenamiento",
-    "Unshare" : "Dejar de compartir",
-    "No permission to delete" : "Permisos insuficientes para borrar",
+    "Actions" : "Acciones",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
     "Pending" : "Pendiente",
@@ -50,7 +44,10 @@
     "Error moving file." : "Error al mover el archivo.",
     "Error moving file" : "Error moviendo archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear la carpeta",
     "Error deleting file." : "Error al borrar el archivo",
     "No entries in this folder match '{filter}'" : "No hay resultados que coincidan con '{filter}'",
     "Name" : "Nombre",
@@ -58,8 +55,10 @@
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
     "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "No tiene permisos para subir o crear archivos aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "\"{name}\" is an invalid file name." : "\"{name}\" es un nombre de archivo inválido.",
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "El almacén de {owner} está repleto, ¡los archivos no se actualizarán ni sincronizarán más!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "El almacén de {owner} está casi lleno en un ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidencias '{filter}'","coincidencia '{filter}'"],
-    "{dirs} and {files}" : "{dirs} y {files}",
+    "Path" : "Ruta",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Agregado a Favoritos",
     "Favorite" : "Favorito",
+    "{newname} already exists" : "{new_name} ya existe",
+    "Upload" : "Subir",
+    "Text file" : "Archivo de texto",
+    "New text file.txt" : "Nuevo archivo de texto.txt",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "An error occurred while trying to update the tags" : "Se produjo un error al tratar de actualizar las etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Se ha <strong>creado</strong> un nuevo archivo o carpeta",
     "A file or folder has been <strong>changed</strong>" : "Se ha <strong>modificado</strong> un archivo o carpeta",
@@ -91,22 +97,18 @@
     "File handling" : "Administración de archivos",
     "Maximum upload size" : "Tamaño máximo de subida",
     "max. possible: " : "máx. posible:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Con PHP-FPM este valor se puede demorar hasta 5 minutos para tener efecto después de guardar.",
     "Save" : "Guardar",
     "Can not be edited from here due to insufficient permissions." : "No se puede editar desde aquí por permisos insuficientes.",
     "Settings" : "Ajustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use esta URL <a href=\"%s\" target=\"_blank\">para acceder via WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir",
     "Cancel upload" : "Cancelar la subida",
     "No files in here" : "Aquí no hay archivos",
     "Upload some content or sync with your devices!" : "Suba contenidos o sincronice sus dispositivos.",
     "No entries found in this folder" : "No hay entradas en esta carpeta",
     "Select all" : "Seleccionar todo",
+    "Delete" : "Eliminar",
     "Upload too large" : "Subida demasido grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que está intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
     "Files are being scanned, please wait." : "Los archivos se están escaneando, por favor espere.",
diff --git a/apps/files/l10n/es_AR.js b/apps/files/l10n/es_AR.js
index f4d74e553a..f99464401b 100644
--- a/apps/files/l10n/es_AR.js
+++ b/apps/files/l10n/es_AR.js
@@ -24,35 +24,39 @@ OC.L10N.register(
     "Files" : "Archivos",
     "Favorites" : "Favoritos",
     "Home" : "Particular",
+    "Close" : "Cerrar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes.",
     "Upload cancelled." : "La subida fue cancelada",
     "Could not get result from server." : "No se pudo obtener resultados del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear el directorio",
-    "Rename" : "Cambiar nombre",
-    "Delete" : "Borrar",
-    "Unshare" : "Dejar de compartir",
+    "Actions" : "Acciones",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
     "Pending" : "Pendientes",
     "Error moving file" : "Error moviendo el archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear el directorio",
     "Error deleting file." : "Error al borrar el archivo.",
     "Name" : "Nombre",
     "Size" : "Tamaño",
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
     "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "{dirs} and {files}" : "{carpetas} y {archivos}",
     "You don’t have permission to upload or create files here" : "No tienes permisos para subir o crear archivos aquí",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "File name cannot be empty." : "El nombre del archivo no puede quedar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
     "Your storage is almost full ({usedSpacePercent}%)" : "El almacenamiento está casi lleno ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{carpetas} y {archivos}",
     "Favorite" : "Favorito",
+    "Upload" : "Subir",
+    "Text file" : "Archivo de texto",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva Carpeta",
     "A new file or folder has been <strong>created</strong>" : "Un archivo o carpeta ha sido <strong>creado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>modificado</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
@@ -70,13 +74,8 @@ OC.L10N.register(
     "Settings" : "Configuración",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva Carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir",
     "Cancel upload" : "Cancelar subida",
+    "Delete" : "Borrar",
     "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que intentás subir sobrepasan el tamaño máximo ",
     "Files are being scanned, please wait." : "Se están escaneando los archivos, por favor esperá."
diff --git a/apps/files/l10n/es_AR.json b/apps/files/l10n/es_AR.json
index 376f24e363..43dc9d35c3 100644
--- a/apps/files/l10n/es_AR.json
+++ b/apps/files/l10n/es_AR.json
@@ -22,35 +22,39 @@
     "Files" : "Archivos",
     "Favorites" : "Favoritos",
     "Home" : "Particular",
+    "Close" : "Cerrar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes.",
     "Upload cancelled." : "La subida fue cancelada",
     "Could not get result from server." : "No se pudo obtener resultados del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear el directorio",
-    "Rename" : "Cambiar nombre",
-    "Delete" : "Borrar",
-    "Unshare" : "Dejar de compartir",
+    "Actions" : "Acciones",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
     "Pending" : "Pendientes",
     "Error moving file" : "Error moviendo el archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear el directorio",
     "Error deleting file." : "Error al borrar el archivo.",
     "Name" : "Nombre",
     "Size" : "Tamaño",
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
     "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "{dirs} and {files}" : "{carpetas} y {archivos}",
     "You don’t have permission to upload or create files here" : "No tienes permisos para subir o crear archivos aquí",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "File name cannot be empty." : "El nombre del archivo no puede quedar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
     "Your storage is almost full ({usedSpacePercent}%)" : "El almacenamiento está casi lleno ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{carpetas} y {archivos}",
     "Favorite" : "Favorito",
+    "Upload" : "Subir",
+    "Text file" : "Archivo de texto",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva Carpeta",
     "A new file or folder has been <strong>created</strong>" : "Un archivo o carpeta ha sido <strong>creado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>modificado</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
@@ -68,13 +72,8 @@
     "Settings" : "Configuración",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva Carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir",
     "Cancel upload" : "Cancelar subida",
+    "Delete" : "Borrar",
     "Upload too large" : "El tamaño del archivo que querés subir es demasiado grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que intentás subir sobrepasan el tamaño máximo ",
     "Files are being scanned, please wait." : "Se están escaneando los archivos, por favor esperá."
diff --git a/apps/files/l10n/es_BO.js b/apps/files/l10n/es_BO.js
deleted file mode 100644
index 7988332fa9..0000000000
--- a/apps/files/l10n/es_BO.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_BO.json b/apps/files/l10n/es_BO.json
deleted file mode 100644
index ef5fc58675..0000000000
--- a/apps/files/l10n/es_BO.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_CL.js b/apps/files/l10n/es_CL.js
index 3e02d171fb..c6269cdafd 100644
--- a/apps/files/l10n/es_CL.js
+++ b/apps/files/l10n/es_CL.js
@@ -3,9 +3,10 @@ OC.L10N.register(
     {
     "Unknown error" : "Error desconocido",
     "Files" : "Archivos",
-    "Rename" : "Renombrar",
     "Download" : "Descargar",
     "Error" : "Error",
+    "Upload" : "Subir",
+    "New folder" : "Nuevo directorio",
     "A new file or folder has been <strong>created</strong>" : "Un nuevo archivo o carpeta ha sido <strong>creado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>cambiado</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
@@ -16,8 +17,6 @@ OC.L10N.register(
     "You deleted %1$s" : "Ha borrado %1$s",
     "%2$s deleted %1$s" : "%2$s borró %1$s",
     "Settings" : "Configuración",
-    "New folder" : "Nuevo directorio",
-    "Upload" : "Subir",
     "Cancel upload" : "cancelar subida"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_CL.json b/apps/files/l10n/es_CL.json
index cdfafbf278..75215c9cb7 100644
--- a/apps/files/l10n/es_CL.json
+++ b/apps/files/l10n/es_CL.json
@@ -1,9 +1,10 @@
 { "translations": {
     "Unknown error" : "Error desconocido",
     "Files" : "Archivos",
-    "Rename" : "Renombrar",
     "Download" : "Descargar",
     "Error" : "Error",
+    "Upload" : "Subir",
+    "New folder" : "Nuevo directorio",
     "A new file or folder has been <strong>created</strong>" : "Un nuevo archivo o carpeta ha sido <strong>creado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>cambiado</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
@@ -14,8 +15,6 @@
     "You deleted %1$s" : "Ha borrado %1$s",
     "%2$s deleted %1$s" : "%2$s borró %1$s",
     "Settings" : "Configuración",
-    "New folder" : "Nuevo directorio",
-    "Upload" : "Subir",
     "Cancel upload" : "cancelar subida"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/es_CO.js b/apps/files/l10n/es_CO.js
deleted file mode 100644
index 7988332fa9..0000000000
--- a/apps/files/l10n/es_CO.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_CO.json b/apps/files/l10n/es_CO.json
deleted file mode 100644
index ef5fc58675..0000000000
--- a/apps/files/l10n/es_CO.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_CR.js b/apps/files/l10n/es_CR.js
deleted file mode 100644
index db0f96010e..0000000000
--- a/apps/files/l10n/es_CR.js
+++ /dev/null
@@ -1,19 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Files" : "Archivos",
-    "A new file or folder has been <strong>created</strong>" : "Un nuevo archivo o carpeta ha sido <strong>creado</strong>",
-    "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>cambiado</strong>",
-    "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
-    "A file or folder has been <strong>restored</strong>" : "Un archivo o carpeta ha sido <strong>restaurado</strong>",
-    "You created %1$s" : "Usted creó %1$s",
-    "%2$s created %1$s" : "%2$s creó %1$s",
-    "%1$s was created in a public folder" : "%1$s fue creado en un folder público",
-    "You changed %1$s" : "Usted cambió %1$s",
-    "%2$s changed %1$s" : "%2$s cambió %1$s",
-    "You deleted %1$s" : "Usted eliminó %1$s",
-    "%2$s deleted %1$s" : "%2$s eliminó %1$s",
-    "You restored %1$s" : "Usted restauró %1$s",
-    "%2$s restored %1$s" : "%2$s restauró %1$s"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_CR.json b/apps/files/l10n/es_CR.json
deleted file mode 100644
index 506baf10fb..0000000000
--- a/apps/files/l10n/es_CR.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{ "translations": {
-    "Files" : "Archivos",
-    "A new file or folder has been <strong>created</strong>" : "Un nuevo archivo o carpeta ha sido <strong>creado</strong>",
-    "A file or folder has been <strong>changed</strong>" : "Un archivo o carpeta ha sido <strong>cambiado</strong>",
-    "A file or folder has been <strong>deleted</strong>" : "Un archivo o carpeta ha sido <strong>eliminado</strong>",
-    "A file or folder has been <strong>restored</strong>" : "Un archivo o carpeta ha sido <strong>restaurado</strong>",
-    "You created %1$s" : "Usted creó %1$s",
-    "%2$s created %1$s" : "%2$s creó %1$s",
-    "%1$s was created in a public folder" : "%1$s fue creado en un folder público",
-    "You changed %1$s" : "Usted cambió %1$s",
-    "%2$s changed %1$s" : "%2$s cambió %1$s",
-    "You deleted %1$s" : "Usted eliminó %1$s",
-    "%2$s deleted %1$s" : "%2$s eliminó %1$s",
-    "You restored %1$s" : "Usted restauró %1$s",
-    "%2$s restored %1$s" : "%2$s restauró %1$s"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_EC.js b/apps/files/l10n/es_EC.js
deleted file mode 100644
index 7988332fa9..0000000000
--- a/apps/files/l10n/es_EC.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_EC.json b/apps/files/l10n/es_EC.json
deleted file mode 100644
index ef5fc58675..0000000000
--- a/apps/files/l10n/es_EC.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js
index c621aa3329..b58037005a 100644
--- a/apps/files/l10n/es_MX.js
+++ b/apps/files/l10n/es_MX.js
@@ -24,34 +24,38 @@ OC.L10N.register(
     "Files" : "Archivos",
     "Favorites" : "Favoritos",
     "Home" : "Particular",
+    "Close" : "Cerrar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
     "Upload cancelled." : "Subida cancelada.",
     "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear la carpeta",
-    "Rename" : "Renombrar",
-    "Delete" : "Eliminar",
-    "Unshare" : "Dejar de compartir",
+    "Actions" : "Acciones",
     "Download" : "Descargar",
     "Pending" : "Pendiente",
     "Error moving file" : "Error moviendo archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear la carpeta",
     "Error deleting file." : "Error borrando el archivo.",
     "Name" : "Nombre",
     "Size" : "Tamaño",
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
     "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "No tienes permisos para subir o crear archivos aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} y {files}",
     "Favorite" : "Favorito",
+    "Upload" : "Subir archivo",
+    "Text file" : "Archivo de texto",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "%s could not be renamed" : "%s no pudo ser renombrado",
     "File handling" : "Administración de archivos",
     "Maximum upload size" : "Tamaño máximo de subida",
@@ -60,13 +64,8 @@ OC.L10N.register(
     "Settings" : "Ajustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir archivo",
     "Cancel upload" : "Cancelar subida",
+    "Delete" : "Eliminar",
     "Upload too large" : "Subida demasido grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
     "Files are being scanned, please wait." : "Los archivos están siendo escaneados,  por favor espere."
diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json
index ae5c152af2..5655fd4bf0 100644
--- a/apps/files/l10n/es_MX.json
+++ b/apps/files/l10n/es_MX.json
@@ -22,34 +22,38 @@
     "Files" : "Archivos",
     "Favorites" : "Favoritos",
     "Home" : "Particular",
+    "Close" : "Cerrar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
     "Upload cancelled." : "Subida cancelada.",
     "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
-    "{new_name} already exists" : "{new_name} ya existe",
-    "Could not create file" : "No se pudo crear el archivo",
-    "Could not create folder" : "No se pudo crear la carpeta",
-    "Rename" : "Renombrar",
-    "Delete" : "Eliminar",
-    "Unshare" : "Dejar de compartir",
+    "Actions" : "Acciones",
     "Download" : "Descargar",
     "Pending" : "Pendiente",
     "Error moving file" : "Error moviendo archivo",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} ya existe",
     "Could not rename file" : "No se pudo renombrar el archivo",
+    "Could not create file" : "No se pudo crear el archivo",
+    "Could not create folder" : "No se pudo crear la carpeta",
     "Error deleting file." : "Error borrando el archivo.",
     "Name" : "Nombre",
     "Size" : "Tamaño",
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
     "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "{dirs} and {files}" : "{dirs} y {files}",
     "You don’t have permission to upload or create files here" : "No tienes permisos para subir o crear archivos aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Subiendo %n archivo","Subiendo %n archivos"],
+    "New" : "Nuevo",
     "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
     "Your storage is full, files can not be updated or synced anymore!" : "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} y {files}",
     "Favorite" : "Favorito",
+    "Upload" : "Subir archivo",
+    "Text file" : "Archivo de texto",
+    "Folder" : "Carpeta",
+    "New folder" : "Nueva carpeta",
     "%s could not be renamed" : "%s no pudo ser renombrado",
     "File handling" : "Administración de archivos",
     "Maximum upload size" : "Tamaño máximo de subida",
@@ -58,13 +62,8 @@
     "Settings" : "Ajustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
-    "New" : "Nuevo",
-    "New text file" : "Nuevo archivo de texto",
-    "Text file" : "Archivo de texto",
-    "New folder" : "Nueva carpeta",
-    "Folder" : "Carpeta",
-    "Upload" : "Subir archivo",
     "Cancel upload" : "Cancelar subida",
+    "Delete" : "Eliminar",
     "Upload too large" : "Subida demasido grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
     "Files are being scanned, please wait." : "Los archivos están siendo escaneados,  por favor espere."
diff --git a/apps/files/l10n/es_PE.js b/apps/files/l10n/es_PE.js
deleted file mode 100644
index 7988332fa9..0000000000
--- a/apps/files/l10n/es_PE.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_PE.json b/apps/files/l10n/es_PE.json
deleted file mode 100644
index ef5fc58675..0000000000
--- a/apps/files/l10n/es_PE.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_PY.js b/apps/files/l10n/es_PY.js
deleted file mode 100644
index 2cfff7608e..0000000000
--- a/apps/files/l10n/es_PY.js
+++ /dev/null
@@ -1,19 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Files" : "Archivos",
-    "A new file or folder has been <strong>created</strong>" : "Ha sido <strong>creado</strong> un nuevo archivo o carpeta",
-    "A file or folder has been <strong>changed</strong>" : "Ha sido <strong>modificado</strong> un archivo o carpeta",
-    "A file or folder has been <strong>deleted</strong>" : "Ha sido <strong>eliminado</strong> un archivo o carpeta",
-    "A file or folder has been <strong>restored</strong>" : "Se ha <strong>recuperado</strong> un archivo o carpeta",
-    "You created %1$s" : "Ha creado %1$s",
-    "%2$s created %1$s" : "%2$s ha creado %1$s",
-    "%1$s was created in a public folder" : "%1$s ha sido creado en una carpeta pública",
-    "You changed %1$s" : "Ha modificado %1$s",
-    "%2$s changed %1$s" : "%2$s ha modificado %1$s",
-    "You deleted %1$s" : "Usted ha eliminado %1$s",
-    "%2$s deleted %1$s" : "%2$s ha eliminado %1$s",
-    "You restored %1$s" : "Ha recuperado %1$s",
-    "%2$s restored %1$s" : "%2$s ha recuperado %1$s"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_PY.json b/apps/files/l10n/es_PY.json
deleted file mode 100644
index 3739279469..0000000000
--- a/apps/files/l10n/es_PY.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{ "translations": {
-    "Files" : "Archivos",
-    "A new file or folder has been <strong>created</strong>" : "Ha sido <strong>creado</strong> un nuevo archivo o carpeta",
-    "A file or folder has been <strong>changed</strong>" : "Ha sido <strong>modificado</strong> un archivo o carpeta",
-    "A file or folder has been <strong>deleted</strong>" : "Ha sido <strong>eliminado</strong> un archivo o carpeta",
-    "A file or folder has been <strong>restored</strong>" : "Se ha <strong>recuperado</strong> un archivo o carpeta",
-    "You created %1$s" : "Ha creado %1$s",
-    "%2$s created %1$s" : "%2$s ha creado %1$s",
-    "%1$s was created in a public folder" : "%1$s ha sido creado en una carpeta pública",
-    "You changed %1$s" : "Ha modificado %1$s",
-    "%2$s changed %1$s" : "%2$s ha modificado %1$s",
-    "You deleted %1$s" : "Usted ha eliminado %1$s",
-    "%2$s deleted %1$s" : "%2$s ha eliminado %1$s",
-    "You restored %1$s" : "Ha recuperado %1$s",
-    "%2$s restored %1$s" : "%2$s ha recuperado %1$s"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_US.js b/apps/files/l10n/es_US.js
deleted file mode 100644
index 7988332fa9..0000000000
--- a/apps/files/l10n/es_US.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_US.json b/apps/files/l10n/es_US.json
deleted file mode 100644
index ef5fc58675..0000000000
--- a/apps/files/l10n/es_US.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/es_UY.js b/apps/files/l10n/es_UY.js
deleted file mode 100644
index 7988332fa9..0000000000
--- a/apps/files/l10n/es_UY.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_UY.json b/apps/files/l10n/es_UY.json
deleted file mode 100644
index ef5fc58675..0000000000
--- a/apps/files/l10n/es_UY.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/et_EE.js b/apps/files/l10n/et_EE.js
index bf9e8574c2..173c6d5503 100644
--- a/apps/files/l10n/et_EE.js
+++ b/apps/files/l10n/et_EE.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Kõik failid",
     "Favorites" : "Lemmikud",
     "Home" : "Kodu",
+    "Close" : "Sulge",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti",
     "Total file size {size1} exceeds upload limit {size2}" : "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.",
     "Upload cancelled." : "Üleslaadimine tühistati.",
     "Could not get result from server." : "Serverist ei saadud tulemusi",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
-    "{new_name} already exists" : "{new_name} on juba olemas",
-    "Could not create file" : "Ei suuda luua faili",
-    "Could not create folder" : "Ei suuda luua kataloogi",
-    "Rename" : "Nimeta ümber",
-    "Delete" : "Kustuta",
-    "Disconnect storage" : "Ühenda andmehoidla lahti.",
-    "Unshare" : "Lõpeta jagamine",
-    "No permission to delete" : "Kustutamiseks pole õigusi",
+    "Actions" : "Tegevused",
     "Download" : "Lae alla",
     "Select" : "Vali",
     "Pending" : "Ootel",
@@ -52,23 +46,35 @@ OC.L10N.register(
     "Error moving file." : "Viga faili liigutamisel.",
     "Error moving file" : "Viga faili eemaldamisel",
     "Error" : "Viga",
+    "{new_name} already exists" : "{new_name} on juba olemas",
     "Could not rename file" : "Ei suuda faili ümber nimetada",
+    "Could not create file" : "Ei suuda luua faili",
+    "Could not create folder" : "Ei suuda luua kataloogi",
     "Error deleting file." : "Viga faili kustutamisel.",
+    "No entries in this folder match '{filter}'" : "Ükski sissekanne ei kattu filtriga '{filter}'",
     "Name" : "Nimi",
     "Size" : "Suurus",
     "Modified" : "Muudetud",
     "_%n folder_::_%n folders_" : ["%n kataloog","%n kataloogi"],
     "_%n file_::_%n files_" : ["%n fail","%n faili"],
+    "{dirs} and {files}" : "{dirs} ja {files}",
     "You don’t have permission to upload or create files here" : "Sul puuduvad õigused siia failide üleslaadimiseks või tekitamiseks",
     "_Uploading %n file_::_Uploading %n files_" : ["Laadin üles %n faili","Laadin üles %n faili"],
+    "New" : "Uus",
     "\"{name}\" is an invalid file name." : "\"{name}\" on vigane failinimi.",
     "File name cannot be empty." : "Faili nimi ei saa olla tühi.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
     "Your storage is full, files can not be updated or synced anymore!" : "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Sinu {owner} andmemaht on peaaegu täis ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} ja {files}",
+    "Path" : "Asukoht",
+    "_%n byte_::_%n bytes_" : ["%n bait","%n baiti"],
     "Favorited" : "Lemmikud",
     "Favorite" : "Lemmik",
+    "Upload" : "Lae üles",
+    "Text file" : "Tekstifail",
+    "Folder" : "Kaust",
+    "New folder" : "Uus kaust",
     "An error occurred while trying to update the tags" : "Siltide uuendamisel tekkis tõrge",
     "A new file or folder has been <strong>created</strong>" : "Uus fail või kataloog on <strong>loodud</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fail või kataloog on <strong>muudetud</strong>",
@@ -89,22 +95,18 @@ OC.L10N.register(
     "File handling" : "Failide käsitlemine",
     "Maximum upload size" : "Maksimaalne üleslaadimise suurus",
     "max. possible: " : "maks. võimalik: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM-ga võib see väärtuse mõju rakendamine võtta aega kuni 5 minutit pärast salvestamist.",
     "Save" : "Salvesta",
     "Can not be edited from here due to insufficient permissions." : "Ei saa õiguste puudumise tõttu muuta.",
     "Settings" : "Seaded",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
-    "New" : "Uus",
-    "New text file" : "Uus tekstifail",
-    "Text file" : "Tekstifail",
-    "New folder" : "Uus kaust",
-    "Folder" : "Kaust",
-    "Upload" : "Lae üles",
     "Cancel upload" : "Tühista üleslaadimine",
     "No files in here" : "Siin ei ole faile",
     "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!",
-    "No entries found in this folder" : "Selles kaustas ei leitud kirjeid",
+    "No entries found in this folder" : "Selles kaustast ei leitud kirjeid",
     "Select all" : "Vali kõik",
+    "Delete" : "Kustuta",
     "Upload too large" : "Üleslaadimine on liiga suur",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
     "Files are being scanned, please wait." : "Faile skannitakse, palun oota.",
diff --git a/apps/files/l10n/et_EE.json b/apps/files/l10n/et_EE.json
index 40fa7efca6..d880d3d472 100644
--- a/apps/files/l10n/et_EE.json
+++ b/apps/files/l10n/et_EE.json
@@ -27,20 +27,14 @@
     "All files" : "Kõik failid",
     "Favorites" : "Lemmikud",
     "Home" : "Kodu",
+    "Close" : "Sulge",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti",
     "Total file size {size1} exceeds upload limit {size2}" : "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.",
     "Upload cancelled." : "Üleslaadimine tühistati.",
     "Could not get result from server." : "Serverist ei saadud tulemusi",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
-    "{new_name} already exists" : "{new_name} on juba olemas",
-    "Could not create file" : "Ei suuda luua faili",
-    "Could not create folder" : "Ei suuda luua kataloogi",
-    "Rename" : "Nimeta ümber",
-    "Delete" : "Kustuta",
-    "Disconnect storage" : "Ühenda andmehoidla lahti.",
-    "Unshare" : "Lõpeta jagamine",
-    "No permission to delete" : "Kustutamiseks pole õigusi",
+    "Actions" : "Tegevused",
     "Download" : "Lae alla",
     "Select" : "Vali",
     "Pending" : "Ootel",
@@ -50,23 +44,35 @@
     "Error moving file." : "Viga faili liigutamisel.",
     "Error moving file" : "Viga faili eemaldamisel",
     "Error" : "Viga",
+    "{new_name} already exists" : "{new_name} on juba olemas",
     "Could not rename file" : "Ei suuda faili ümber nimetada",
+    "Could not create file" : "Ei suuda luua faili",
+    "Could not create folder" : "Ei suuda luua kataloogi",
     "Error deleting file." : "Viga faili kustutamisel.",
+    "No entries in this folder match '{filter}'" : "Ükski sissekanne ei kattu filtriga '{filter}'",
     "Name" : "Nimi",
     "Size" : "Suurus",
     "Modified" : "Muudetud",
     "_%n folder_::_%n folders_" : ["%n kataloog","%n kataloogi"],
     "_%n file_::_%n files_" : ["%n fail","%n faili"],
+    "{dirs} and {files}" : "{dirs} ja {files}",
     "You don’t have permission to upload or create files here" : "Sul puuduvad õigused siia failide üleslaadimiseks või tekitamiseks",
     "_Uploading %n file_::_Uploading %n files_" : ["Laadin üles %n faili","Laadin üles %n faili"],
+    "New" : "Uus",
     "\"{name}\" is an invalid file name." : "\"{name}\" on vigane failinimi.",
     "File name cannot be empty." : "Faili nimi ei saa olla tühi.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
     "Your storage is full, files can not be updated or synced anymore!" : "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Sinu {owner} andmemaht on peaaegu täis ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} ja {files}",
+    "Path" : "Asukoht",
+    "_%n byte_::_%n bytes_" : ["%n bait","%n baiti"],
     "Favorited" : "Lemmikud",
     "Favorite" : "Lemmik",
+    "Upload" : "Lae üles",
+    "Text file" : "Tekstifail",
+    "Folder" : "Kaust",
+    "New folder" : "Uus kaust",
     "An error occurred while trying to update the tags" : "Siltide uuendamisel tekkis tõrge",
     "A new file or folder has been <strong>created</strong>" : "Uus fail või kataloog on <strong>loodud</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fail või kataloog on <strong>muudetud</strong>",
@@ -87,22 +93,18 @@
     "File handling" : "Failide käsitlemine",
     "Maximum upload size" : "Maksimaalne üleslaadimise suurus",
     "max. possible: " : "maks. võimalik: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM-ga võib see väärtuse mõju rakendamine võtta aega kuni 5 minutit pärast salvestamist.",
     "Save" : "Salvesta",
     "Can not be edited from here due to insufficient permissions." : "Ei saa õiguste puudumise tõttu muuta.",
     "Settings" : "Seaded",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
-    "New" : "Uus",
-    "New text file" : "Uus tekstifail",
-    "Text file" : "Tekstifail",
-    "New folder" : "Uus kaust",
-    "Folder" : "Kaust",
-    "Upload" : "Lae üles",
     "Cancel upload" : "Tühista üleslaadimine",
     "No files in here" : "Siin ei ole faile",
     "Upload some content or sync with your devices!" : "Laadi sisu üles või süngi oma seadmetega!",
-    "No entries found in this folder" : "Selles kaustas ei leitud kirjeid",
+    "No entries found in this folder" : "Selles kaustast ei leitud kirjeid",
     "Select all" : "Vali kõik",
+    "Delete" : "Kustuta",
     "Upload too large" : "Üleslaadimine on liiga suur",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
     "Files are being scanned, please wait." : "Faile skannitakse, palun oota.",
diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js
index f54385bd3c..249e73b187 100644
--- a/apps/files/l10n/eu.js
+++ b/apps/files/l10n/eu.js
@@ -29,19 +29,14 @@ OC.L10N.register(
     "All files" : "Fitxategi guztiak",
     "Favorites" : "Gogokoak",
     "Home" : "Etxekoa",
+    "Close" : "Itxi",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako",
     "Total file size {size1} exceeds upload limit {size2}" : "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago",
     "Upload cancelled." : "Igoera ezeztatuta",
     "Could not get result from server." : "Ezin da zerbitzaritik emaitzik lortu",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
-    "{new_name} already exists" : "{new_name} dagoeneko existitzen da",
-    "Could not create file" : "Ezin izan da fitxategia sortu",
-    "Could not create folder" : "Ezin izan da karpeta sortu",
-    "Rename" : "Berrizendatu",
-    "Delete" : "Ezabatu",
-    "Disconnect storage" : "Deskonektatu biltegia",
-    "Unshare" : "Ez elkarbanatu",
+    "Actions" : "Ekintzak",
     "Download" : "Deskargatu",
     "Select" : "hautatu",
     "Pending" : "Zain",
@@ -49,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Errorea fitxategia mugitzean.",
     "Error moving file" : "Errorea fitxategia mugitzean",
     "Error" : "Errorea",
+    "{new_name} already exists" : "{new_name} dagoeneko existitzen da",
     "Could not rename file" : "Ezin izan da fitxategia berrizendatu",
+    "Could not create file" : "Ezin izan da fitxategia sortu",
+    "Could not create folder" : "Ezin izan da karpeta sortu",
     "Error deleting file." : "Errorea fitxategia ezabatzerakoan.",
     "No entries in this folder match '{filter}'" : "Karpeta honetan ez dago sarrerarik '{filter}' iragazkiarekin bat egiten dutenak",
     "Name" : "Izena",
@@ -57,15 +55,20 @@ OC.L10N.register(
     "Modified" : "Aldatuta",
     "_%n folder_::_%n folders_" : ["karpeta %n","%n karpeta"],
     "_%n file_::_%n files_" : ["fitxategi %n","%n fitxategi"],
+    "{dirs} and {files}" : "{dirs} eta {files}",
     "You don’t have permission to upload or create files here" : "Ez duzu fitxategiak hona igotzeko edo hemen sortzeko baimenik",
     "_Uploading %n file_::_Uploading %n files_" : ["Fitxategi %n igotzen","%n fitxategi igotzen"],
+    "New" : "Berria",
     "\"{name}\" is an invalid file name." : "\"{name}\" ez da fitxategi izen baliogarria.",
     "File name cannot be empty." : "Fitxategi izena ezin da hutsa izan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
-    "{dirs} and {files}" : "{dirs} eta {files}",
     "Favorited" : "Gogokoa",
     "Favorite" : "Gogokoa",
+    "Upload" : "Igo",
+    "Text file" : "Testu fitxategia",
+    "Folder" : "Karpeta",
+    "New folder" : "Karpeta berria",
     "A new file or folder has been <strong>created</strong>" : "Fitxategi edo karpeta berri bat <strong>sortu da</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fitxategi edo karpeta bat <strong>aldatu da</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Fitxategi edo karpeta bat <strong>ezabatu da</strong>",
@@ -89,16 +92,11 @@ OC.L10N.register(
     "Settings" : "Ezarpenak",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
-    "New" : "Berria",
-    "New text file" : "Testu fitxategi berria",
-    "Text file" : "Testu fitxategia",
-    "New folder" : "Karpeta berria",
-    "Folder" : "Karpeta",
-    "Upload" : "Igo",
     "Cancel upload" : "Ezeztatu igoera",
     "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
     "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
     "Select all" : "Hautatu dena",
+    "Delete" : "Ezabatu",
     "Upload too large" : "Igoera handiegia da",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
     "Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json
index 5eb3ede3e1..5e610f3f4f 100644
--- a/apps/files/l10n/eu.json
+++ b/apps/files/l10n/eu.json
@@ -27,19 +27,14 @@
     "All files" : "Fitxategi guztiak",
     "Favorites" : "Gogokoak",
     "Home" : "Etxekoa",
+    "Close" : "Itxi",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako",
     "Total file size {size1} exceeds upload limit {size2}" : "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago",
     "Upload cancelled." : "Igoera ezeztatuta",
     "Could not get result from server." : "Ezin da zerbitzaritik emaitzik lortu",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
-    "{new_name} already exists" : "{new_name} dagoeneko existitzen da",
-    "Could not create file" : "Ezin izan da fitxategia sortu",
-    "Could not create folder" : "Ezin izan da karpeta sortu",
-    "Rename" : "Berrizendatu",
-    "Delete" : "Ezabatu",
-    "Disconnect storage" : "Deskonektatu biltegia",
-    "Unshare" : "Ez elkarbanatu",
+    "Actions" : "Ekintzak",
     "Download" : "Deskargatu",
     "Select" : "hautatu",
     "Pending" : "Zain",
@@ -47,7 +42,10 @@
     "Error moving file." : "Errorea fitxategia mugitzean.",
     "Error moving file" : "Errorea fitxategia mugitzean",
     "Error" : "Errorea",
+    "{new_name} already exists" : "{new_name} dagoeneko existitzen da",
     "Could not rename file" : "Ezin izan da fitxategia berrizendatu",
+    "Could not create file" : "Ezin izan da fitxategia sortu",
+    "Could not create folder" : "Ezin izan da karpeta sortu",
     "Error deleting file." : "Errorea fitxategia ezabatzerakoan.",
     "No entries in this folder match '{filter}'" : "Karpeta honetan ez dago sarrerarik '{filter}' iragazkiarekin bat egiten dutenak",
     "Name" : "Izena",
@@ -55,15 +53,20 @@
     "Modified" : "Aldatuta",
     "_%n folder_::_%n folders_" : ["karpeta %n","%n karpeta"],
     "_%n file_::_%n files_" : ["fitxategi %n","%n fitxategi"],
+    "{dirs} and {files}" : "{dirs} eta {files}",
     "You don’t have permission to upload or create files here" : "Ez duzu fitxategiak hona igotzeko edo hemen sortzeko baimenik",
     "_Uploading %n file_::_Uploading %n files_" : ["Fitxategi %n igotzen","%n fitxategi igotzen"],
+    "New" : "Berria",
     "\"{name}\" is an invalid file name." : "\"{name}\" ez da fitxategi izen baliogarria.",
     "File name cannot be empty." : "Fitxategi izena ezin da hutsa izan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
-    "{dirs} and {files}" : "{dirs} eta {files}",
     "Favorited" : "Gogokoa",
     "Favorite" : "Gogokoa",
+    "Upload" : "Igo",
+    "Text file" : "Testu fitxategia",
+    "Folder" : "Karpeta",
+    "New folder" : "Karpeta berria",
     "A new file or folder has been <strong>created</strong>" : "Fitxategi edo karpeta berri bat <strong>sortu da</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fitxategi edo karpeta bat <strong>aldatu da</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Fitxategi edo karpeta bat <strong>ezabatu da</strong>",
@@ -87,16 +90,11 @@
     "Settings" : "Ezarpenak",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
-    "New" : "Berria",
-    "New text file" : "Testu fitxategi berria",
-    "Text file" : "Testu fitxategia",
-    "New folder" : "Karpeta berria",
-    "Folder" : "Karpeta",
-    "Upload" : "Igo",
     "Cancel upload" : "Ezeztatu igoera",
     "Upload some content or sync with your devices!" : "Igo edukiren bat edo sinkronizatu zure gailuekin!",
     "No entries found in this folder" : "Ez da sarrerarik aurkitu karpeta honetan",
     "Select all" : "Hautatu dena",
+    "Delete" : "Ezabatu",
     "Upload too large" : "Igoera handiegia da",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
     "Files are being scanned, please wait." : "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
diff --git a/apps/files/l10n/eu_ES.js b/apps/files/l10n/eu_ES.js
deleted file mode 100644
index ed4c18dac7..0000000000
--- a/apps/files/l10n/eu_ES.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Delete" : "Ezabatu",
-    "Save" : "Gorde",
-    "Download" : "Deskargatu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/eu_ES.json b/apps/files/l10n/eu_ES.json
deleted file mode 100644
index 6e8c511d42..0000000000
--- a/apps/files/l10n/eu_ES.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Delete" : "Ezabatu",
-    "Save" : "Gorde",
-    "Download" : "Deskargatu"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/fa.js b/apps/files/l10n/fa.js
index c8fd2e4841..984c53c374 100644
--- a/apps/files/l10n/fa.js
+++ b/apps/files/l10n/fa.js
@@ -19,22 +19,26 @@ OC.L10N.register(
     "Files" : "پرونده‌ها",
     "Favorites" : "موارد محبوب",
     "Home" : "خانه",
+    "Close" : "بستن",
     "Upload cancelled." : "بار گذاری لغو شد",
     "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
-    "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
-    "Rename" : "تغییرنام",
-    "Delete" : "حذف",
-    "Unshare" : "لغو اشتراک",
+    "Actions" : "فعالیت ها",
     "Download" : "دانلود",
     "Pending" : "در انتظار",
     "Error" : "خطا",
+    "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
     "Name" : "نام",
     "Size" : "اندازه",
     "Modified" : "تاریخ",
     "_Uploading %n file_::_Uploading %n files_" : ["در حال بارگذاری %n فایل"],
+    "New" : "جدید",
     "File name cannot be empty." : "نام پرونده نمی تواند خالی باشد.",
     "Your storage is full, files can not be updated or synced anymore!" : "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
     "Your storage is almost full ({usedSpacePercent}%)" : "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
+    "Upload" : "بارگزاری",
+    "Text file" : "فایل متنی",
+    "Folder" : "پوشه",
+    "New folder" : "پوشه جدید",
     "A new file or folder has been <strong>created</strong>" : "فایل یا پوشه ای <strong>ایجاد</strong> شد",
     "A file or folder has been <strong>changed</strong>" : "فایل یا پوشه ای به <strong>تغییر</strong> یافت",
     "A file or folder has been <strong>deleted</strong>" : "فایل یا پوشه ای به <strong>حذف</strong> شد",
@@ -56,12 +60,8 @@ OC.L10N.register(
     "Settings" : "تنظیمات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
-    "New" : "جدید",
-    "Text file" : "فایل متنی",
-    "New folder" : "پوشه جدید",
-    "Folder" : "پوشه",
-    "Upload" : "بارگزاری",
     "Cancel upload" : "متوقف کردن بار گذاری",
+    "Delete" : "حذف",
     "Upload too large" : "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
     "Files are being scanned, please wait." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
diff --git a/apps/files/l10n/fa.json b/apps/files/l10n/fa.json
index df83e53eb4..361dbee1a1 100644
--- a/apps/files/l10n/fa.json
+++ b/apps/files/l10n/fa.json
@@ -17,22 +17,26 @@
     "Files" : "پرونده‌ها",
     "Favorites" : "موارد محبوب",
     "Home" : "خانه",
+    "Close" : "بستن",
     "Upload cancelled." : "بار گذاری لغو شد",
     "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
-    "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
-    "Rename" : "تغییرنام",
-    "Delete" : "حذف",
-    "Unshare" : "لغو اشتراک",
+    "Actions" : "فعالیت ها",
     "Download" : "دانلود",
     "Pending" : "در انتظار",
     "Error" : "خطا",
+    "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
     "Name" : "نام",
     "Size" : "اندازه",
     "Modified" : "تاریخ",
     "_Uploading %n file_::_Uploading %n files_" : ["در حال بارگذاری %n فایل"],
+    "New" : "جدید",
     "File name cannot be empty." : "نام پرونده نمی تواند خالی باشد.",
     "Your storage is full, files can not be updated or synced anymore!" : "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
     "Your storage is almost full ({usedSpacePercent}%)" : "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
+    "Upload" : "بارگزاری",
+    "Text file" : "فایل متنی",
+    "Folder" : "پوشه",
+    "New folder" : "پوشه جدید",
     "A new file or folder has been <strong>created</strong>" : "فایل یا پوشه ای <strong>ایجاد</strong> شد",
     "A file or folder has been <strong>changed</strong>" : "فایل یا پوشه ای به <strong>تغییر</strong> یافت",
     "A file or folder has been <strong>deleted</strong>" : "فایل یا پوشه ای به <strong>حذف</strong> شد",
@@ -54,12 +58,8 @@
     "Settings" : "تنظیمات",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
-    "New" : "جدید",
-    "Text file" : "فایل متنی",
-    "New folder" : "پوشه جدید",
-    "Folder" : "پوشه",
-    "Upload" : "بارگزاری",
     "Cancel upload" : "متوقف کردن بار گذاری",
+    "Delete" : "حذف",
     "Upload too large" : "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
     "Files are being scanned, please wait." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
diff --git a/apps/files/l10n/fi.js b/apps/files/l10n/fi.js
deleted file mode 100644
index 8733d6b179..0000000000
--- a/apps/files/l10n/fi.js
+++ /dev/null
@@ -1,14 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Rename" : "Nimeä uudelleen",
-    "Delete" : "Poista",
-    "Error" : "Virhe",
-    "Favorite" : "Suosikit",
-    "Save" : "Tallenna",
-    "Settings" : "Asetukset",
-    "New folder" : "Luo kansio",
-    "Folder" : "Kansio",
-    "Upload" : "Lähetä"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/fi.json b/apps/files/l10n/fi.json
deleted file mode 100644
index 4a78a83735..0000000000
--- a/apps/files/l10n/fi.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{ "translations": {
-    "Rename" : "Nimeä uudelleen",
-    "Delete" : "Poista",
-    "Error" : "Virhe",
-    "Favorite" : "Suosikit",
-    "Save" : "Tallenna",
-    "Settings" : "Asetukset",
-    "New folder" : "Luo kansio",
-    "Folder" : "Kansio",
-    "Upload" : "Lähetä"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js
index abeb0b26b2..c6615a6123 100644
--- a/apps/files/l10n/fi_FI.js
+++ b/apps/files/l10n/fi_FI.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Kaikki tiedostot",
     "Favorites" : "Suosikit",
     "Home" : "Koti",
+    "Close" : "Sulje",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua",
     "Total file size {size1} exceeds upload limit {size2}" : "Yhteiskoko {size1} ylittää lähetysrajan {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä",
     "Upload cancelled." : "Lähetys peruttu.",
     "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
-    "{new_name} already exists" : "{new_name} on jo olemassa",
-    "Could not create file" : "Tiedoston luominen epäonnistui",
-    "Could not create folder" : "Kansion luominen epäonnistui",
-    "Rename" : "Nimeä uudelleen",
-    "Delete" : "Poista",
-    "Disconnect storage" : "Katkaise yhteys tallennustilaan",
-    "Unshare" : "Peru jakaminen",
-    "No permission to delete" : "Ei oikeutta poistaa",
+    "Actions" : "Toiminnot",
     "Download" : "Lataa",
     "Select" : "Valitse",
     "Pending" : "Odottaa",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Virhe tiedostoa siirrettäessä.",
     "Error moving file" : "Virhe tiedostoa siirrettäessä",
     "Error" : "Virhe",
+    "{new_name} already exists" : "{new_name} on jo olemassa",
     "Could not rename file" : "Tiedoston nimeäminen uudelleen epäonnistui",
+    "Could not create file" : "Tiedoston luominen epäonnistui",
+    "Could not create folder" : "Kansion luominen epäonnistui",
     "Error deleting file." : "Virhe tiedostoa poistaessa.",
     "No entries in this folder match '{filter}'" : "Mikään tässä kansiossa ei vastaa suodatusta '{filter}'",
     "Name" : "Nimi",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Muokattu",
     "_%n folder_::_%n folders_" : ["%n kansio","%n kansiota"],
     "_%n file_::_%n files_" : ["%n tiedosto","%n tiedostoa"],
+    "{dirs} and {files}" : "{dirs} ja {files}",
     "You don’t have permission to upload or create files here" : "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin",
     "_Uploading %n file_::_Uploading %n files_" : ["Lähetetään %n tiedosto","Lähetetään %n tiedostoa"],
+    "New" : "Uusi",
     "\"{name}\" is an invalid file name." : "\"{name}\" on virheellinen tiedostonimi.",
     "File name cannot be empty." : "Tiedoston nimi ei voi olla tyhjä.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Käyttäjän {owner} tallennustila on täynnä, tiedostoja ei voi enää päivittää tai synkronoida!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Käyttäjän {owner} tallennustila on melkein täynnä ({usedSpacePercent} %)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Tallennustila on melkein loppu ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["vastaa '{filter}'","vastaa '{filter}'"],
-    "{dirs} and {files}" : "{dirs} ja {files}",
+    "Path" : "Polku",
+    "_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"],
     "Favorited" : "Lisätty suosikkeihin",
     "Favorite" : "Suosikki",
+    "{newname} already exists" : "{newname} on jo olemassa",
+    "Upload" : "Lähetä",
+    "Text file" : "Tekstitiedosto",
+    "New text file.txt" : "Uusi tekstitiedosto.txt",
+    "Folder" : "Kansio",
+    "New folder" : "Uusi kansio",
     "An error occurred while trying to update the tags" : "Tunnisteiden päivitystä yrittäessä tapahtui virhe",
     "A new file or folder has been <strong>created</strong>" : "Uusi tiedosto tai kansio on <strong>luotu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Tiedostoa tai kansiota on <strong>muutettu</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Tiedostonhallinta",
     "Maximum upload size" : "Lähetettävän tiedoston suurin sallittu koko",
     "max. possible: " : "suurin mahdollinen:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM:n ollessa käytössä tämän arvon tuleminen voimaan saattaa kestää viisi minuuttia tallennushetkestä.",
     "Save" : "Tallenna",
     "Can not be edited from here due to insufficient permissions." : "Ei muokattavissa täällä puutteellisten oikeuksien vuoksi.",
     "Settings" : "Asetukset",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>",
-    "New" : "Uusi",
-    "New text file" : "Uusi tekstitiedosto",
-    "Text file" : "Tekstitiedosto",
-    "New folder" : "Uusi kansio",
-    "Folder" : "Kansio",
-    "Upload" : "Lähetä",
     "Cancel upload" : "Peru lähetys",
     "No files in here" : "Täällä ei ole tiedostoja",
     "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!",
     "No entries found in this folder" : "Ei kohteita tässä kansiossa",
     "Select all" : "Valitse kaikki",
+    "Delete" : "Poista",
     "Upload too large" : "Lähetettävä tiedosto on liian suuri",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
     "Files are being scanned, please wait." : "Tiedostoja tarkistetaan, odota hetki.",
diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json
index f67505268c..9be7c66d37 100644
--- a/apps/files/l10n/fi_FI.json
+++ b/apps/files/l10n/fi_FI.json
@@ -27,20 +27,14 @@
     "All files" : "Kaikki tiedostot",
     "Favorites" : "Suosikit",
     "Home" : "Koti",
+    "Close" : "Sulje",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua",
     "Total file size {size1} exceeds upload limit {size2}" : "Yhteiskoko {size1} ylittää lähetysrajan {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä",
     "Upload cancelled." : "Lähetys peruttu.",
     "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
-    "{new_name} already exists" : "{new_name} on jo olemassa",
-    "Could not create file" : "Tiedoston luominen epäonnistui",
-    "Could not create folder" : "Kansion luominen epäonnistui",
-    "Rename" : "Nimeä uudelleen",
-    "Delete" : "Poista",
-    "Disconnect storage" : "Katkaise yhteys tallennustilaan",
-    "Unshare" : "Peru jakaminen",
-    "No permission to delete" : "Ei oikeutta poistaa",
+    "Actions" : "Toiminnot",
     "Download" : "Lataa",
     "Select" : "Valitse",
     "Pending" : "Odottaa",
@@ -50,7 +44,10 @@
     "Error moving file." : "Virhe tiedostoa siirrettäessä.",
     "Error moving file" : "Virhe tiedostoa siirrettäessä",
     "Error" : "Virhe",
+    "{new_name} already exists" : "{new_name} on jo olemassa",
     "Could not rename file" : "Tiedoston nimeäminen uudelleen epäonnistui",
+    "Could not create file" : "Tiedoston luominen epäonnistui",
+    "Could not create folder" : "Kansion luominen epäonnistui",
     "Error deleting file." : "Virhe tiedostoa poistaessa.",
     "No entries in this folder match '{filter}'" : "Mikään tässä kansiossa ei vastaa suodatusta '{filter}'",
     "Name" : "Nimi",
@@ -58,8 +55,10 @@
     "Modified" : "Muokattu",
     "_%n folder_::_%n folders_" : ["%n kansio","%n kansiota"],
     "_%n file_::_%n files_" : ["%n tiedosto","%n tiedostoa"],
+    "{dirs} and {files}" : "{dirs} ja {files}",
     "You don’t have permission to upload or create files here" : "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin",
     "_Uploading %n file_::_Uploading %n files_" : ["Lähetetään %n tiedosto","Lähetetään %n tiedostoa"],
+    "New" : "Uusi",
     "\"{name}\" is an invalid file name." : "\"{name}\" on virheellinen tiedostonimi.",
     "File name cannot be empty." : "Tiedoston nimi ei voi olla tyhjä.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Käyttäjän {owner} tallennustila on täynnä, tiedostoja ei voi enää päivittää tai synkronoida!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Käyttäjän {owner} tallennustila on melkein täynnä ({usedSpacePercent} %)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Tallennustila on melkein loppu ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["vastaa '{filter}'","vastaa '{filter}'"],
-    "{dirs} and {files}" : "{dirs} ja {files}",
+    "Path" : "Polku",
+    "_%n byte_::_%n bytes_" : ["%n tavu","%n tavua"],
     "Favorited" : "Lisätty suosikkeihin",
     "Favorite" : "Suosikki",
+    "{newname} already exists" : "{newname} on jo olemassa",
+    "Upload" : "Lähetä",
+    "Text file" : "Tekstitiedosto",
+    "New text file.txt" : "Uusi tekstitiedosto.txt",
+    "Folder" : "Kansio",
+    "New folder" : "Uusi kansio",
     "An error occurred while trying to update the tags" : "Tunnisteiden päivitystä yrittäessä tapahtui virhe",
     "A new file or folder has been <strong>created</strong>" : "Uusi tiedosto tai kansio on <strong>luotu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Tiedostoa tai kansiota on <strong>muutettu</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "Tiedostonhallinta",
     "Maximum upload size" : "Lähetettävän tiedoston suurin sallittu koko",
     "max. possible: " : "suurin mahdollinen:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM:n ollessa käytössä tämän arvon tuleminen voimaan saattaa kestää viisi minuuttia tallennushetkestä.",
     "Save" : "Tallenna",
     "Can not be edited from here due to insufficient permissions." : "Ei muokattavissa täällä puutteellisten oikeuksien vuoksi.",
     "Settings" : "Asetukset",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>",
-    "New" : "Uusi",
-    "New text file" : "Uusi tekstitiedosto",
-    "Text file" : "Tekstitiedosto",
-    "New folder" : "Uusi kansio",
-    "Folder" : "Kansio",
-    "Upload" : "Lähetä",
     "Cancel upload" : "Peru lähetys",
     "No files in here" : "Täällä ei ole tiedostoja",
     "Upload some content or sync with your devices!" : "Lähetä tiedostoja tai synkronoi sisältö laitteidesi kanssa!",
     "No entries found in this folder" : "Ei kohteita tässä kansiossa",
     "Select all" : "Valitse kaikki",
+    "Delete" : "Poista",
     "Upload too large" : "Lähetettävä tiedosto on liian suuri",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
     "Files are being scanned, please wait." : "Tiedostoja tarkistetaan, odota hetki.",
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 1d57bb79d0..3b84a6c0c5 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Tous les fichiers",
     "Favorites" : "Favoris",
     "Home" : "Mes fichiers",
+    "Close" : "Fermer",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle",
     "Total file size {size1} exceeds upload limit {size2}" : "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles",
     "Upload cancelled." : "Envoi annulé.",
     "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
-    "{new_name} already exists" : "{new_name} existe déjà",
-    "Could not create file" : "Impossible de créer le fichier",
-    "Could not create folder" : "Impossible de créer le dossier",
-    "Rename" : "Renommer",
-    "Delete" : "Supprimer",
-    "Disconnect storage" : "Déconnecter ce support de stockage",
-    "Unshare" : "Ne plus partager",
-    "No permission to delete" : "Pas de permission de suppression",
+    "Actions" : "Actions",
     "Download" : "Télécharger",
     "Select" : "Sélectionner",
     "Pending" : "En attente",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Erreur lors du déplacement du fichier.",
     "Error moving file" : "Erreur lors du déplacement du fichier",
     "Error" : "Erreur",
+    "{new_name} already exists" : "{new_name} existe déjà",
     "Could not rename file" : "Impossible de renommer le fichier",
+    "Could not create file" : "Impossible de créer le fichier",
+    "Could not create folder" : "Impossible de créer le dossier",
     "Error deleting file." : "Erreur pendant la suppression du fichier.",
     "No entries in this folder match '{filter}'" : "Aucune entrée de ce dossier ne correspond à '{filter}'",
     "Name" : "Nom",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Modifié",
     "_%n folder_::_%n folders_" : ["%n dossier","%n dossiers"],
     "_%n file_::_%n files_" : ["%n fichier","%n fichiers"],
+    "{dirs} and {files}" : "{dirs} et {files}",
     "You don’t have permission to upload or create files here" : "Vous n'avez pas la permission d'ajouter des fichiers ici",
     "_Uploading %n file_::_Uploading %n files_" : ["Téléversement de %n fichier","Téléversement de %n fichiers"],
+    "New" : "Nouveau",
     "\"{name}\" is an invalid file name." : "\"{name}\" n'est pas un nom de fichier valide.",
     "File name cannot be empty." : "Le nom de fichier ne peut être vide.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "L'espace de stockage de {owner} est plein. Les fichiers ne peuvent plus être mis à jour ou synchronisés!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "L'espace de stockage de {owner} est presque plein ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["correspond à '{filter}'","correspondent à '{filter}'"],
-    "{dirs} and {files}" : "{dirs} et {files}",
+    "Path" : "Chemin",
+    "_%n byte_::_%n bytes_" : ["%n octet","%n octets"],
     "Favorited" : "Marqué comme favori",
     "Favorite" : "Favoris",
+    "{newname} already exists" : "{newname} existe déjà",
+    "Upload" : "Chargement",
+    "Text file" : "Fichier texte",
+    "New text file.txt" : "Nouveau fichier texte \"file.txt\"",
+    "Folder" : "Dossier",
+    "New folder" : "Nouveau dossier",
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
     "A new file or folder has been <strong>created</strong>" : "Un nouveau fichier ou répertoire a été <strong>créé</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichier ou un répertoire a été <strong>modifié</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Gestion de fichiers",
     "Maximum upload size" : "Taille max. d'envoi",
     "max. possible: " : "Max. possible :",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Avec PHP-FPM, il peut se passer jusqu'à 5 minutes avant que cette valeur ne soit appliquée.",
     "Save" : "Sauvegarder",
     "Can not be edited from here due to insufficient permissions." : "Ne peut être modifié ici à cause de permissions insuffisantes.",
     "Settings" : "Paramètres",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\">accéder à vos fichiers par WebDAV</a>",
-    "New" : "Nouveau",
-    "New text file" : "Nouveau fichier texte",
-    "Text file" : "Fichier texte",
-    "New folder" : "Nouveau dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Chargement",
     "Cancel upload" : "Annuler l'envoi",
     "No files in here" : "Aucun fichier ici",
     "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
     "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier",
     "Select all" : "Tout sélectionner",
+    "Delete" : "Supprimer",
     "Upload too large" : "Téléversement trop volumineux",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Les fichiers que vous essayez d'envoyer dépassent la taille maximale d'envoi permise par ce serveur.",
     "Files are being scanned, please wait." : "Les fichiers sont en cours d'analyse, veuillez patienter.",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 2b578466fa..4d05b5a42c 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -27,20 +27,14 @@
     "All files" : "Tous les fichiers",
     "Favorites" : "Favoris",
     "Home" : "Mes fichiers",
+    "Close" : "Fermer",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle",
     "Total file size {size1} exceeds upload limit {size2}" : "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles",
     "Upload cancelled." : "Envoi annulé.",
     "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
-    "{new_name} already exists" : "{new_name} existe déjà",
-    "Could not create file" : "Impossible de créer le fichier",
-    "Could not create folder" : "Impossible de créer le dossier",
-    "Rename" : "Renommer",
-    "Delete" : "Supprimer",
-    "Disconnect storage" : "Déconnecter ce support de stockage",
-    "Unshare" : "Ne plus partager",
-    "No permission to delete" : "Pas de permission de suppression",
+    "Actions" : "Actions",
     "Download" : "Télécharger",
     "Select" : "Sélectionner",
     "Pending" : "En attente",
@@ -50,7 +44,10 @@
     "Error moving file." : "Erreur lors du déplacement du fichier.",
     "Error moving file" : "Erreur lors du déplacement du fichier",
     "Error" : "Erreur",
+    "{new_name} already exists" : "{new_name} existe déjà",
     "Could not rename file" : "Impossible de renommer le fichier",
+    "Could not create file" : "Impossible de créer le fichier",
+    "Could not create folder" : "Impossible de créer le dossier",
     "Error deleting file." : "Erreur pendant la suppression du fichier.",
     "No entries in this folder match '{filter}'" : "Aucune entrée de ce dossier ne correspond à '{filter}'",
     "Name" : "Nom",
@@ -58,8 +55,10 @@
     "Modified" : "Modifié",
     "_%n folder_::_%n folders_" : ["%n dossier","%n dossiers"],
     "_%n file_::_%n files_" : ["%n fichier","%n fichiers"],
+    "{dirs} and {files}" : "{dirs} et {files}",
     "You don’t have permission to upload or create files here" : "Vous n'avez pas la permission d'ajouter des fichiers ici",
     "_Uploading %n file_::_Uploading %n files_" : ["Téléversement de %n fichier","Téléversement de %n fichiers"],
+    "New" : "Nouveau",
     "\"{name}\" is an invalid file name." : "\"{name}\" n'est pas un nom de fichier valide.",
     "File name cannot be empty." : "Le nom de fichier ne peut être vide.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "L'espace de stockage de {owner} est plein. Les fichiers ne peuvent plus être mis à jour ou synchronisés!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "L'espace de stockage de {owner} est presque plein ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["correspond à '{filter}'","correspondent à '{filter}'"],
-    "{dirs} and {files}" : "{dirs} et {files}",
+    "Path" : "Chemin",
+    "_%n byte_::_%n bytes_" : ["%n octet","%n octets"],
     "Favorited" : "Marqué comme favori",
     "Favorite" : "Favoris",
+    "{newname} already exists" : "{newname} existe déjà",
+    "Upload" : "Chargement",
+    "Text file" : "Fichier texte",
+    "New text file.txt" : "Nouveau fichier texte \"file.txt\"",
+    "Folder" : "Dossier",
+    "New folder" : "Nouveau dossier",
     "An error occurred while trying to update the tags" : "Une erreur est survenue lors de la mise à jour des étiquettes",
     "A new file or folder has been <strong>created</strong>" : "Un nouveau fichier ou répertoire a été <strong>créé</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichier ou un répertoire a été <strong>modifié</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "Gestion de fichiers",
     "Maximum upload size" : "Taille max. d'envoi",
     "max. possible: " : "Max. possible :",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Avec PHP-FPM, il peut se passer jusqu'à 5 minutes avant que cette valeur ne soit appliquée.",
     "Save" : "Sauvegarder",
     "Can not be edited from here due to insufficient permissions." : "Ne peut être modifié ici à cause de permissions insuffisantes.",
     "Settings" : "Paramètres",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilisez cette adresse pour <a href=\"%s\" target=\"_blank\">accéder à vos fichiers par WebDAV</a>",
-    "New" : "Nouveau",
-    "New text file" : "Nouveau fichier texte",
-    "Text file" : "Fichier texte",
-    "New folder" : "Nouveau dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Chargement",
     "Cancel upload" : "Annuler l'envoi",
     "No files in here" : "Aucun fichier ici",
     "Upload some content or sync with your devices!" : "Déposez du contenu ou synchronisez vos appareils !",
     "No entries found in this folder" : "Aucune entrée trouvée dans ce dossier",
     "Select all" : "Tout sélectionner",
+    "Delete" : "Supprimer",
     "Upload too large" : "Téléversement trop volumineux",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Les fichiers que vous essayez d'envoyer dépassent la taille maximale d'envoi permise par ce serveur.",
     "Files are being scanned, please wait." : "Les fichiers sont en cours d'analyse, veuillez patienter.",
diff --git a/apps/files/l10n/fr_CA.js b/apps/files/l10n/fr_CA.js
deleted file mode 100644
index c50be1aa47..0000000000
--- a/apps/files/l10n/fr_CA.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/files/l10n/fr_CA.json b/apps/files/l10n/fr_CA.json
deleted file mode 100644
index 210ac153ba..0000000000
--- a/apps/files/l10n/fr_CA.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""],
-    "_matches '{filter}'_::_match '{filter}'_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/gl.js b/apps/files/l10n/gl.js
index 2ab8c9f94a..4293b3ab9b 100644
--- a/apps/files/l10n/gl.js
+++ b/apps/files/l10n/gl.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Todos os ficheiros",
     "Favorites" : "Favoritos",
     "Home" : "Inicio",
+    "Close" : "Pechar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "O tamaño total do ficheiro {size1} excede do límite de envío {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}",
     "Upload cancelled." : "Envío cancelado.",
     "Could not get result from server." : "Non foi posíbel obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
-    "{new_name} already exists" : "Xa existe un {new_name}",
-    "Could not create file" : "Non foi posíbel crear o ficheiro",
-    "Could not create folder" : "Non foi posíbel crear o cartafol",
-    "Rename" : "Renomear",
-    "Delete" : "Eliminar",
-    "Disconnect storage" : "Desconectar o almacenamento",
-    "Unshare" : "Deixar de compartir",
-    "No permission to delete" : "Non ten permisos para eliminar",
+    "Actions" : "Accións",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
     "Pending" : "Pendentes",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Produciuse un erro ao mover o ficheiro.",
     "Error moving file" : "Produciuse un erro ao mover o ficheiro",
     "Error" : "Erro",
+    "{new_name} already exists" : "Xa existe un {new_name}",
     "Could not rename file" : "Non foi posíbel renomear o ficheiro",
+    "Could not create file" : "Non foi posíbel crear o ficheiro",
+    "Could not create folder" : "Non foi posíbel crear o cartafol",
     "Error deleting file." : "Produciuse un erro ao eliminar o ficheiro.",
     "No entries in this folder match '{filter}'" : "Non hai entradas neste cartafol coincidentes con «{filter}»",
     "Name" : "Nome",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n cartafol","%n cartafoles"],
     "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
+    "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Non ten permisos para enviar ou crear ficheiros aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Cargando %n ficheiro","Cargando %n ficheiros"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "«{name}» é un nome incorrecto de ficheiro.",
     "File name cannot be empty." : "O nome de ficheiro non pode estar baleiro",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "O espazo de almacenamento de {owner} está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
@@ -69,9 +68,14 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "O espazo de almacenamento de {owner} está case cheo ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidente con «{filter}»","coincidentes con «{filter}»"],
-    "{dirs} and {files}" : "{dirs} e {files}",
+    "Path" : "Ruta",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Marcado como favorito",
     "Favorite" : "Favorito",
+    "Upload" : "Enviar",
+    "Text file" : "Ficheiro de texto",
+    "Folder" : "Cartafol",
+    "New folder" : "Novo cartafol",
     "An error occurred while trying to update the tags" : "Produciuse un erro ao tentar actualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creouse</strong> un novo ficheiro ou cartafol",
     "A file or folder has been <strong>changed</strong>" : "<strong>Cambiouse</strong> un ficheiro ou cartafol",
@@ -98,17 +102,12 @@ OC.L10N.register(
     "Settings" : "Axustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Empregue esta ligazón para  <a href=\"%s\" target=\"_blank\">acceder aos seus ficheiros mediante WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Ficheiro novo de texto",
-    "Text file" : "Ficheiro de texto",
-    "New folder" : "Novo cartafol",
-    "Folder" : "Cartafol",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar o envío",
     "No files in here" : "Aquí non hai ficheiros",
     "Upload some content or sync with your devices!" : "Envíe algún contido ou sincronice cos seus dispositivos!",
     "No entries found in this folder" : "Non se atoparon entradas neste cartafol",
     "Select all" : "Seleccionar todo",
+    "Delete" : "Eliminar",
     "Upload too large" : "Envío grande de máis",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
     "Files are being scanned, please wait." : "Estanse analizando os ficheiros. Agarde.",
diff --git a/apps/files/l10n/gl.json b/apps/files/l10n/gl.json
index 0668c535ae..34eeaa6a36 100644
--- a/apps/files/l10n/gl.json
+++ b/apps/files/l10n/gl.json
@@ -27,20 +27,14 @@
     "All files" : "Todos os ficheiros",
     "Favorites" : "Favoritos",
     "Home" : "Inicio",
+    "Close" : "Pechar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "O tamaño total do ficheiro {size1} excede do límite de envío {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}",
     "Upload cancelled." : "Envío cancelado.",
     "Could not get result from server." : "Non foi posíbel obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
-    "{new_name} already exists" : "Xa existe un {new_name}",
-    "Could not create file" : "Non foi posíbel crear o ficheiro",
-    "Could not create folder" : "Non foi posíbel crear o cartafol",
-    "Rename" : "Renomear",
-    "Delete" : "Eliminar",
-    "Disconnect storage" : "Desconectar o almacenamento",
-    "Unshare" : "Deixar de compartir",
-    "No permission to delete" : "Non ten permisos para eliminar",
+    "Actions" : "Accións",
     "Download" : "Descargar",
     "Select" : "Seleccionar",
     "Pending" : "Pendentes",
@@ -50,7 +44,10 @@
     "Error moving file." : "Produciuse un erro ao mover o ficheiro.",
     "Error moving file" : "Produciuse un erro ao mover o ficheiro",
     "Error" : "Erro",
+    "{new_name} already exists" : "Xa existe un {new_name}",
     "Could not rename file" : "Non foi posíbel renomear o ficheiro",
+    "Could not create file" : "Non foi posíbel crear o ficheiro",
+    "Could not create folder" : "Non foi posíbel crear o cartafol",
     "Error deleting file." : "Produciuse un erro ao eliminar o ficheiro.",
     "No entries in this folder match '{filter}'" : "Non hai entradas neste cartafol coincidentes con «{filter}»",
     "Name" : "Nome",
@@ -58,8 +55,10 @@
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n cartafol","%n cartafoles"],
     "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
+    "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Non ten permisos para enviar ou crear ficheiros aquí.",
     "_Uploading %n file_::_Uploading %n files_" : ["Cargando %n ficheiro","Cargando %n ficheiros"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "«{name}» é un nome incorrecto de ficheiro.",
     "File name cannot be empty." : "O nome de ficheiro non pode estar baleiro",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "O espazo de almacenamento de {owner} está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
@@ -67,9 +66,14 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "O espazo de almacenamento de {owner} está case cheo ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincidente con «{filter}»","coincidentes con «{filter}»"],
-    "{dirs} and {files}" : "{dirs} e {files}",
+    "Path" : "Ruta",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Marcado como favorito",
     "Favorite" : "Favorito",
+    "Upload" : "Enviar",
+    "Text file" : "Ficheiro de texto",
+    "Folder" : "Cartafol",
+    "New folder" : "Novo cartafol",
     "An error occurred while trying to update the tags" : "Produciuse un erro ao tentar actualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "<strong>Creouse</strong> un novo ficheiro ou cartafol",
     "A file or folder has been <strong>changed</strong>" : "<strong>Cambiouse</strong> un ficheiro ou cartafol",
@@ -96,17 +100,12 @@
     "Settings" : "Axustes",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Empregue esta ligazón para  <a href=\"%s\" target=\"_blank\">acceder aos seus ficheiros mediante WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Ficheiro novo de texto",
-    "Text file" : "Ficheiro de texto",
-    "New folder" : "Novo cartafol",
-    "Folder" : "Cartafol",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar o envío",
     "No files in here" : "Aquí non hai ficheiros",
     "Upload some content or sync with your devices!" : "Envíe algún contido ou sincronice cos seus dispositivos!",
     "No entries found in this folder" : "Non se atoparon entradas neste cartafol",
     "Select all" : "Seleccionar todo",
+    "Delete" : "Eliminar",
     "Upload too large" : "Envío grande de máis",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
     "Files are being scanned, please wait." : "Estanse analizando os ficheiros. Agarde.",
diff --git a/apps/files/l10n/he.js b/apps/files/l10n/he.js
index ff61714d6c..94956cbff0 100644
--- a/apps/files/l10n/he.js
+++ b/apps/files/l10n/he.js
@@ -18,23 +18,27 @@ OC.L10N.register(
     "Files" : "קבצים",
     "Favorites" : "מועדפים",
     "Home" : "בית",
+    "Close" : "סגירה",
     "Upload cancelled." : "ההעלאה בוטלה.",
     "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.",
-    "{new_name} already exists" : "{new_name} כבר קיים",
-    "Rename" : "שינוי שם",
-    "Delete" : "מחיקה",
-    "Unshare" : "הסר שיתוף",
+    "Actions" : "פעולות",
     "Download" : "הורדה",
     "Select" : "בחר",
     "Pending" : "ממתין",
     "Error" : "שגיאה",
+    "{new_name} already exists" : "{new_name} כבר קיים",
     "Name" : "שם",
     "Size" : "גודל",
     "Modified" : "זמן שינוי",
+    "New" : "חדש",
     "File name cannot be empty." : "שם קובץ אינו יכול להיות ריק",
     "Your storage is almost full ({usedSpacePercent}%)" : "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
     "Favorite" : "מועדף",
+    "Upload" : "העלאה",
+    "Text file" : "קובץ טקסט",
+    "Folder" : "תיקייה",
+    "New folder" : "תיקייה חדשה",
     "A new file or folder has been <strong>created</strong>" : "קובץ או תיקייה חדשים <strong>נוצרו<strong/>",
     "A file or folder has been <strong>changed</strong>" : "קובץ או תיקייה <strong>שונו<strong/>",
     "A file or folder has been <strong>deleted</strong>" : "קובץ או תיקייה <strong>נמחקו<strong/>",
@@ -52,12 +56,8 @@ OC.L10N.register(
     "Save" : "שמירה",
     "Settings" : "הגדרות",
     "WebDAV" : "WebDAV",
-    "New" : "חדש",
-    "Text file" : "קובץ טקסט",
-    "New folder" : "תיקייה חדשה",
-    "Folder" : "תיקייה",
-    "Upload" : "העלאה",
     "Cancel upload" : "ביטול ההעלאה",
+    "Delete" : "מחיקה",
     "Upload too large" : "העלאה גדולה מידי",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
     "Files are being scanned, please wait." : "הקבצים נסרקים, נא להמתין."
diff --git a/apps/files/l10n/he.json b/apps/files/l10n/he.json
index b1c7119e3e..8dfc57f327 100644
--- a/apps/files/l10n/he.json
+++ b/apps/files/l10n/he.json
@@ -16,23 +16,27 @@
     "Files" : "קבצים",
     "Favorites" : "מועדפים",
     "Home" : "בית",
+    "Close" : "סגירה",
     "Upload cancelled." : "ההעלאה בוטלה.",
     "Could not get result from server." : "לא ניתן לגשת לתוצאות מהשרת.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה.",
-    "{new_name} already exists" : "{new_name} כבר קיים",
-    "Rename" : "שינוי שם",
-    "Delete" : "מחיקה",
-    "Unshare" : "הסר שיתוף",
+    "Actions" : "פעולות",
     "Download" : "הורדה",
     "Select" : "בחר",
     "Pending" : "ממתין",
     "Error" : "שגיאה",
+    "{new_name} already exists" : "{new_name} כבר קיים",
     "Name" : "שם",
     "Size" : "גודל",
     "Modified" : "זמן שינוי",
+    "New" : "חדש",
     "File name cannot be empty." : "שם קובץ אינו יכול להיות ריק",
     "Your storage is almost full ({usedSpacePercent}%)" : "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
     "Favorite" : "מועדף",
+    "Upload" : "העלאה",
+    "Text file" : "קובץ טקסט",
+    "Folder" : "תיקייה",
+    "New folder" : "תיקייה חדשה",
     "A new file or folder has been <strong>created</strong>" : "קובץ או תיקייה חדשים <strong>נוצרו<strong/>",
     "A file or folder has been <strong>changed</strong>" : "קובץ או תיקייה <strong>שונו<strong/>",
     "A file or folder has been <strong>deleted</strong>" : "קובץ או תיקייה <strong>נמחקו<strong/>",
@@ -50,12 +54,8 @@
     "Save" : "שמירה",
     "Settings" : "הגדרות",
     "WebDAV" : "WebDAV",
-    "New" : "חדש",
-    "Text file" : "קובץ טקסט",
-    "New folder" : "תיקייה חדשה",
-    "Folder" : "תיקייה",
-    "Upload" : "העלאה",
     "Cancel upload" : "ביטול ההעלאה",
+    "Delete" : "מחיקה",
     "Upload too large" : "העלאה גדולה מידי",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
     "Files are being scanned, please wait." : "הקבצים נסרקים, נא להמתין."
diff --git a/apps/files/l10n/hi.js b/apps/files/l10n/hi.js
index cfcf42e938..c040105875 100644
--- a/apps/files/l10n/hi.js
+++ b/apps/files/l10n/hi.js
@@ -2,10 +2,11 @@ OC.L10N.register(
     "files",
     {
     "Files" : "फाइलें ",
+    "Close" : "बंद करें ",
     "Error" : "त्रुटि",
-    "Save" : "सहेजें",
-    "Settings" : "सेटिंग्स",
+    "Upload" : "अपलोड ",
     "New folder" : "नया फ़ोल्डर",
-    "Upload" : "अपलोड "
+    "Save" : "सहेजें",
+    "Settings" : "सेटिंग्स"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/hi.json b/apps/files/l10n/hi.json
index 32f74c7210..70db8f9d7f 100644
--- a/apps/files/l10n/hi.json
+++ b/apps/files/l10n/hi.json
@@ -1,9 +1,10 @@
 { "translations": {
     "Files" : "फाइलें ",
+    "Close" : "बंद करें ",
     "Error" : "त्रुटि",
-    "Save" : "सहेजें",
-    "Settings" : "सेटिंग्स",
+    "Upload" : "अपलोड ",
     "New folder" : "नया फ़ोल्डर",
-    "Upload" : "अपलोड "
+    "Save" : "सहेजें",
+    "Settings" : "सेटिंग्स"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/hi_IN.js b/apps/files/l10n/hi_IN.js
deleted file mode 100644
index 329844854f..0000000000
--- a/apps/files/l10n/hi_IN.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/hi_IN.json b/apps/files/l10n/hi_IN.json
deleted file mode 100644
index 37156658a8..0000000000
--- a/apps/files/l10n/hi_IN.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_%n folder_::_%n folders_" : ["",""],
-    "_%n file_::_%n files_" : ["",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/hr.js b/apps/files/l10n/hr.js
index f62fe8d6c6..379d43f4db 100644
--- a/apps/files/l10n/hr.js
+++ b/apps/files/l10n/hr.js
@@ -29,19 +29,14 @@ OC.L10N.register(
     "All files" : "Sve datoteke",
     "Favorites" : "Favoriti",
     "Home" : "Kuća",
+    "Close" : "Zatvorite",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće učitati {filename} jer je ili direktorij ili ima 0 bajta",
     "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} premašuje ograničenje unosa {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nedovoljno slobodnog prostora, vi učitavate {size1} a samo je {size2} preostalo",
     "Upload cancelled." : "Učitavanje je prekinuto.",
     "Could not get result from server." : "Nemoguće dobiti rezultat od poslužitelja.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u tijeku. Napuštanje stranice prekinut će učitavanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Datoteku nije moguće kreirati",
-    "Could not create folder" : "Mapu nije moguće kreirati",
-    "Rename" : "Preimenujte",
-    "Delete" : "Izbrišite",
-    "Disconnect storage" : "Isključite pohranu",
-    "Unshare" : "Prestanite dijeliti",
+    "Actions" : "Radnje",
     "Download" : "Preuzimanje",
     "Select" : "Selektiraj",
     "Pending" : "Na čekanju",
@@ -49,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Pogrešno premještanje datoteke",
     "Error moving file" : "Pogrešno premještanje datoteke",
     "Error" : "Pogreška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Datoteku nije moguće preimenovati",
+    "Could not create file" : "Datoteku nije moguće kreirati",
+    "Could not create folder" : "Mapu nije moguće kreirati",
     "Error deleting file." : "Pogrešno brisanje datoteke",
     "No entries in this folder match '{filter}'" : "Nema zapisa u ovom folderu match '{filter}'",
     "Name" : "Naziv",
@@ -57,15 +55,20 @@ OC.L10N.register(
     "Modified" : "Promijenjeno",
     "_%n folder_::_%n folders_" : ["%n mapa","%n mape","%n mapa"],
     "_%n file_::_%n files_" : ["%n datoteka","%n datoteke","%n datoteka"],
+    "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Ovdje vam nije dopušteno učitavati ili kreirati datoteke",
     "_Uploading %n file_::_Uploading %n files_" : ["Prenosim %n datoteku","Prenosim %n datoteke","Prenosim %n datoteka"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime datoteke.",
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša je pohrana puna, datoteke više nije moguće ažurirati niti sinkronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Favoritovan",
     "Favorite" : "Favorit",
+    "Upload" : "Učitavanje",
+    "Text file" : "Tekstualna datoteka",
+    "Folder" : "Mapa",
+    "New folder" : "Nova mapa",
     "A new file or folder has been <strong>created</strong>" : "Nova datoteka ili nova mapa su <strong>kreirani</strong>",
     "A file or folder has been <strong>changed</strong>" : "Datoteka ili mapa su <strong>promijenjeni</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Datoteka ili mapa su <strong>izbrisani</strong>",
@@ -89,16 +92,11 @@ OC.L10N.register(
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristitet slijedeću adresu za <a href=\"%s\" target=\"_blank\">pristup vašim datotekama putem WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nova tekstualna datoteka",
-    "Text file" : "Tekstualna datoteka",
-    "New folder" : "Nova mapa",
-    "Folder" : "Mapa",
-    "Upload" : "Učitavanje",
     "Cancel upload" : "Prekini upload",
     "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!",
     "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ",
     "Select all" : "Selektiraj sve",
+    "Delete" : "Izbrišite",
     "Upload too large" : "Unos je prevelik",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati premašuju maksimalnu veličinu za unos datoteka na ovom poslužitelju.",
     "Files are being scanned, please wait." : "Datoteke se provjeravaju, molimo pričekajte.",
diff --git a/apps/files/l10n/hr.json b/apps/files/l10n/hr.json
index 9a83a301dd..a8d935848e 100644
--- a/apps/files/l10n/hr.json
+++ b/apps/files/l10n/hr.json
@@ -27,19 +27,14 @@
     "All files" : "Sve datoteke",
     "Favorites" : "Favoriti",
     "Home" : "Kuća",
+    "Close" : "Zatvorite",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće učitati {filename} jer je ili direktorij ili ima 0 bajta",
     "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} premašuje ograničenje unosa {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nedovoljno slobodnog prostora, vi učitavate {size1} a samo je {size2} preostalo",
     "Upload cancelled." : "Učitavanje je prekinuto.",
     "Could not get result from server." : "Nemoguće dobiti rezultat od poslužitelja.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u tijeku. Napuštanje stranice prekinut će učitavanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Datoteku nije moguće kreirati",
-    "Could not create folder" : "Mapu nije moguće kreirati",
-    "Rename" : "Preimenujte",
-    "Delete" : "Izbrišite",
-    "Disconnect storage" : "Isključite pohranu",
-    "Unshare" : "Prestanite dijeliti",
+    "Actions" : "Radnje",
     "Download" : "Preuzimanje",
     "Select" : "Selektiraj",
     "Pending" : "Na čekanju",
@@ -47,7 +42,10 @@
     "Error moving file." : "Pogrešno premještanje datoteke",
     "Error moving file" : "Pogrešno premještanje datoteke",
     "Error" : "Pogreška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Datoteku nije moguće preimenovati",
+    "Could not create file" : "Datoteku nije moguće kreirati",
+    "Could not create folder" : "Mapu nije moguće kreirati",
     "Error deleting file." : "Pogrešno brisanje datoteke",
     "No entries in this folder match '{filter}'" : "Nema zapisa u ovom folderu match '{filter}'",
     "Name" : "Naziv",
@@ -55,15 +53,20 @@
     "Modified" : "Promijenjeno",
     "_%n folder_::_%n folders_" : ["%n mapa","%n mape","%n mapa"],
     "_%n file_::_%n files_" : ["%n datoteka","%n datoteke","%n datoteka"],
+    "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Ovdje vam nije dopušteno učitavati ili kreirati datoteke",
     "_Uploading %n file_::_Uploading %n files_" : ["Prenosim %n datoteku","Prenosim %n datoteke","Prenosim %n datoteka"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime datoteke.",
     "File name cannot be empty." : "Naziv datoteke ne može biti prazan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaša je pohrana puna, datoteke više nije moguće ažurirati niti sinkronizirati!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaš prostor za pohranu je skoro pun ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Favoritovan",
     "Favorite" : "Favorit",
+    "Upload" : "Učitavanje",
+    "Text file" : "Tekstualna datoteka",
+    "Folder" : "Mapa",
+    "New folder" : "Nova mapa",
     "A new file or folder has been <strong>created</strong>" : "Nova datoteka ili nova mapa su <strong>kreirani</strong>",
     "A file or folder has been <strong>changed</strong>" : "Datoteka ili mapa su <strong>promijenjeni</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Datoteka ili mapa su <strong>izbrisani</strong>",
@@ -87,16 +90,11 @@
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristitet slijedeću adresu za <a href=\"%s\" target=\"_blank\">pristup vašim datotekama putem WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nova tekstualna datoteka",
-    "Text file" : "Tekstualna datoteka",
-    "New folder" : "Nova mapa",
-    "Folder" : "Mapa",
-    "Upload" : "Učitavanje",
     "Cancel upload" : "Prekini upload",
     "Upload some content or sync with your devices!" : "Aplodujte neki sadrzaj ili sinkronizirajte sa vasim uredjajem!",
     "No entries found in this folder" : "Zapis nije pronadjen u ovom direktorijumu ",
     "Select all" : "Selektiraj sve",
+    "Delete" : "Izbrišite",
     "Upload too large" : "Unos je prevelik",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke koje pokušavate učitati premašuju maksimalnu veličinu za unos datoteka na ovom poslužitelju.",
     "Files are being scanned, please wait." : "Datoteke se provjeravaju, molimo pričekajte.",
diff --git a/apps/files/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js
index 0f7d09bc12..8b9b7c17f1 100644
--- a/apps/files/l10n/hu_HU.js
+++ b/apps/files/l10n/hu_HU.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Az összes állomány",
     "Favorites" : "Kedvencek",
     "Home" : "Otthoni",
+    "Close" : "Bezárás",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.",
     "Total file size {size1} exceeds upload limit {size2}" : "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.",
     "Upload cancelled." : "A feltöltést megszakítottuk.",
     "Could not get result from server." : "A kiszolgálótól nem kapható meg a művelet eredménye.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
-    "{new_name} already exists" : "{new_name} már létezik",
-    "Could not create file" : "Az állomány nem hozható létre",
-    "Could not create folder" : "A mappa nem hozható létre",
-    "Rename" : "Átnevezés",
-    "Delete" : "Törlés",
-    "Disconnect storage" : "Tároló leválasztása",
-    "Unshare" : "A megosztás visszavonása",
-    "No permission to delete" : "Nincs törlési jogosultsága",
+    "Actions" : "Műveletek",
     "Download" : "Letöltés",
     "Select" : "Kiválaszt",
     "Pending" : "Folyamatban",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Hiba történt a fájl áthelyezése közben.",
     "Error moving file" : "Az állomány áthelyezése nem sikerült.",
     "Error" : "Hiba",
+    "{new_name} already exists" : "{new_name} már létezik",
     "Could not rename file" : "Az állomány nem nevezhető át",
+    "Could not create file" : "Az állomány nem hozható létre",
+    "Could not create folder" : "A mappa nem hozható létre",
     "Error deleting file." : "Hiba a file törlése közben.",
     "No entries in this folder match '{filter}'" : "Nincsenek egyező bejegyzések ebben a könyvtárban '{filter}'",
     "Name" : "Név",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Módosítva",
     "_%n folder_::_%n folders_" : ["%n mappa","%n mappa"],
     "_%n file_::_%n files_" : ["%n állomány","%n állomány"],
+    "{dirs} and {files}" : "{dirs} és {files}",
     "You don’t have permission to upload or create files here" : "Önnek nincs jogosultsága ahhoz, hogy ide állományokat töltsön föl, vagy itt újakat hozzon létre",
     "_Uploading %n file_::_Uploading %n files_" : ["%n állomány feltöltése","%n állomány feltöltése"],
+    "New" : "Új",
     "\"{name}\" is an invalid file name." : "\"{name}\" érvénytelen, mint fájlnév.",
     "File name cannot be empty." : "A fájlnév nem lehet semmi.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "A {owner} felhasználó tárolója betelt, a fájlok nem frissíthetők és szinkronizálhatók többet!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "A {owner} felhasználó tárolója majdnem betelt ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "A tároló majdnem tele van ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["egyezések '{filter}'","egyezés '{filter}'"],
-    "{dirs} and {files}" : "{dirs} és {files}",
+    "Path" : "Útvonal",
+    "_%n byte_::_%n bytes_" : ["%n bájt","%n bájt"],
     "Favorited" : "Kedvenc",
     "Favorite" : "Kedvenc",
+    "{newname} already exists" : "{newname} már létezik",
+    "Upload" : "Feltöltés",
+    "Text file" : "Szövegfájl",
+    "New text file.txt" : "Új szöveges fájl.txt",
+    "Folder" : "Mappa",
+    "New folder" : "Új mappa",
     "An error occurred while trying to update the tags" : "Hiba történt, miközben megpróbálta frissíteni a címkéket",
     "A new file or folder has been <strong>created</strong>" : "Új fájl vagy könyvtár <strong>létrehozása</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fájl vagy könyvtár <strong>módosítása</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Fájlkezelés",
     "Maximum upload size" : "Maximális feltölthető fájlméret",
     "max. possible: " : "max. lehetséges: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM-mel ez az érték életbe lépése mentés után akár 5 percbe is telhet.",
     "Save" : "Mentés",
     "Can not be edited from here due to insufficient permissions." : "Innen nem lehet szerkeszteni az elégtelen jogosultság miatt ",
     "Settings" : "Beállítások",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Ezt a címet használja, ha <a href=\"%s\" target=\"_blank\">WebDAV-on keresztül szeretné elérni a fájljait</a>",
-    "New" : "Új",
-    "New text file" : "Új szövegfájl",
-    "Text file" : "Szövegfájl",
-    "New folder" : "Új mappa",
-    "Folder" : "Mappa",
-    "Upload" : "Feltöltés",
     "Cancel upload" : "A feltöltés megszakítása",
     "No files in here" : "Itt nincsenek fájlok",
     "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!",
     "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban",
     "Select all" : "Összes kijelölése",
+    "Delete" : "Törlés",
     "Upload too large" : "A feltöltés túl nagy",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
     "Files are being scanned, please wait." : "A fájllista ellenőrzése zajlik, kis türelmet!",
diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json
index bf98eef627..6d82cd6041 100644
--- a/apps/files/l10n/hu_HU.json
+++ b/apps/files/l10n/hu_HU.json
@@ -27,20 +27,14 @@
     "All files" : "Az összes állomány",
     "Favorites" : "Kedvencek",
     "Home" : "Otthoni",
+    "Close" : "Bezárás",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.",
     "Total file size {size1} exceeds upload limit {size2}" : "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.",
     "Upload cancelled." : "A feltöltést megszakítottuk.",
     "Could not get result from server." : "A kiszolgálótól nem kapható meg a művelet eredménye.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
-    "{new_name} already exists" : "{new_name} már létezik",
-    "Could not create file" : "Az állomány nem hozható létre",
-    "Could not create folder" : "A mappa nem hozható létre",
-    "Rename" : "Átnevezés",
-    "Delete" : "Törlés",
-    "Disconnect storage" : "Tároló leválasztása",
-    "Unshare" : "A megosztás visszavonása",
-    "No permission to delete" : "Nincs törlési jogosultsága",
+    "Actions" : "Műveletek",
     "Download" : "Letöltés",
     "Select" : "Kiválaszt",
     "Pending" : "Folyamatban",
@@ -50,7 +44,10 @@
     "Error moving file." : "Hiba történt a fájl áthelyezése közben.",
     "Error moving file" : "Az állomány áthelyezése nem sikerült.",
     "Error" : "Hiba",
+    "{new_name} already exists" : "{new_name} már létezik",
     "Could not rename file" : "Az állomány nem nevezhető át",
+    "Could not create file" : "Az állomány nem hozható létre",
+    "Could not create folder" : "A mappa nem hozható létre",
     "Error deleting file." : "Hiba a file törlése közben.",
     "No entries in this folder match '{filter}'" : "Nincsenek egyező bejegyzések ebben a könyvtárban '{filter}'",
     "Name" : "Név",
@@ -58,8 +55,10 @@
     "Modified" : "Módosítva",
     "_%n folder_::_%n folders_" : ["%n mappa","%n mappa"],
     "_%n file_::_%n files_" : ["%n állomány","%n állomány"],
+    "{dirs} and {files}" : "{dirs} és {files}",
     "You don’t have permission to upload or create files here" : "Önnek nincs jogosultsága ahhoz, hogy ide állományokat töltsön föl, vagy itt újakat hozzon létre",
     "_Uploading %n file_::_Uploading %n files_" : ["%n állomány feltöltése","%n állomány feltöltése"],
+    "New" : "Új",
     "\"{name}\" is an invalid file name." : "\"{name}\" érvénytelen, mint fájlnév.",
     "File name cannot be empty." : "A fájlnév nem lehet semmi.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "A {owner} felhasználó tárolója betelt, a fájlok nem frissíthetők és szinkronizálhatók többet!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "A {owner} felhasználó tárolója majdnem betelt ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "A tároló majdnem tele van ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["egyezések '{filter}'","egyezés '{filter}'"],
-    "{dirs} and {files}" : "{dirs} és {files}",
+    "Path" : "Útvonal",
+    "_%n byte_::_%n bytes_" : ["%n bájt","%n bájt"],
     "Favorited" : "Kedvenc",
     "Favorite" : "Kedvenc",
+    "{newname} already exists" : "{newname} már létezik",
+    "Upload" : "Feltöltés",
+    "Text file" : "Szövegfájl",
+    "New text file.txt" : "Új szöveges fájl.txt",
+    "Folder" : "Mappa",
+    "New folder" : "Új mappa",
     "An error occurred while trying to update the tags" : "Hiba történt, miközben megpróbálta frissíteni a címkéket",
     "A new file or folder has been <strong>created</strong>" : "Új fájl vagy könyvtár <strong>létrehozása</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fájl vagy könyvtár <strong>módosítása</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "Fájlkezelés",
     "Maximum upload size" : "Maximális feltölthető fájlméret",
     "max. possible: " : "max. lehetséges: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM-mel ez az érték életbe lépése mentés után akár 5 percbe is telhet.",
     "Save" : "Mentés",
     "Can not be edited from here due to insufficient permissions." : "Innen nem lehet szerkeszteni az elégtelen jogosultság miatt ",
     "Settings" : "Beállítások",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Ezt a címet használja, ha <a href=\"%s\" target=\"_blank\">WebDAV-on keresztül szeretné elérni a fájljait</a>",
-    "New" : "Új",
-    "New text file" : "Új szövegfájl",
-    "Text file" : "Szövegfájl",
-    "New folder" : "Új mappa",
-    "Folder" : "Mappa",
-    "Upload" : "Feltöltés",
     "Cancel upload" : "A feltöltés megszakítása",
     "No files in here" : "Itt nincsenek fájlok",
     "Upload some content or sync with your devices!" : "Tölts fel néhány tartalmat, vagy szinkronizálj az eszközöddel!",
     "No entries found in this folder" : "Nincsenek bejegyzések ebben a könyvtárban",
     "Select all" : "Összes kijelölése",
+    "Delete" : "Törlés",
     "Upload too large" : "A feltöltés túl nagy",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
     "Files are being scanned, please wait." : "A fájllista ellenőrzése zajlik, kis türelmet!",
diff --git a/apps/files/l10n/hy.js b/apps/files/l10n/hy.js
index 10bf13f81e..9ddfc91b18 100644
--- a/apps/files/l10n/hy.js
+++ b/apps/files/l10n/hy.js
@@ -1,8 +1,9 @@
 OC.L10N.register(
     "files",
     {
-    "Delete" : "Ջնջել",
+    "Close" : "Փակել",
     "Download" : "Բեռնել",
-    "Save" : "Պահպանել"
+    "Save" : "Պահպանել",
+    "Delete" : "Ջնջել"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/hy.json b/apps/files/l10n/hy.json
index e525d9ede8..2c9d1859b1 100644
--- a/apps/files/l10n/hy.json
+++ b/apps/files/l10n/hy.json
@@ -1,6 +1,7 @@
 { "translations": {
-    "Delete" : "Ջնջել",
+    "Close" : "Փակել",
     "Download" : "Բեռնել",
-    "Save" : "Պահպանել"
+    "Save" : "Պահպանել",
+    "Delete" : "Ջնջել"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/ia.js b/apps/files/l10n/ia.js
index 0826888ea2..9b5d321937 100644
--- a/apps/files/l10n/ia.js
+++ b/apps/files/l10n/ia.js
@@ -7,14 +7,18 @@ OC.L10N.register(
     "Missing a temporary folder" : "Manca un dossier temporari",
     "Files" : "Files",
     "Home" : "Domo",
-    "Delete" : "Deler",
-    "Unshare" : "Leva compartir",
+    "Close" : "Clauder",
     "Download" : "Discargar",
     "Error" : "Error",
     "Name" : "Nomine",
     "Size" : "Dimension",
     "Modified" : "Modificate",
+    "New" : "Nove",
     "File name cannot be empty." : "Le nomine de file non pote esser vacue.",
+    "Upload" : "Incargar",
+    "Text file" : "File de texto",
+    "Folder" : "Dossier",
+    "New folder" : "Nove dossier",
     "A new file or folder has been <strong>created</strong>" : "Un nove file o dossier ha essite <strong>create</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un nove file o dossier ha essite <strong>modificate</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un nove file o dossier ha essite <strong>delite</strong>",
@@ -32,11 +36,7 @@ OC.L10N.register(
     "Maximum upload size" : "Dimension maxime de incargamento",
     "Save" : "Salveguardar",
     "Settings" : "Configurationes",
-    "New" : "Nove",
-    "Text file" : "File de texto",
-    "New folder" : "Nove dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Incargar",
+    "Delete" : "Deler",
     "Upload too large" : "Incargamento troppo longe"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ia.json b/apps/files/l10n/ia.json
index 7460bd6117..461634d526 100644
--- a/apps/files/l10n/ia.json
+++ b/apps/files/l10n/ia.json
@@ -5,14 +5,18 @@
     "Missing a temporary folder" : "Manca un dossier temporari",
     "Files" : "Files",
     "Home" : "Domo",
-    "Delete" : "Deler",
-    "Unshare" : "Leva compartir",
+    "Close" : "Clauder",
     "Download" : "Discargar",
     "Error" : "Error",
     "Name" : "Nomine",
     "Size" : "Dimension",
     "Modified" : "Modificate",
+    "New" : "Nove",
     "File name cannot be empty." : "Le nomine de file non pote esser vacue.",
+    "Upload" : "Incargar",
+    "Text file" : "File de texto",
+    "Folder" : "Dossier",
+    "New folder" : "Nove dossier",
     "A new file or folder has been <strong>created</strong>" : "Un nove file o dossier ha essite <strong>create</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un nove file o dossier ha essite <strong>modificate</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un nove file o dossier ha essite <strong>delite</strong>",
@@ -30,11 +34,7 @@
     "Maximum upload size" : "Dimension maxime de incargamento",
     "Save" : "Salveguardar",
     "Settings" : "Configurationes",
-    "New" : "Nove",
-    "Text file" : "File de texto",
-    "New folder" : "Nove dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Incargar",
+    "Delete" : "Deler",
     "Upload too large" : "Incargamento troppo longe"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js
index d11e9b7a4f..e41d94643a 100644
--- a/apps/files/l10n/id.js
+++ b/apps/files/l10n/id.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Semua berkas",
     "Favorites" : "Favorit",
     "Home" : "Rumah",
+    "Close" : "Tutup",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte",
     "Total file size {size1} exceeds upload limit {size2}" : "Jumlah ukuran berkas {size1} melampaui batas unggah {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ruang bebas tidak mencukupi, Anda mengunggah {size1} tetapi hanya {size2} yang tersisa",
     "Upload cancelled." : "Pengunggahan dibatalkan.",
     "Could not get result from server." : "Tidak mendapatkan hasil dari server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
-    "{new_name} already exists" : "{new_name} sudah ada",
-    "Could not create file" : "Tidak dapat membuat berkas",
-    "Could not create folder" : "Tidak dapat membuat folder",
-    "Rename" : "Ubah nama",
-    "Delete" : "Hapus",
-    "Disconnect storage" : "Memutuskan penyimpaan",
-    "Unshare" : "Batalkan berbagi",
-    "No permission to delete" : "Tidak memiliki hak untuk menghapus",
+    "Actions" : "Tindakan",
     "Download" : "Unduh",
     "Select" : "Pilih",
     "Pending" : "Tertunda",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Kesalahan saat memindahkan berkas.",
     "Error moving file" : "Kesalahan saat memindahkan berkas",
     "Error" : "Kesalahan ",
+    "{new_name} already exists" : "{new_name} sudah ada",
     "Could not rename file" : "Tidak dapat mengubah nama berkas",
+    "Could not create file" : "Tidak dapat membuat berkas",
+    "Could not create folder" : "Tidak dapat membuat folder",
     "Error deleting file." : "Kesalahan saat menghapus berkas.",
     "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'",
     "Name" : "Nama",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Dimodifikasi",
     "_%n folder_::_%n folders_" : ["%n folder"],
     "_%n file_::_%n files_" : ["%n berkas"],
+    "{dirs} and {files}" : "{dirs} dan {files}",
     "You don’t have permission to upload or create files here" : "Anda tidak memiliki akses untuk mengunggah atau membuat berkas disini",
     "_Uploading %n file_::_Uploading %n files_" : ["Mengunggah %n berkas"],
+    "New" : "Baru",
     "\"{name}\" is an invalid file name." : "\"{name}\" adalah nama berkas yang tidak sah.",
     "File name cannot be empty." : "Nama berkas tidak boleh kosong.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Penyimpanan {owner} penuh, berkas tidak dapat diperbarui atau disinkronisasikan lagi!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Penyimpanan {owner} hampir penuh ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["cocok dengan '{filter}'"],
-    "{dirs} and {files}" : "{dirs} dan {files}",
+    "Path" : "Jalur",
+    "_%n byte_::_%n bytes_" : ["%n byte"],
     "Favorited" : "Difavoritkan",
     "Favorite" : "Favorit",
+    "{newname} already exists" : "{newname} sudah ada",
+    "Upload" : "Unggah",
+    "Text file" : "Berkas teks",
+    "New text file.txt" : "Teks baru file.txt",
+    "Folder" : "Folder",
+    "New folder" : "Map baru",
     "An error occurred while trying to update the tags" : "Terjadi kesalahan saat mencoba untuk memperbarui label",
     "A new file or folder has been <strong>created</strong>" : "Sebuah berkas atau folder baru telah <strong>dibuat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Sebuah berkas atau folder telah <strong>diubah</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Penanganan berkas",
     "Maximum upload size" : "Ukuran pengunggahan maksimum",
     "max. possible: " : "Kemungkinan maks.:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Dengan PHP-FPM, nilai ini bisa memerlukan waktu hingga 5 menit untuk berlaku setelah penyimpanan.",
     "Save" : "Simpan",
-    "Can not be edited from here due to insufficient permissions." : "Tidak dapat diidit dari sini karena tidak memiliki izin.",
+    "Can not be edited from here due to insufficient permissions." : "Tidak dapat disunting dari sini karena tidak memiliki izin.",
     "Settings" : "Pengaturan",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>",
-    "New" : "Baru",
-    "New text file" : "Berkas teks baru",
-    "Text file" : "Berkas teks",
-    "New folder" : "Map baru",
-    "Folder" : "Folder",
-    "Upload" : "Unggah",
     "Cancel upload" : "Batal unggah",
     "No files in here" : "Tidak ada berkas disini",
     "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!",
     "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
     "Select all" : "Pilih Semua",
+    "Delete" : "Hapus",
     "Upload too large" : "Yang diunggah terlalu besar",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
     "Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.",
diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json
index f2b557205b..6be0c1a226 100644
--- a/apps/files/l10n/id.json
+++ b/apps/files/l10n/id.json
@@ -27,20 +27,14 @@
     "All files" : "Semua berkas",
     "Favorites" : "Favorit",
     "Home" : "Rumah",
+    "Close" : "Tutup",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte",
     "Total file size {size1} exceeds upload limit {size2}" : "Jumlah ukuran berkas {size1} melampaui batas unggah {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ruang bebas tidak mencukupi, Anda mengunggah {size1} tetapi hanya {size2} yang tersisa",
     "Upload cancelled." : "Pengunggahan dibatalkan.",
     "Could not get result from server." : "Tidak mendapatkan hasil dari server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
-    "{new_name} already exists" : "{new_name} sudah ada",
-    "Could not create file" : "Tidak dapat membuat berkas",
-    "Could not create folder" : "Tidak dapat membuat folder",
-    "Rename" : "Ubah nama",
-    "Delete" : "Hapus",
-    "Disconnect storage" : "Memutuskan penyimpaan",
-    "Unshare" : "Batalkan berbagi",
-    "No permission to delete" : "Tidak memiliki hak untuk menghapus",
+    "Actions" : "Tindakan",
     "Download" : "Unduh",
     "Select" : "Pilih",
     "Pending" : "Tertunda",
@@ -50,7 +44,10 @@
     "Error moving file." : "Kesalahan saat memindahkan berkas.",
     "Error moving file" : "Kesalahan saat memindahkan berkas",
     "Error" : "Kesalahan ",
+    "{new_name} already exists" : "{new_name} sudah ada",
     "Could not rename file" : "Tidak dapat mengubah nama berkas",
+    "Could not create file" : "Tidak dapat membuat berkas",
+    "Could not create folder" : "Tidak dapat membuat folder",
     "Error deleting file." : "Kesalahan saat menghapus berkas.",
     "No entries in this folder match '{filter}'" : "Tidak ada entri di folder ini yang cocok dengan '{filter}'",
     "Name" : "Nama",
@@ -58,8 +55,10 @@
     "Modified" : "Dimodifikasi",
     "_%n folder_::_%n folders_" : ["%n folder"],
     "_%n file_::_%n files_" : ["%n berkas"],
+    "{dirs} and {files}" : "{dirs} dan {files}",
     "You don’t have permission to upload or create files here" : "Anda tidak memiliki akses untuk mengunggah atau membuat berkas disini",
     "_Uploading %n file_::_Uploading %n files_" : ["Mengunggah %n berkas"],
+    "New" : "Baru",
     "\"{name}\" is an invalid file name." : "\"{name}\" adalah nama berkas yang tidak sah.",
     "File name cannot be empty." : "Nama berkas tidak boleh kosong.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Penyimpanan {owner} penuh, berkas tidak dapat diperbarui atau disinkronisasikan lagi!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Penyimpanan {owner} hampir penuh ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["cocok dengan '{filter}'"],
-    "{dirs} and {files}" : "{dirs} dan {files}",
+    "Path" : "Jalur",
+    "_%n byte_::_%n bytes_" : ["%n byte"],
     "Favorited" : "Difavoritkan",
     "Favorite" : "Favorit",
+    "{newname} already exists" : "{newname} sudah ada",
+    "Upload" : "Unggah",
+    "Text file" : "Berkas teks",
+    "New text file.txt" : "Teks baru file.txt",
+    "Folder" : "Folder",
+    "New folder" : "Map baru",
     "An error occurred while trying to update the tags" : "Terjadi kesalahan saat mencoba untuk memperbarui label",
     "A new file or folder has been <strong>created</strong>" : "Sebuah berkas atau folder baru telah <strong>dibuat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Sebuah berkas atau folder telah <strong>diubah</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "Penanganan berkas",
     "Maximum upload size" : "Ukuran pengunggahan maksimum",
     "max. possible: " : "Kemungkinan maks.:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Dengan PHP-FPM, nilai ini bisa memerlukan waktu hingga 5 menit untuk berlaku setelah penyimpanan.",
     "Save" : "Simpan",
-    "Can not be edited from here due to insufficient permissions." : "Tidak dapat diidit dari sini karena tidak memiliki izin.",
+    "Can not be edited from here due to insufficient permissions." : "Tidak dapat disunting dari sini karena tidak memiliki izin.",
     "Settings" : "Pengaturan",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>",
-    "New" : "Baru",
-    "New text file" : "Berkas teks baru",
-    "Text file" : "Berkas teks",
-    "New folder" : "Map baru",
-    "Folder" : "Folder",
-    "Upload" : "Unggah",
     "Cancel upload" : "Batal unggah",
     "No files in here" : "Tidak ada berkas disini",
     "Upload some content or sync with your devices!" : "Unggah beberapa konten dan sinkronisasikan dengan perangkat Anda!",
     "No entries found in this folder" : "Tidak ada entri yang ditemukan dalam folder ini",
     "Select all" : "Pilih Semua",
+    "Delete" : "Hapus",
     "Upload too large" : "Yang diunggah terlalu besar",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
     "Files are being scanned, please wait." : "Berkas sedang dipindai, silakan tunggu.",
diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js
index 6fea601bdf..7ac24eba46 100644
--- a/apps/files/l10n/is.js
+++ b/apps/files/l10n/is.js
@@ -13,33 +13,34 @@ OC.L10N.register(
     "Failed to write to disk" : "Tókst ekki að skrifa á disk",
     "Invalid directory." : "Ógild mappa.",
     "Files" : "Skrár",
+    "Close" : "Loka",
     "Upload cancelled." : "Hætt við innsendingu.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.",
-    "{new_name} already exists" : "{new_name} er þegar til",
-    "Rename" : "Endurskýra",
-    "Delete" : "Eyða",
-    "Unshare" : "Hætta deilingu",
     "Download" : "Niðurhal",
     "Select" : "Velja",
     "Pending" : "Bíður",
     "Error" : "Villa",
+    "{new_name} already exists" : "{new_name} er þegar til",
     "Name" : "Nafn",
     "Size" : "Stærð",
     "Modified" : "Breytt",
+    "New" : "Nýtt",
     "File name cannot be empty." : "Nafn skráar má ekki vera tómt",
+    "Upload" : "Senda inn",
+    "Text file" : "Texta skrá",
+    "Folder" : "Mappa",
     "File handling" : "Meðhöndlun skrár",
     "Maximum upload size" : "Hámarks stærð innsendingar",
     "max. possible: " : "hámark mögulegt: ",
     "Save" : "Vista",
     "Settings" : "Stillingar",
     "WebDAV" : "WebDAV",
-    "New" : "Nýtt",
-    "Text file" : "Texta skrá",
-    "Folder" : "Mappa",
-    "Upload" : "Senda inn",
     "Cancel upload" : "Hætta við innsendingu",
+    "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
+    "Select all" : "Velja allt",
+    "Delete" : "Eyða",
     "Upload too large" : "Innsend skrá er of stór",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
     "Files are being scanned, please wait." : "Verið er að skima skrár, vinsamlegast hinkraðu."
 },
-"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);");
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json
index 1fe2dd93e2..8e723d963a 100644
--- a/apps/files/l10n/is.json
+++ b/apps/files/l10n/is.json
@@ -11,33 +11,34 @@
     "Failed to write to disk" : "Tókst ekki að skrifa á disk",
     "Invalid directory." : "Ógild mappa.",
     "Files" : "Skrár",
+    "Close" : "Loka",
     "Upload cancelled." : "Hætt við innsendingu.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.",
-    "{new_name} already exists" : "{new_name} er þegar til",
-    "Rename" : "Endurskýra",
-    "Delete" : "Eyða",
-    "Unshare" : "Hætta deilingu",
     "Download" : "Niðurhal",
     "Select" : "Velja",
     "Pending" : "Bíður",
     "Error" : "Villa",
+    "{new_name} already exists" : "{new_name} er þegar til",
     "Name" : "Nafn",
     "Size" : "Stærð",
     "Modified" : "Breytt",
+    "New" : "Nýtt",
     "File name cannot be empty." : "Nafn skráar má ekki vera tómt",
+    "Upload" : "Senda inn",
+    "Text file" : "Texta skrá",
+    "Folder" : "Mappa",
     "File handling" : "Meðhöndlun skrár",
     "Maximum upload size" : "Hámarks stærð innsendingar",
     "max. possible: " : "hámark mögulegt: ",
     "Save" : "Vista",
     "Settings" : "Stillingar",
     "WebDAV" : "WebDAV",
-    "New" : "Nýtt",
-    "Text file" : "Texta skrá",
-    "Folder" : "Mappa",
-    "Upload" : "Senda inn",
     "Cancel upload" : "Hætta við innsendingu",
+    "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
+    "Select all" : "Velja allt",
+    "Delete" : "Eyða",
     "Upload too large" : "Innsend skrá er of stór",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
     "Files are being scanned, please wait." : "Verið er að skima skrár, vinsamlegast hinkraðu."
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js
index 2c57c0e5ac..aa92ffc0f7 100644
--- a/apps/files/l10n/it.js
+++ b/apps/files/l10n/it.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Tutti i file",
     "Favorites" : "Preferiti",
     "Home" : "Home",
+    "Close" : "Chiudi",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.",
     "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}",
     "Upload cancelled." : "Caricamento annullato.",
     "Could not get result from server." : "Impossibile ottenere il risultato dal server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
-    "{new_name} already exists" : "{new_name} esiste già",
-    "Could not create file" : "Impossibile creare il file",
-    "Could not create folder" : "Impossibile creare la cartella",
-    "Rename" : "Rinomina",
-    "Delete" : "Elimina",
-    "Disconnect storage" : "Disconnetti archiviazione",
-    "Unshare" : "Rimuovi condivisione",
-    "No permission to delete" : "Nessun permesso per eliminare",
+    "Actions" : "Azioni",
     "Download" : "Scarica",
     "Select" : "Seleziona",
     "Pending" : "In corso",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Errore durante lo spostamento del file.",
     "Error moving file" : "Errore durante lo spostamento del file",
     "Error" : "Errore",
+    "{new_name} already exists" : "{new_name} esiste già",
     "Could not rename file" : "Impossibile rinominare il file",
+    "Could not create file" : "Impossibile creare il file",
+    "Could not create folder" : "Impossibile creare la cartella",
     "Error deleting file." : "Errore durante l'eliminazione del file.",
     "No entries in this folder match '{filter}'" : "Nessuna voce in questa cartella corrisponde a '{filter}'",
     "Name" : "Nome",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Modificato",
     "_%n folder_::_%n folders_" : ["%n cartella","%n cartelle"],
     "_%n file_::_%n files_" : ["%n file","%n file"],
+    "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Qui non hai i permessi di caricare o creare file",
     "_Uploading %n file_::_Uploading %n files_" : ["Caricamento di %n file in corso","Caricamento di %n file in corso"],
+    "New" : "Nuovo",
     "\"{name}\" is an invalid file name." : "\"{name}\" non è un nome file valido.",
     "File name cannot be empty." : "Il nome del file non può essere vuoto.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lo spazio di archiviazione di {owner} è pieno, i file non possono essere più aggiornati o sincronizzati!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione di {owner} è quasi pieno ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["corrispondono a '{filter}'","corrisponde a '{filter}'"],
-    "{dirs} and {files}" : "{dirs} e {files}",
+    "Path" : "Percorso",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n byte"],
     "Favorited" : "Preferiti",
     "Favorite" : "Preferito",
+    "{newname} already exists" : "{newname} esiste già",
+    "Upload" : "Carica",
+    "Text file" : "File di testo",
+    "New text file.txt" : "Nuovo file di testo.txt",
+    "Folder" : "Cartella",
+    "New folder" : "Nuova cartella",
     "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette",
     "A new file or folder has been <strong>created</strong>" : "Un nuovo file o cartella è stato <strong>creato</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un file o una cartella è stato <strong>modificato</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Gestione file",
     "Maximum upload size" : "Dimensione massima caricamento",
     "max. possible: " : "numero mass.: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Con PHP-FPM questo valore potrebbe richiedere fino a 5 minuti perché abbia effetto dopo il salvataggio.",
     "Save" : "Salva",
     "Can not be edited from here due to insufficient permissions." : "Non può essere modificato da qui a causa della mancanza di permessi.",
     "Settings" : "Impostazioni",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>",
-    "New" : "Nuovo",
-    "New text file" : "Nuovo file di testo",
-    "Text file" : "File di testo",
-    "New folder" : "Nuova cartella",
-    "Folder" : "Cartella",
-    "Upload" : "Carica",
     "Cancel upload" : "Annulla caricamento",
     "No files in here" : "Qui non c'è alcun file",
     "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!",
     "No entries found in this folder" : "Nessuna voce trovata in questa cartella",
     "Select all" : "Seleziona tutto",
+    "Delete" : "Elimina",
     "Upload too large" : "Caricamento troppo grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
     "Files are being scanned, please wait." : "Scansione dei file in corso, attendi",
diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json
index 4ebb6a360b..8f18858b2e 100644
--- a/apps/files/l10n/it.json
+++ b/apps/files/l10n/it.json
@@ -27,20 +27,14 @@
     "All files" : "Tutti i file",
     "Favorites" : "Preferiti",
     "Home" : "Home",
+    "Close" : "Chiudi",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.",
     "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}",
     "Upload cancelled." : "Caricamento annullato.",
     "Could not get result from server." : "Impossibile ottenere il risultato dal server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
-    "{new_name} already exists" : "{new_name} esiste già",
-    "Could not create file" : "Impossibile creare il file",
-    "Could not create folder" : "Impossibile creare la cartella",
-    "Rename" : "Rinomina",
-    "Delete" : "Elimina",
-    "Disconnect storage" : "Disconnetti archiviazione",
-    "Unshare" : "Rimuovi condivisione",
-    "No permission to delete" : "Nessun permesso per eliminare",
+    "Actions" : "Azioni",
     "Download" : "Scarica",
     "Select" : "Seleziona",
     "Pending" : "In corso",
@@ -50,7 +44,10 @@
     "Error moving file." : "Errore durante lo spostamento del file.",
     "Error moving file" : "Errore durante lo spostamento del file",
     "Error" : "Errore",
+    "{new_name} already exists" : "{new_name} esiste già",
     "Could not rename file" : "Impossibile rinominare il file",
+    "Could not create file" : "Impossibile creare il file",
+    "Could not create folder" : "Impossibile creare la cartella",
     "Error deleting file." : "Errore durante l'eliminazione del file.",
     "No entries in this folder match '{filter}'" : "Nessuna voce in questa cartella corrisponde a '{filter}'",
     "Name" : "Nome",
@@ -58,8 +55,10 @@
     "Modified" : "Modificato",
     "_%n folder_::_%n folders_" : ["%n cartella","%n cartelle"],
     "_%n file_::_%n files_" : ["%n file","%n file"],
+    "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Qui non hai i permessi di caricare o creare file",
     "_Uploading %n file_::_Uploading %n files_" : ["Caricamento di %n file in corso","Caricamento di %n file in corso"],
+    "New" : "Nuovo",
     "\"{name}\" is an invalid file name." : "\"{name}\" non è un nome file valido.",
     "File name cannot be empty." : "Il nome del file non può essere vuoto.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lo spazio di archiviazione di {owner} è pieno, i file non possono essere più aggiornati o sincronizzati!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione di {owner} è quasi pieno ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["corrispondono a '{filter}'","corrisponde a '{filter}'"],
-    "{dirs} and {files}" : "{dirs} e {files}",
+    "Path" : "Percorso",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n byte"],
     "Favorited" : "Preferiti",
     "Favorite" : "Preferito",
+    "{newname} already exists" : "{newname} esiste già",
+    "Upload" : "Carica",
+    "Text file" : "File di testo",
+    "New text file.txt" : "Nuovo file di testo.txt",
+    "Folder" : "Cartella",
+    "New folder" : "Nuova cartella",
     "An error occurred while trying to update the tags" : "Si è verificato un errore durante il tentativo di aggiornare le etichette",
     "A new file or folder has been <strong>created</strong>" : "Un nuovo file o cartella è stato <strong>creato</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un file o una cartella è stato <strong>modificato</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "Gestione file",
     "Maximum upload size" : "Dimensione massima caricamento",
     "max. possible: " : "numero mass.: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Con PHP-FPM questo valore potrebbe richiedere fino a 5 minuti perché abbia effetto dopo il salvataggio.",
     "Save" : "Salva",
     "Can not be edited from here due to insufficient permissions." : "Non può essere modificato da qui a causa della mancanza di permessi.",
     "Settings" : "Impostazioni",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>",
-    "New" : "Nuovo",
-    "New text file" : "Nuovo file di testo",
-    "Text file" : "File di testo",
-    "New folder" : "Nuova cartella",
-    "Folder" : "Cartella",
-    "Upload" : "Carica",
     "Cancel upload" : "Annulla caricamento",
     "No files in here" : "Qui non c'è alcun file",
     "Upload some content or sync with your devices!" : "Carica alcuni contenuti o sincronizza con i tuoi dispositivi!",
     "No entries found in this folder" : "Nessuna voce trovata in questa cartella",
     "Select all" : "Seleziona tutto",
+    "Delete" : "Elimina",
     "Upload too large" : "Caricamento troppo grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
     "Files are being scanned, please wait." : "Scansione dei file in corso, attendi",
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
index 5a0b4247e9..91e75e6e76 100644
--- a/apps/files/l10n/ja.js
+++ b/apps/files/l10n/ja.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "すべてのファイル",
     "Favorites" : "お気に入り",
     "Home" : "ホーム",
+    "Close" : "閉じる",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません",
     "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。",
     "Upload cancelled." : "アップロードはキャンセルされました。",
     "Could not get result from server." : "サーバーから結果を取得できませんでした。",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
-    "{new_name} already exists" : "{new_name} はすでに存在します",
-    "Could not create file" : "ファイルを作成できませんでした",
-    "Could not create folder" : "フォルダーを作成できませんでした",
-    "Rename" : "名前の変更",
-    "Delete" : "削除",
-    "Disconnect storage" : "ストレージを切断する",
-    "Unshare" : "共有解除",
-    "No permission to delete" : "削除する権限がありません",
+    "Actions" : "アクション",
     "Download" : "ダウンロード",
     "Select" : "選択",
     "Pending" : "中断",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "ファイル移動でエラー",
     "Error moving file" : "ファイルの移動エラー",
     "Error" : "エラー",
+    "{new_name} already exists" : "{new_name} はすでに存在します",
     "Could not rename file" : "ファイルの名前変更ができませんでした",
+    "Could not create file" : "ファイルを作成できませんでした",
+    "Could not create folder" : "フォルダーを作成できませんでした",
     "Error deleting file." : "ファイルの削除エラー。",
     "No entries in this folder match '{filter}'" : "このフォルダー内で '{filter}' にマッチするものはありません",
     "Name" : "名前",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "更新日時",
     "_%n folder_::_%n folders_" : ["%n 個のフォルダー"],
     "_%n file_::_%n files_" : ["%n 個のファイル"],
+    "{dirs} and {files}" : "{dirs} と {files}",
     "You don’t have permission to upload or create files here" : "ここにファイルをアップロードもしくは作成する権限がありません",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 個のファイルをアップロード中"],
+    "New" : "新規作成",
     "\"{name}\" is an invalid file name." : "\"{name}\" は無効なファイル名です。",
     "File name cannot be empty." : "ファイル名を空にすることはできません。",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} のストレージは一杯です。ファイルの更新と同期はもうできません！",
@@ -69,13 +68,18 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} のストレージはほぼ一杯です。({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "ストレージがほぼ一杯です（{usedSpacePercent}%）",
     "_matches '{filter}'_::_match '{filter}'_" : [" '{filter}' にマッチ"],
-    "{dirs} and {files}" : "{dirs} と {files}",
+    "Path" : "Path",
+    "_%n byte_::_%n bytes_" : ["%n バイト"],
     "Favorited" : "お気に入り済",
     "Favorite" : "お気に入り",
+    "Upload" : "アップロード",
+    "Text file" : "テキストファイル",
+    "Folder" : "フォルダー",
+    "New folder" : "新しいフォルダー",
     "An error occurred while trying to update the tags" : "タグを更新する際にエラーが発生しました",
     "A new file or folder has been <strong>created</strong>" : "新しいファイルまたはフォルダーを<strong>作成</strong>したとき",
     "A file or folder has been <strong>changed</strong>" : "ファイルまたはフォルダーを<strong>変更</strong>したとき",
-    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "<strong>お気に入りファイル</strong>に対する作成と変更の通知は制限されています。<em>(表示のみ)</em>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "<strong>お気に入りファイル</strong>の作成と変更の通知を制限する<em>(ストリームのみ)</em>",
     "A file or folder has been <strong>deleted</strong>" : "ファイルまたはフォルダーを<strong>削除</strong>したとき",
     "A file or folder has been <strong>restored</strong>" : "ファイルまたはフォルダーを<strong>復元</strong>したとき",
     "You created %1$s" : "あなたは %1$s を作成しました",
@@ -93,22 +97,18 @@ OC.L10N.register(
     "File handling" : "ファイル操作",
     "Maximum upload size" : "最大アップロードサイズ",
     "max. possible: " : "最大容量: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM の場合は値を変更後、反映されるのに5分程度かかります。",
     "Save" : "保存",
     "Can not be edited from here due to insufficient permissions." : "権限不足のため直接編集することはできません。",
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">WebDAV経由でのファイルアクセス</a>にはこのアドレスを利用してください",
-    "New" : "新規作成",
-    "New text file" : "新規のテキストファイル作成",
-    "Text file" : "テキストファイル",
-    "New folder" : "新しいフォルダー",
-    "Folder" : "フォルダー",
-    "Upload" : "アップロード",
     "Cancel upload" : "アップロードをキャンセル",
     "No files in here" : "ファイルがありません",
     "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。",
     "No entries found in this folder" : "このフォルダーにはエントリーがありません",
     "Select all" : "すべて選択",
+    "Delete" : "削除",
     "Upload too large" : "アップロードには大きすぎます。",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
     "Files are being scanned, please wait." : "ファイルをスキャンしています、しばらくお待ちください。",
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
index bcc9c1c77a..7c0c94c034 100644
--- a/apps/files/l10n/ja.json
+++ b/apps/files/l10n/ja.json
@@ -27,20 +27,14 @@
     "All files" : "すべてのファイル",
     "Favorites" : "お気に入り",
     "Home" : "ホーム",
+    "Close" : "閉じる",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません",
     "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。",
     "Upload cancelled." : "アップロードはキャンセルされました。",
     "Could not get result from server." : "サーバーから結果を取得できませんでした。",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
-    "{new_name} already exists" : "{new_name} はすでに存在します",
-    "Could not create file" : "ファイルを作成できませんでした",
-    "Could not create folder" : "フォルダーを作成できませんでした",
-    "Rename" : "名前の変更",
-    "Delete" : "削除",
-    "Disconnect storage" : "ストレージを切断する",
-    "Unshare" : "共有解除",
-    "No permission to delete" : "削除する権限がありません",
+    "Actions" : "アクション",
     "Download" : "ダウンロード",
     "Select" : "選択",
     "Pending" : "中断",
@@ -50,7 +44,10 @@
     "Error moving file." : "ファイル移動でエラー",
     "Error moving file" : "ファイルの移動エラー",
     "Error" : "エラー",
+    "{new_name} already exists" : "{new_name} はすでに存在します",
     "Could not rename file" : "ファイルの名前変更ができませんでした",
+    "Could not create file" : "ファイルを作成できませんでした",
+    "Could not create folder" : "フォルダーを作成できませんでした",
     "Error deleting file." : "ファイルの削除エラー。",
     "No entries in this folder match '{filter}'" : "このフォルダー内で '{filter}' にマッチするものはありません",
     "Name" : "名前",
@@ -58,8 +55,10 @@
     "Modified" : "更新日時",
     "_%n folder_::_%n folders_" : ["%n 個のフォルダー"],
     "_%n file_::_%n files_" : ["%n 個のファイル"],
+    "{dirs} and {files}" : "{dirs} と {files}",
     "You don’t have permission to upload or create files here" : "ここにファイルをアップロードもしくは作成する権限がありません",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 個のファイルをアップロード中"],
+    "New" : "新規作成",
     "\"{name}\" is an invalid file name." : "\"{name}\" は無効なファイル名です。",
     "File name cannot be empty." : "ファイル名を空にすることはできません。",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} のストレージは一杯です。ファイルの更新と同期はもうできません！",
@@ -67,13 +66,18 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} のストレージはほぼ一杯です。({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "ストレージがほぼ一杯です（{usedSpacePercent}%）",
     "_matches '{filter}'_::_match '{filter}'_" : [" '{filter}' にマッチ"],
-    "{dirs} and {files}" : "{dirs} と {files}",
+    "Path" : "Path",
+    "_%n byte_::_%n bytes_" : ["%n バイト"],
     "Favorited" : "お気に入り済",
     "Favorite" : "お気に入り",
+    "Upload" : "アップロード",
+    "Text file" : "テキストファイル",
+    "Folder" : "フォルダー",
+    "New folder" : "新しいフォルダー",
     "An error occurred while trying to update the tags" : "タグを更新する際にエラーが発生しました",
     "A new file or folder has been <strong>created</strong>" : "新しいファイルまたはフォルダーを<strong>作成</strong>したとき",
     "A file or folder has been <strong>changed</strong>" : "ファイルまたはフォルダーを<strong>変更</strong>したとき",
-    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "<strong>お気に入りファイル</strong>に対する作成と変更の通知は制限されています。<em>(表示のみ)</em>",
+    "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "<strong>お気に入りファイル</strong>の作成と変更の通知を制限する<em>(ストリームのみ)</em>",
     "A file or folder has been <strong>deleted</strong>" : "ファイルまたはフォルダーを<strong>削除</strong>したとき",
     "A file or folder has been <strong>restored</strong>" : "ファイルまたはフォルダーを<strong>復元</strong>したとき",
     "You created %1$s" : "あなたは %1$s を作成しました",
@@ -91,22 +95,18 @@
     "File handling" : "ファイル操作",
     "Maximum upload size" : "最大アップロードサイズ",
     "max. possible: " : "最大容量: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM の場合は値を変更後、反映されるのに5分程度かかります。",
     "Save" : "保存",
     "Can not be edited from here due to insufficient permissions." : "権限不足のため直接編集することはできません。",
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">WebDAV経由でのファイルアクセス</a>にはこのアドレスを利用してください",
-    "New" : "新規作成",
-    "New text file" : "新規のテキストファイル作成",
-    "Text file" : "テキストファイル",
-    "New folder" : "新しいフォルダー",
-    "Folder" : "フォルダー",
-    "Upload" : "アップロード",
     "Cancel upload" : "アップロードをキャンセル",
     "No files in here" : "ファイルがありません",
     "Upload some content or sync with your devices!" : "何かコンテンツをアップロードするか、デバイスからファイルを同期してください。",
     "No entries found in this folder" : "このフォルダーにはエントリーがありません",
     "Select all" : "すべて選択",
+    "Delete" : "削除",
     "Upload too large" : "アップロードには大きすぎます。",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
     "Files are being scanned, please wait." : "ファイルをスキャンしています、しばらくお待ちください。",
diff --git a/apps/files/l10n/ka_GE.js b/apps/files/l10n/ka_GE.js
index e60d675c0d..33135feb7c 100644
--- a/apps/files/l10n/ka_GE.js
+++ b/apps/files/l10n/ka_GE.js
@@ -17,34 +17,34 @@ OC.L10N.register(
     "Files" : "ფაილები",
     "Favorites" : "ფავორიტები",
     "Home" : "სახლი",
+    "Close" : "დახურვა",
     "Upload cancelled." : "ატვირთვა შეჩერებულ იქნა.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
-    "{new_name} already exists" : "{new_name} უკვე არსებობს",
-    "Rename" : "გადარქმევა",
-    "Delete" : "წაშლა",
-    "Unshare" : "გაუზიარებადი",
+    "Actions" : "მოქმედებები",
     "Download" : "ჩამოტვირთვა",
     "Pending" : "მოცდის რეჟიმში",
     "Error" : "შეცდომა",
+    "{new_name} already exists" : "{new_name} უკვე არსებობს",
     "Name" : "სახელი",
     "Size" : "ზომა",
     "Modified" : "შეცვლილია",
+    "New" : "ახალი",
     "File name cannot be empty." : "ფაილის სახელი არ შეიძლება იყოს ცარიელი.",
     "Your storage is full, files can not be updated or synced anymore!" : "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!",
     "Your storage is almost full ({usedSpacePercent}%)" : "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)",
     "Favorite" : "ფავორიტი",
+    "Upload" : "ატვირთვა",
+    "Text file" : "ტექსტური ფაილი",
+    "Folder" : "საქაღალდე",
+    "New folder" : "ახალი ფოლდერი",
     "File handling" : "ფაილის დამუშავება",
     "Maximum upload size" : "მაქსიმუმ ატვირთის ზომა",
     "max. possible: " : "მაქს. შესაძლებელი:",
     "Save" : "შენახვა",
     "Settings" : "პარამეტრები",
     "WebDAV" : "WebDAV",
-    "New" : "ახალი",
-    "Text file" : "ტექსტური ფაილი",
-    "New folder" : "ახალი ფოლდერი",
-    "Folder" : "საქაღალდე",
-    "Upload" : "ატვირთვა",
     "Cancel upload" : "ატვირთვის გაუქმება",
+    "Delete" : "წაშლა",
     "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.",
     "Files are being scanned, please wait." : "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
diff --git a/apps/files/l10n/ka_GE.json b/apps/files/l10n/ka_GE.json
index 699872a008..ef3f109d30 100644
--- a/apps/files/l10n/ka_GE.json
+++ b/apps/files/l10n/ka_GE.json
@@ -15,34 +15,34 @@
     "Files" : "ფაილები",
     "Favorites" : "ფავორიტები",
     "Home" : "სახლი",
+    "Close" : "დახურვა",
     "Upload cancelled." : "ატვირთვა შეჩერებულ იქნა.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
-    "{new_name} already exists" : "{new_name} უკვე არსებობს",
-    "Rename" : "გადარქმევა",
-    "Delete" : "წაშლა",
-    "Unshare" : "გაუზიარებადი",
+    "Actions" : "მოქმედებები",
     "Download" : "ჩამოტვირთვა",
     "Pending" : "მოცდის რეჟიმში",
     "Error" : "შეცდომა",
+    "{new_name} already exists" : "{new_name} უკვე არსებობს",
     "Name" : "სახელი",
     "Size" : "ზომა",
     "Modified" : "შეცვლილია",
+    "New" : "ახალი",
     "File name cannot be empty." : "ფაილის სახელი არ შეიძლება იყოს ცარიელი.",
     "Your storage is full, files can not be updated or synced anymore!" : "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!",
     "Your storage is almost full ({usedSpacePercent}%)" : "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)",
     "Favorite" : "ფავორიტი",
+    "Upload" : "ატვირთვა",
+    "Text file" : "ტექსტური ფაილი",
+    "Folder" : "საქაღალდე",
+    "New folder" : "ახალი ფოლდერი",
     "File handling" : "ფაილის დამუშავება",
     "Maximum upload size" : "მაქსიმუმ ატვირთის ზომა",
     "max. possible: " : "მაქს. შესაძლებელი:",
     "Save" : "შენახვა",
     "Settings" : "პარამეტრები",
     "WebDAV" : "WebDAV",
-    "New" : "ახალი",
-    "Text file" : "ტექსტური ფაილი",
-    "New folder" : "ახალი ფოლდერი",
-    "Folder" : "საქაღალდე",
-    "Upload" : "ატვირთვა",
     "Cancel upload" : "ატვირთვის გაუქმება",
+    "Delete" : "წაშლა",
     "Upload too large" : "ასატვირთი ფაილი ძალიან დიდია",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.",
     "Files are being scanned, please wait." : "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
diff --git a/apps/files/l10n/km.js b/apps/files/l10n/km.js
index 2bf4c3dd82..6b8517e722 100644
--- a/apps/files/l10n/km.js
+++ b/apps/files/l10n/km.js
@@ -7,18 +7,21 @@ OC.L10N.register(
     "No file was uploaded. Unknown error" : "មិន​មាន​ឯកសារ​ដែល​បាន​ផ្ទុក​ឡើង។ មិន​ស្គាល់​កំហុស",
     "There is no error, the file uploaded with success" : "មិន​មាន​កំហុស​អ្វី​ទេ ហើយ​ឯកសារ​ត្រូវ​បាន​ផ្ទុកឡើង​ដោយ​ជោគជ័យ",
     "Files" : "ឯកសារ",
+    "Close" : "បិទ",
     "Upload cancelled." : "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។",
-    "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
-    "Rename" : "ប្ដូរ​ឈ្មោះ",
-    "Delete" : "លុប",
-    "Unshare" : "លែង​ចែក​រំលែក",
     "Download" : "ទាញយក",
     "Pending" : "កំពុង​រង់ចាំ",
     "Error" : "កំហុស",
+    "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
     "Name" : "ឈ្មោះ",
     "Size" : "ទំហំ",
     "Modified" : "បាន​កែ​ប្រែ",
+    "New" : "ថ្មី",
     "File name cannot be empty." : "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទេ​បាន​ឡើយ។",
+    "Upload" : "ផ្ទុក​ឡើង",
+    "Text file" : "ឯកសារ​អក្សរ",
+    "Folder" : "ថត",
+    "New folder" : "ថត​ថ្មី",
     "You created %1$s" : "អ្នក​បាន​បង្កើត %1$s",
     "%2$s created %1$s" : "%2$s បាន​បង្កើត %1$s",
     "You changed %1$s" : "អ្នក​បាន​ផ្លាស់​ប្ដូរ %1$s",
@@ -29,12 +32,8 @@ OC.L10N.register(
     "Save" : "រក្សាទុក",
     "Settings" : "ការកំណត់",
     "WebDAV" : "WebDAV",
-    "New" : "ថ្មី",
-    "Text file" : "ឯកសារ​អក្សរ",
-    "New folder" : "ថត​ថ្មី",
-    "Folder" : "ថត",
-    "Upload" : "ផ្ទុក​ឡើង",
     "Cancel upload" : "បោះបង់​ការ​ផ្ទុកឡើង",
+    "Delete" : "លុប",
     "Upload too large" : "ផ្ទុក​ឡើង​ធំ​ពេក"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files/l10n/km.json b/apps/files/l10n/km.json
index de64f220ff..ebbb9a8b4a 100644
--- a/apps/files/l10n/km.json
+++ b/apps/files/l10n/km.json
@@ -5,18 +5,21 @@
     "No file was uploaded. Unknown error" : "មិន​មាន​ឯកសារ​ដែល​បាន​ផ្ទុក​ឡើង។ មិន​ស្គាល់​កំហុស",
     "There is no error, the file uploaded with success" : "មិន​មាន​កំហុស​អ្វី​ទេ ហើយ​ឯកសារ​ត្រូវ​បាន​ផ្ទុកឡើង​ដោយ​ជោគជ័យ",
     "Files" : "ឯកសារ",
+    "Close" : "បិទ",
     "Upload cancelled." : "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។",
-    "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
-    "Rename" : "ប្ដូរ​ឈ្មោះ",
-    "Delete" : "លុប",
-    "Unshare" : "លែង​ចែក​រំលែក",
     "Download" : "ទាញយក",
     "Pending" : "កំពុង​រង់ចាំ",
     "Error" : "កំហុស",
+    "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
     "Name" : "ឈ្មោះ",
     "Size" : "ទំហំ",
     "Modified" : "បាន​កែ​ប្រែ",
+    "New" : "ថ្មី",
     "File name cannot be empty." : "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទេ​បាន​ឡើយ។",
+    "Upload" : "ផ្ទុក​ឡើង",
+    "Text file" : "ឯកសារ​អក្សរ",
+    "Folder" : "ថត",
+    "New folder" : "ថត​ថ្មី",
     "You created %1$s" : "អ្នក​បាន​បង្កើត %1$s",
     "%2$s created %1$s" : "%2$s បាន​បង្កើត %1$s",
     "You changed %1$s" : "អ្នក​បាន​ផ្លាស់​ប្ដូរ %1$s",
@@ -27,12 +30,8 @@
     "Save" : "រក្សាទុក",
     "Settings" : "ការកំណត់",
     "WebDAV" : "WebDAV",
-    "New" : "ថ្មី",
-    "Text file" : "ឯកសារ​អក្សរ",
-    "New folder" : "ថត​ថ្មី",
-    "Folder" : "ថត",
-    "Upload" : "ផ្ទុក​ឡើង",
     "Cancel upload" : "បោះបង់​ការ​ផ្ទុកឡើង",
+    "Delete" : "លុប",
     "Upload too large" : "ផ្ទុក​ឡើង​ធំ​ពេក"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/kn.js b/apps/files/l10n/kn.js
index a61176b1fa..9bd8982fda 100644
--- a/apps/files/l10n/kn.js
+++ b/apps/files/l10n/kn.js
@@ -25,15 +25,9 @@ OC.L10N.register(
     "All files" : "ಎಲ್ಲಾ ಕಡತಗಳು",
     "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
     "Home" : "ಮುಖಪುಟ",
+    "Close" : "ಮುಚ್ಚು",
     "Upload cancelled." : "ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದು ಮಾಡಲಾಯಿತು.",
     "Could not get result from server." : "ಪರಿಚಾರಕ ಕಣಕದಿಂದ ಫಲಿತಾಂಶವನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.",
-    "{new_name} already exists" : "ಈಗಾಗಲೇ {new_name}  ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ",
-    "Could not create file" : "ಕಡತ ರಚಿಸಲಾಗಲಿಲ್ಲ",
-    "Could not create folder" : "ಕೋಶವನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ",
-    "Rename" : "ಮರುಹೆಸರಿಸು",
-    "Delete" : "ಅಳಿಸಿ",
-    "Disconnect storage" : "ಸಂಗ್ರಹ ಸಾಧನವನ್ನು ತೆಗೆದುಹಾಕಿ",
-    "Unshare" : "ಹಂಚಿಕೆಯನ್ನು ಹಿಂತೆಗೆ",
     "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ",
     "Select" : "ಆಯ್ಕೆ ಮಾಡಿ",
     "Pending" : "ಬಾಕಿ ಇದೆ",
@@ -41,7 +35,10 @@ OC.L10N.register(
     "Error moving file." : "ಕಡತದ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸುವಾಗ ದೋಷವಾಗಿದೆ.",
     "Error moving file" : "ಕಡತದ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸುವಾಗ ದೋಷವಾಗಿದೆ",
     "Error" : "ತಪ್ಪಾಗಿದೆ",
+    "{new_name} already exists" : "ಈಗಾಗಲೇ {new_name}  ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ",
     "Could not rename file" : "ಕಡತ ಮರುಹೆಸರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ",
+    "Could not create file" : "ಕಡತ ರಚಿಸಲಾಗಲಿಲ್ಲ",
+    "Could not create folder" : "ಕೋಶವನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ",
     "Error deleting file." : "ಕಡತವನ್ನು ಅಳಿಸುವಲ್ಲಿ ಲೋಪವಾದೆ",
     "Name" : "ಹೆಸರು",
     "Size" : " ಪ್ರಮಾಣ",
@@ -50,9 +47,14 @@ OC.L10N.register(
     "_%n file_::_%n files_" : ["%n ಕಡತ"],
     "You don’t have permission to upload or create files here" : "ನಿಮಗೆ ಇಲ್ಲಿ ಅಪ್ಲೋಡ್ ಅಥವಾ ಕಡತಗಳನ್ನು ರಚಿಸವ ಅನುಮತಿ ಇಲ್ಲ",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 'ನೆ ಕಡತವನ್ನು ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ"],
+    "New" : "ಹೊಸ",
     "File name cannot be empty." : "ಕಡತ ಹೆಸರು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.",
     "Favorited" : "ಅಚ್ಚುಮೆಚ್ಚಿನವು",
     "Favorite" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
+    "Upload" : "ವರ್ಗಾಯಿಸಿ",
+    "Text file" : "ಸರಳಾಕ್ಷರದ ಕಡತ",
+    "Folder" : "ಕಡತಕೋಶ",
+    "New folder" : "ಹೊಸ ಕಡತಕೋಶ",
     "Upload (max. %s)" : "ವರ್ಗಾವಣೆ (ಗರಿಷ್ಠ %s)",
     "File handling" : "ಕಡತ ನಿರ್ವಹಣೆ",
     "Maximum upload size" : "ಗರಿಷ್ಠ ವರ್ಗಾವಣೆ ಗಾತ್ರ",
@@ -60,14 +62,9 @@ OC.L10N.register(
     "Save" : "ಉಳಿಸಿ",
     "Settings" : "ಆಯ್ಕೆ",
     "WebDAV" : "WebDAV",
-    "New" : "ಹೊಸ",
-    "New text file" : "ಹೊಸ ಸರಳಾಕ್ಷರದ ಕಡತ ",
-    "Text file" : "ಸರಳಾಕ್ಷರದ ಕಡತ",
-    "New folder" : "ಹೊಸ ಕಡತಕೋಶ",
-    "Folder" : "ಕಡತಕೋಶ",
-    "Upload" : "ವರ್ಗಾಯಿಸಿ",
     "Cancel upload" : "ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ",
     "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ",
+    "Delete" : "ಅಳಿಸಿ",
     "Upload too large" : "ದೊಡ್ಡ ಪ್ರಮಾಣದ ಪ್ರತಿಗಳನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಲು ಸಾದ್ಯವಿಲ್ಲ",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ನೀವು ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ಕಡತಗಳ ಗಾತ್ರ, ಈ ಗಣಕ ಕೋಶದ ಗರಿಷ್ಠ ಕಡತ ಮೀತಿಯಾನ್ನು ಮೀರುವಂತಿಲ್ಲ.",
     "Files are being scanned, please wait." : "ಕಡತಗಳನ್ನು ಪರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ, ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ.",
diff --git a/apps/files/l10n/kn.json b/apps/files/l10n/kn.json
index 8fb048bcb2..803b1c87cf 100644
--- a/apps/files/l10n/kn.json
+++ b/apps/files/l10n/kn.json
@@ -23,15 +23,9 @@
     "All files" : "ಎಲ್ಲಾ ಕಡತಗಳು",
     "Favorites" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
     "Home" : "ಮುಖಪುಟ",
+    "Close" : "ಮುಚ್ಚು",
     "Upload cancelled." : "ವರ್ಗಾವಣೆಯನ್ನು ರದ್ದು ಮಾಡಲಾಯಿತು.",
     "Could not get result from server." : "ಪರಿಚಾರಕ ಕಣಕದಿಂದ ಫಲಿತಾಂಶವನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ.",
-    "{new_name} already exists" : "ಈಗಾಗಲೇ {new_name}  ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ",
-    "Could not create file" : "ಕಡತ ರಚಿಸಲಾಗಲಿಲ್ಲ",
-    "Could not create folder" : "ಕೋಶವನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ",
-    "Rename" : "ಮರುಹೆಸರಿಸು",
-    "Delete" : "ಅಳಿಸಿ",
-    "Disconnect storage" : "ಸಂಗ್ರಹ ಸಾಧನವನ್ನು ತೆಗೆದುಹಾಕಿ",
-    "Unshare" : "ಹಂಚಿಕೆಯನ್ನು ಹಿಂತೆಗೆ",
     "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ",
     "Select" : "ಆಯ್ಕೆ ಮಾಡಿ",
     "Pending" : "ಬಾಕಿ ಇದೆ",
@@ -39,7 +33,10 @@
     "Error moving file." : "ಕಡತದ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸುವಾಗ ದೋಷವಾಗಿದೆ.",
     "Error moving file" : "ಕಡತದ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸುವಾಗ ದೋಷವಾಗಿದೆ",
     "Error" : "ತಪ್ಪಾಗಿದೆ",
+    "{new_name} already exists" : "ಈಗಾಗಲೇ {new_name}  ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ",
     "Could not rename file" : "ಕಡತ ಮರುಹೆಸರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ",
+    "Could not create file" : "ಕಡತ ರಚಿಸಲಾಗಲಿಲ್ಲ",
+    "Could not create folder" : "ಕೋಶವನ್ನು ರಚಿಸಲಾಗಿಲ್ಲ",
     "Error deleting file." : "ಕಡತವನ್ನು ಅಳಿಸುವಲ್ಲಿ ಲೋಪವಾದೆ",
     "Name" : "ಹೆಸರು",
     "Size" : " ಪ್ರಮಾಣ",
@@ -48,9 +45,14 @@
     "_%n file_::_%n files_" : ["%n ಕಡತ"],
     "You don’t have permission to upload or create files here" : "ನಿಮಗೆ ಇಲ್ಲಿ ಅಪ್ಲೋಡ್ ಅಥವಾ ಕಡತಗಳನ್ನು ರಚಿಸವ ಅನುಮತಿ ಇಲ್ಲ",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 'ನೆ ಕಡತವನ್ನು ವರ್ಗಾಯಿಸಲಾಗುತ್ತಿದೆ"],
+    "New" : "ಹೊಸ",
     "File name cannot be empty." : "ಕಡತ ಹೆಸರು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.",
     "Favorited" : "ಅಚ್ಚುಮೆಚ್ಚಿನವು",
     "Favorite" : "ಅಚ್ಚುಮೆಚ್ಚಿನ",
+    "Upload" : "ವರ್ಗಾಯಿಸಿ",
+    "Text file" : "ಸರಳಾಕ್ಷರದ ಕಡತ",
+    "Folder" : "ಕಡತಕೋಶ",
+    "New folder" : "ಹೊಸ ಕಡತಕೋಶ",
     "Upload (max. %s)" : "ವರ್ಗಾವಣೆ (ಗರಿಷ್ಠ %s)",
     "File handling" : "ಕಡತ ನಿರ್ವಹಣೆ",
     "Maximum upload size" : "ಗರಿಷ್ಠ ವರ್ಗಾವಣೆ ಗಾತ್ರ",
@@ -58,14 +60,9 @@
     "Save" : "ಉಳಿಸಿ",
     "Settings" : "ಆಯ್ಕೆ",
     "WebDAV" : "WebDAV",
-    "New" : "ಹೊಸ",
-    "New text file" : "ಹೊಸ ಸರಳಾಕ್ಷರದ ಕಡತ ",
-    "Text file" : "ಸರಳಾಕ್ಷರದ ಕಡತ",
-    "New folder" : "ಹೊಸ ಕಡತಕೋಶ",
-    "Folder" : "ಕಡತಕೋಶ",
-    "Upload" : "ವರ್ಗಾಯಿಸಿ",
     "Cancel upload" : "ವರ್ಗಾವಣೆ ರದ್ದು ಮಾಡಿ",
     "Select all" : "ಎಲ್ಲಾ ಆಯ್ಕೆ ಮಾಡಿ",
+    "Delete" : "ಅಳಿಸಿ",
     "Upload too large" : "ದೊಡ್ಡ ಪ್ರಮಾಣದ ಪ್ರತಿಗಳನ್ನು ವರ್ಗಾವಣೆ ಮಾಡಲು ಸಾದ್ಯವಿಲ್ಲ",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ನೀವು ವರ್ಗಾಯಿಸಲು ಪ್ರಯತ್ನಿಸುತ್ತಿರುವ ಕಡತಗಳ ಗಾತ್ರ, ಈ ಗಣಕ ಕೋಶದ ಗರಿಷ್ಠ ಕಡತ ಮೀತಿಯಾನ್ನು ಮೀರುವಂತಿಲ್ಲ.",
     "Files are being scanned, please wait." : "ಕಡತಗಳನ್ನು ಪರೀಕ್ಷಿಸಲಾಗುತ್ತಿದೆ, ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ.",
diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js
index a29ef613da..709e0faa0c 100644
--- a/apps/files/l10n/ko.js
+++ b/apps/files/l10n/ko.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "모든 파일",
     "Favorites" : "즐겨찾기",
     "Home" : "가정",
+    "Close" : "닫기",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.",
     "Total file size {size1} exceeds upload limit {size2}" : "총 파일 크기 {size1}이(가) 업로드 제한 {size2}을(를) 초과함",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "빈 공간이 부족합니다. 업로드할 파일 크기는 {size1}이지만 현재 {size2}만큼 비었습니다",
     "Upload cancelled." : "업로드가 취소되었습니다.",
     "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
-    "{new_name} already exists" : "{new_name}이(가) 이미 존재함",
-    "Could not create file" : "파일을 만들 수 없음",
-    "Could not create folder" : "폴더를 만들 수 없음",
-    "Rename" : "이름 바꾸기",
-    "Delete" : "삭제",
-    "Disconnect storage" : "저장소 연결 해제",
-    "Unshare" : "공유 해제",
-    "No permission to delete" : "삭제할 권한 없음",
+    "Actions" : "작업",
     "Download" : "다운로드",
     "Select" : "선택",
     "Pending" : "대기 중",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "파일 이동 오류.",
     "Error moving file" : "파일 이동 오류",
     "Error" : "오류",
+    "{new_name} already exists" : "{new_name}이(가) 이미 존재함",
     "Could not rename file" : "이름을 변경할 수 없음",
+    "Could not create file" : "파일을 만들 수 없음",
+    "Could not create folder" : "폴더를 만들 수 없음",
     "Error deleting file." : "파일 삭제 오류.",
     "No entries in this folder match '{filter}'" : "이 폴더에 '{filter}'와(과) 일치하는 항목 없음",
     "Name" : "이름",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "수정됨",
     "_%n folder_::_%n folders_" : ["폴더 %n개"],
     "_%n file_::_%n files_" : ["파일 %n개"],
+    "{dirs} and {files}" : "{dirs} 그리고 {files}",
     "You don’t have permission to upload or create files here" : "여기에 파일을 업로드하거나 만들 권한이 없습니다",
     "_Uploading %n file_::_Uploading %n files_" : ["파일 %n개 업로드 중"],
+    "New" : "새로 만들기",
     "\"{name}\" is an invalid file name." : "\"{name}\"은(는) 잘못된 파일 이름입니다.",
     "File name cannot be empty." : "파일 이름이 비어 있을 수 없습니다.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner}의 저장소가 가득 찼습니다. 파일을 더 이상 업데이트하거나 동기화할 수 없습니다!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner}의 저장 공간이 거의 가득 찼습니다({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "저장 공간이 거의 가득 찼습니다({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}'와(과) 일치"],
-    "{dirs} and {files}" : "{dirs} 그리고 {files}",
+    "Path" : "경로",
+    "_%n byte_::_%n bytes_" : ["%n바이트"],
     "Favorited" : "책갈피에 추가됨",
     "Favorite" : "즐겨찾기",
+    "{newname} already exists" : "{newname} 항목이 이미 존재함",
+    "Upload" : "업로드",
+    "Text file" : "텍스트 파일",
+    "New text file.txt" : "새 텍스트 파일.txt",
+    "Folder" : "폴더",
+    "New folder" : "새 폴더",
     "An error occurred while trying to update the tags" : "태그를 업데이트하는 중 오류 발생",
     "A new file or folder has been <strong>created</strong>" : "새 파일이나 폴더가 <strong>생성됨</strong>",
     "A file or folder has been <strong>changed</strong>" : "파일이나 폴더가 <strong>변경됨</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "파일 처리",
     "Maximum upload size" : "최대 업로드 크기",
     "max. possible: " : "최대 가능:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM을 사용하고 있으면 설정 변화가 적용될 때까지 5분 정도 걸릴 수 있습니다.",
     "Save" : "저장",
     "Can not be edited from here due to insufficient permissions." : "권한이 부족하므로 여기에서 편집할 수 없습니다.",
     "Settings" : "설정",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "WebDAV로 파일에 접근하려면 <a href=\"%s\" target=\"_blank\">이 주소를 사용하십시오</a>",
-    "New" : "새로 만들기",
-    "New text file" : "새 텍스트 파일",
-    "Text file" : "텍스트 파일",
-    "New folder" : "새 폴더",
-    "Folder" : "폴더",
-    "Upload" : "업로드",
     "Cancel upload" : "업로드 취소",
     "No files in here" : "여기에 파일 없음",
     "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!",
     "No entries found in this folder" : "이 폴더에 항목 없음",
     "Select all" : "모두 선택",
+    "Delete" : "삭제",
     "Upload too large" : "업로드한 파일이 너무 큼",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
     "Files are being scanned, please wait." : "파일을 검색하고 있습니다. 기다려 주십시오.",
diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json
index fd00163016..e8f89a5c14 100644
--- a/apps/files/l10n/ko.json
+++ b/apps/files/l10n/ko.json
@@ -27,20 +27,14 @@
     "All files" : "모든 파일",
     "Favorites" : "즐겨찾기",
     "Home" : "가정",
+    "Close" : "닫기",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.",
     "Total file size {size1} exceeds upload limit {size2}" : "총 파일 크기 {size1}이(가) 업로드 제한 {size2}을(를) 초과함",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "빈 공간이 부족합니다. 업로드할 파일 크기는 {size1}이지만 현재 {size2}만큼 비었습니다",
     "Upload cancelled." : "업로드가 취소되었습니다.",
     "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
-    "{new_name} already exists" : "{new_name}이(가) 이미 존재함",
-    "Could not create file" : "파일을 만들 수 없음",
-    "Could not create folder" : "폴더를 만들 수 없음",
-    "Rename" : "이름 바꾸기",
-    "Delete" : "삭제",
-    "Disconnect storage" : "저장소 연결 해제",
-    "Unshare" : "공유 해제",
-    "No permission to delete" : "삭제할 권한 없음",
+    "Actions" : "작업",
     "Download" : "다운로드",
     "Select" : "선택",
     "Pending" : "대기 중",
@@ -50,7 +44,10 @@
     "Error moving file." : "파일 이동 오류.",
     "Error moving file" : "파일 이동 오류",
     "Error" : "오류",
+    "{new_name} already exists" : "{new_name}이(가) 이미 존재함",
     "Could not rename file" : "이름을 변경할 수 없음",
+    "Could not create file" : "파일을 만들 수 없음",
+    "Could not create folder" : "폴더를 만들 수 없음",
     "Error deleting file." : "파일 삭제 오류.",
     "No entries in this folder match '{filter}'" : "이 폴더에 '{filter}'와(과) 일치하는 항목 없음",
     "Name" : "이름",
@@ -58,8 +55,10 @@
     "Modified" : "수정됨",
     "_%n folder_::_%n folders_" : ["폴더 %n개"],
     "_%n file_::_%n files_" : ["파일 %n개"],
+    "{dirs} and {files}" : "{dirs} 그리고 {files}",
     "You don’t have permission to upload or create files here" : "여기에 파일을 업로드하거나 만들 권한이 없습니다",
     "_Uploading %n file_::_Uploading %n files_" : ["파일 %n개 업로드 중"],
+    "New" : "새로 만들기",
     "\"{name}\" is an invalid file name." : "\"{name}\"은(는) 잘못된 파일 이름입니다.",
     "File name cannot be empty." : "파일 이름이 비어 있을 수 없습니다.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner}의 저장소가 가득 찼습니다. 파일을 더 이상 업데이트하거나 동기화할 수 없습니다!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner}의 저장 공간이 거의 가득 찼습니다({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "저장 공간이 거의 가득 찼습니다({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}'와(과) 일치"],
-    "{dirs} and {files}" : "{dirs} 그리고 {files}",
+    "Path" : "경로",
+    "_%n byte_::_%n bytes_" : ["%n바이트"],
     "Favorited" : "책갈피에 추가됨",
     "Favorite" : "즐겨찾기",
+    "{newname} already exists" : "{newname} 항목이 이미 존재함",
+    "Upload" : "업로드",
+    "Text file" : "텍스트 파일",
+    "New text file.txt" : "새 텍스트 파일.txt",
+    "Folder" : "폴더",
+    "New folder" : "새 폴더",
     "An error occurred while trying to update the tags" : "태그를 업데이트하는 중 오류 발생",
     "A new file or folder has been <strong>created</strong>" : "새 파일이나 폴더가 <strong>생성됨</strong>",
     "A file or folder has been <strong>changed</strong>" : "파일이나 폴더가 <strong>변경됨</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "파일 처리",
     "Maximum upload size" : "최대 업로드 크기",
     "max. possible: " : "최대 가능:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM을 사용하고 있으면 설정 변화가 적용될 때까지 5분 정도 걸릴 수 있습니다.",
     "Save" : "저장",
     "Can not be edited from here due to insufficient permissions." : "권한이 부족하므로 여기에서 편집할 수 없습니다.",
     "Settings" : "설정",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "WebDAV로 파일에 접근하려면 <a href=\"%s\" target=\"_blank\">이 주소를 사용하십시오</a>",
-    "New" : "새로 만들기",
-    "New text file" : "새 텍스트 파일",
-    "Text file" : "텍스트 파일",
-    "New folder" : "새 폴더",
-    "Folder" : "폴더",
-    "Upload" : "업로드",
     "Cancel upload" : "업로드 취소",
     "No files in here" : "여기에 파일 없음",
     "Upload some content or sync with your devices!" : "파일을 업로드하거나 장치와 동기화하십시오!",
     "No entries found in this folder" : "이 폴더에 항목 없음",
     "Select all" : "모두 선택",
+    "Delete" : "삭제",
     "Upload too large" : "업로드한 파일이 너무 큼",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
     "Files are being scanned, please wait." : "파일을 검색하고 있습니다. 기다려 주십시오.",
diff --git a/apps/files/l10n/ku_IQ.js b/apps/files/l10n/ku_IQ.js
index 7c1c3b4fbe..32af16b367 100644
--- a/apps/files/l10n/ku_IQ.js
+++ b/apps/files/l10n/ku_IQ.js
@@ -3,13 +3,14 @@ OC.L10N.register(
     {
     "Files" : "په‌ڕگەکان",
     "Favorites" : "دڵخوازەکان",
+    "Close" : "دابخه",
     "Download" : "داگرتن",
     "Select" : "دیاریکردنی",
     "Error" : "هه‌ڵه",
     "Name" : "ناو",
-    "Save" : "پاشکه‌وتکردن",
-    "Settings" : "ڕێکخستنه‌کان",
+    "Upload" : "بارکردن",
     "Folder" : "بوخچه",
-    "Upload" : "بارکردن"
+    "Save" : "پاشکه‌وتکردن",
+    "Settings" : "ڕێکخستنه‌کان"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ku_IQ.json b/apps/files/l10n/ku_IQ.json
index de32406b81..4f1068bbb0 100644
--- a/apps/files/l10n/ku_IQ.json
+++ b/apps/files/l10n/ku_IQ.json
@@ -1,13 +1,14 @@
 { "translations": {
     "Files" : "په‌ڕگەکان",
     "Favorites" : "دڵخوازەکان",
+    "Close" : "دابخه",
     "Download" : "داگرتن",
     "Select" : "دیاریکردنی",
     "Error" : "هه‌ڵه",
     "Name" : "ناو",
-    "Save" : "پاشکه‌وتکردن",
-    "Settings" : "ڕێکخستنه‌کان",
+    "Upload" : "بارکردن",
     "Folder" : "بوخچه",
-    "Upload" : "بارکردن"
+    "Save" : "پاشکه‌وتکردن",
+    "Settings" : "ڕێکخستنه‌کان"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/lb.js b/apps/files/l10n/lb.js
index 8d4cf072cf..513d802c1e 100644
--- a/apps/files/l10n/lb.js
+++ b/apps/files/l10n/lb.js
@@ -11,30 +11,29 @@ OC.L10N.register(
     "Files" : "Dateien",
     "Favorites" : "Favoriten",
     "Home" : "Doheem",
+    "Close" : "Zoumaachen",
     "Upload cancelled." : "Upload ofgebrach.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
-    "Rename" : "Ëm-benennen",
-    "Delete" : "Läschen",
-    "Unshare" : "Net méi deelen",
     "Download" : "Download",
     "Select" : "Auswielen",
     "Error" : "Fehler",
     "Name" : "Numm",
     "Size" : "Gréisst",
     "Modified" : "Geännert",
+    "New" : "Nei",
+    "Upload" : "Eroplueden",
+    "Text file" : "Text Fichier",
+    "Folder" : "Dossier",
+    "New folder" : "Neien Dossier",
     "File handling" : "Fichier handling",
     "Maximum upload size" : "Maximum Upload Gréisst ",
     "max. possible: " : "max. méiglech:",
     "Save" : "Späicheren",
     "Settings" : "Astellungen",
-    "New" : "Nei",
-    "Text file" : "Text Fichier",
-    "New folder" : "Neien Dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Eroplueden",
     "Cancel upload" : "Upload ofbriechen",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Select all" : "All auswielen",
+    "Delete" : "Läschen",
     "Upload too large" : "Upload ze grouss",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
     "Files are being scanned, please wait." : "Fichieren gi gescannt, war weg."
diff --git a/apps/files/l10n/lb.json b/apps/files/l10n/lb.json
index b3b6ff1f63..fb586a9099 100644
--- a/apps/files/l10n/lb.json
+++ b/apps/files/l10n/lb.json
@@ -9,30 +9,29 @@
     "Files" : "Dateien",
     "Favorites" : "Favoriten",
     "Home" : "Doheem",
+    "Close" : "Zoumaachen",
     "Upload cancelled." : "Upload ofgebrach.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
-    "Rename" : "Ëm-benennen",
-    "Delete" : "Läschen",
-    "Unshare" : "Net méi deelen",
     "Download" : "Download",
     "Select" : "Auswielen",
     "Error" : "Fehler",
     "Name" : "Numm",
     "Size" : "Gréisst",
     "Modified" : "Geännert",
+    "New" : "Nei",
+    "Upload" : "Eroplueden",
+    "Text file" : "Text Fichier",
+    "Folder" : "Dossier",
+    "New folder" : "Neien Dossier",
     "File handling" : "Fichier handling",
     "Maximum upload size" : "Maximum Upload Gréisst ",
     "max. possible: " : "max. méiglech:",
     "Save" : "Späicheren",
     "Settings" : "Astellungen",
-    "New" : "Nei",
-    "Text file" : "Text Fichier",
-    "New folder" : "Neien Dossier",
-    "Folder" : "Dossier",
-    "Upload" : "Eroplueden",
     "Cancel upload" : "Upload ofbriechen",
     "No entries found in this folder" : "Keng Elementer an dësem Dossier fonnt",
     "Select all" : "All auswielen",
+    "Delete" : "Läschen",
     "Upload too large" : "Upload ze grouss",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass.",
     "Files are being scanned, please wait." : "Fichieren gi gescannt, war weg."
diff --git a/apps/files/l10n/lt_LT.js b/apps/files/l10n/lt_LT.js
index 2106a98535..26fb351f50 100644
--- a/apps/files/l10n/lt_LT.js
+++ b/apps/files/l10n/lt_LT.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Visi failai",
     "Favorites" : "Mėgstamiausi",
     "Home" : "Namų",
+    "Close" : "Užverti",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio",
     "Total file size {size1} exceeds upload limit {size2}" : "Visas failo dydis {size1} viršyja įkėlimo limitą {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nepakanka laisvos vietos. Keliate {size1}, bet tik {size2} yra likę",
     "Upload cancelled." : "Įkėlimas atšauktas.",
     "Could not get result from server." : "Nepavyko gauti rezultato iš serverio.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
-    "{new_name} already exists" : "{new_name} jau egzistuoja",
-    "Could not create file" : "Neįmanoma sukurti failo",
-    "Could not create folder" : "Neįmanoma sukurti aplanko",
-    "Rename" : "Pervadinti",
-    "Delete" : "Ištrinti",
-    "Disconnect storage" : "Atjungti saugyklą",
-    "Unshare" : "Nebesidalinti",
-    "No permission to delete" : "Neturite leidimų ištrinti",
+    "Actions" : "Veiksmai",
     "Download" : "Atsisiųsti",
     "Select" : "Pasirinkiti",
     "Pending" : "Laukiantis",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Klaida perkeliant failą.",
     "Error moving file" : "Klaida perkeliant failą",
     "Error" : "Klaida",
+    "{new_name} already exists" : "{new_name} jau egzistuoja",
     "Could not rename file" : "Neįmanoma pervadinti failo",
+    "Could not create file" : "Neįmanoma sukurti failo",
+    "Could not create folder" : "Neįmanoma sukurti aplanko",
     "Error deleting file." : "Klaida trinant failą.",
     "No entries in this folder match '{filter}'" : "Nėra įrašų šiame aplanko atitikmeniui „{filter}“",
     "Name" : "Pavadinimas",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Pakeista",
     "_%n folder_::_%n folders_" : ["%n aplankas","%n aplankai","%n aplankų"],
     "_%n file_::_%n files_" : ["%n failas","%n failai","%n failų"],
+    "{dirs} and {files}" : "{dirs} ir {files}",
     "You don’t have permission to upload or create files here" : "Jūs neturite leidimo čia įkelti arba kurti failus",
     "_Uploading %n file_::_Uploading %n files_" : ["Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"],
+    "New" : "Naujas",
     "\"{name}\" is an invalid file name." : "„{name}“ yra netinkamas failo pavadinime.",
     "File name cannot be empty." : "Failo pavadinimas negali būti tuščias.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} saugykla yra pilna, failai daugiau nebegali būti atnaujinti arba sinchronizuojami!",
@@ -69,9 +68,12 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} saugykla yra beveik pilna ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["atitikmuo „{filter}“","atitikmenys „{filter}“","atitikmenų „{filter}“"],
-    "{dirs} and {files}" : "{dirs} ir {files}",
     "Favorited" : "Pažymėta mėgstamu",
     "Favorite" : "Mėgiamas",
+    "Upload" : "Įkelti",
+    "Text file" : "Teksto failas",
+    "Folder" : "Katalogas",
+    "New folder" : "Naujas aplankas",
     "An error occurred while trying to update the tags" : "Bandant atnaujinti žymes įvyko klaida",
     "A new file or folder has been <strong>created</strong>" : "Naujas failas ar aplankas buvo <strong>sukurtas</strong>",
     "A file or folder has been <strong>changed</strong>" : "Failas ar aplankas buvo <strong>pakeistas</strong>",
@@ -98,17 +100,12 @@ OC.L10N.register(
     "Settings" : "Nustatymai",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>",
-    "New" : "Naujas",
-    "New text file" : "Naujas tekstinis failas",
-    "Text file" : "Teksto failas",
-    "New folder" : "Naujas aplankas",
-    "Folder" : "Katalogas",
-    "Upload" : "Įkelti",
     "Cancel upload" : "Atšaukti siuntimą",
     "No files in here" : "Čia nėra failų",
     "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!",
     "No entries found in this folder" : "Nerasta įrašų šiame aplanke",
     "Select all" : "Pažymėti viską",
+    "Delete" : "Ištrinti",
     "Upload too large" : "Įkėlimui failas per didelis",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
     "Files are being scanned, please wait." : "Skenuojami failai, prašome palaukti.",
diff --git a/apps/files/l10n/lt_LT.json b/apps/files/l10n/lt_LT.json
index b4758b4a9b..ee8fb0480c 100644
--- a/apps/files/l10n/lt_LT.json
+++ b/apps/files/l10n/lt_LT.json
@@ -27,20 +27,14 @@
     "All files" : "Visi failai",
     "Favorites" : "Mėgstamiausi",
     "Home" : "Namų",
+    "Close" : "Užverti",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio",
     "Total file size {size1} exceeds upload limit {size2}" : "Visas failo dydis {size1} viršyja įkėlimo limitą {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nepakanka laisvos vietos. Keliate {size1}, bet tik {size2} yra likę",
     "Upload cancelled." : "Įkėlimas atšauktas.",
     "Could not get result from server." : "Nepavyko gauti rezultato iš serverio.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
-    "{new_name} already exists" : "{new_name} jau egzistuoja",
-    "Could not create file" : "Neįmanoma sukurti failo",
-    "Could not create folder" : "Neįmanoma sukurti aplanko",
-    "Rename" : "Pervadinti",
-    "Delete" : "Ištrinti",
-    "Disconnect storage" : "Atjungti saugyklą",
-    "Unshare" : "Nebesidalinti",
-    "No permission to delete" : "Neturite leidimų ištrinti",
+    "Actions" : "Veiksmai",
     "Download" : "Atsisiųsti",
     "Select" : "Pasirinkiti",
     "Pending" : "Laukiantis",
@@ -50,7 +44,10 @@
     "Error moving file." : "Klaida perkeliant failą.",
     "Error moving file" : "Klaida perkeliant failą",
     "Error" : "Klaida",
+    "{new_name} already exists" : "{new_name} jau egzistuoja",
     "Could not rename file" : "Neįmanoma pervadinti failo",
+    "Could not create file" : "Neįmanoma sukurti failo",
+    "Could not create folder" : "Neįmanoma sukurti aplanko",
     "Error deleting file." : "Klaida trinant failą.",
     "No entries in this folder match '{filter}'" : "Nėra įrašų šiame aplanko atitikmeniui „{filter}“",
     "Name" : "Pavadinimas",
@@ -58,8 +55,10 @@
     "Modified" : "Pakeista",
     "_%n folder_::_%n folders_" : ["%n aplankas","%n aplankai","%n aplankų"],
     "_%n file_::_%n files_" : ["%n failas","%n failai","%n failų"],
+    "{dirs} and {files}" : "{dirs} ir {files}",
     "You don’t have permission to upload or create files here" : "Jūs neturite leidimo čia įkelti arba kurti failus",
     "_Uploading %n file_::_Uploading %n files_" : ["Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"],
+    "New" : "Naujas",
     "\"{name}\" is an invalid file name." : "„{name}“ yra netinkamas failo pavadinime.",
     "File name cannot be empty." : "Failo pavadinimas negali būti tuščias.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} saugykla yra pilna, failai daugiau nebegali būti atnaujinti arba sinchronizuojami!",
@@ -67,9 +66,12 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} saugykla yra beveik pilna ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["atitikmuo „{filter}“","atitikmenys „{filter}“","atitikmenų „{filter}“"],
-    "{dirs} and {files}" : "{dirs} ir {files}",
     "Favorited" : "Pažymėta mėgstamu",
     "Favorite" : "Mėgiamas",
+    "Upload" : "Įkelti",
+    "Text file" : "Teksto failas",
+    "Folder" : "Katalogas",
+    "New folder" : "Naujas aplankas",
     "An error occurred while trying to update the tags" : "Bandant atnaujinti žymes įvyko klaida",
     "A new file or folder has been <strong>created</strong>" : "Naujas failas ar aplankas buvo <strong>sukurtas</strong>",
     "A file or folder has been <strong>changed</strong>" : "Failas ar aplankas buvo <strong>pakeistas</strong>",
@@ -96,17 +98,12 @@
     "Settings" : "Nustatymai",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>",
-    "New" : "Naujas",
-    "New text file" : "Naujas tekstinis failas",
-    "Text file" : "Teksto failas",
-    "New folder" : "Naujas aplankas",
-    "Folder" : "Katalogas",
-    "Upload" : "Įkelti",
     "Cancel upload" : "Atšaukti siuntimą",
     "No files in here" : "Čia nėra failų",
     "Upload some content or sync with your devices!" : "Įkelkite kokį nors turinį, arba sinchronizuokite su savo įrenginiais!",
     "No entries found in this folder" : "Nerasta įrašų šiame aplanke",
     "Select all" : "Pažymėti viską",
+    "Delete" : "Ištrinti",
     "Upload too large" : "Įkėlimui failas per didelis",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
     "Files are being scanned, please wait." : "Skenuojami failai, prašome palaukti.",
diff --git a/apps/files/l10n/lv.js b/apps/files/l10n/lv.js
index 8454fe48fa..e86b2d335e 100644
--- a/apps/files/l10n/lv.js
+++ b/apps/files/l10n/lv.js
@@ -29,19 +29,14 @@ OC.L10N.register(
     "All files" : "Visas datnes",
     "Favorites" : "Iecienītie",
     "Home" : "Mājas",
+    "Close" : "Aizvērt",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Neizdodas augšupielādēt {filename}, jo tā ir vai nu mape vai 0 baitu saturošs fails.",
     "Total file size {size1} exceeds upload limit {size2}" : "Kopējais faila izmērs {size1} pārsniedz augšupielādes ierobežojumu {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nav pietiekami daudz brīvas vietas. Tiek augšupielādēti {size1}, bet pieejami tikai {size2}",
     "Upload cancelled." : "Augšupielāde ir atcelta.",
     "Could not get result from server." : "Nevar saņemt rezultātus no servera",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
-    "{new_name} already exists" : "{new_name} jau eksistē",
-    "Could not create file" : "Neizdevās izveidot datni",
-    "Could not create folder" : "Neizdevās izveidot mapi",
-    "Rename" : "Pārsaukt",
-    "Delete" : "Dzēst",
-    "Disconnect storage" : "Atvienot krātuvi",
-    "Unshare" : "Pārtraukt dalīšanos",
+    "Actions" : "Darbības",
     "Download" : "Lejupielādēt",
     "Select" : "Norādīt",
     "Pending" : "Gaida savu kārtu",
@@ -49,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Kļūda, pārvietojot datni.",
     "Error moving file" : "Kļūda, pārvietojot datni",
     "Error" : "Kļūda",
+    "{new_name} already exists" : "{new_name} jau eksistē",
     "Could not rename file" : "Neizdevās pārsaukt datni",
+    "Could not create file" : "Neizdevās izveidot datni",
+    "Could not create folder" : "Neizdevās izveidot mapi",
     "Error deleting file." : "Kļūda, dzēšot datni.",
     "No entries in this folder match '{filter}'" : "Šajā mapē nekas nav atrasts, meklējot pēc '{filter}'",
     "Name" : "Nosaukums",
@@ -57,16 +55,21 @@ OC.L10N.register(
     "Modified" : "Mainīts",
     "_%n folder_::_%n folders_" : ["%n mapes","%n mape","%n mapes"],
     "_%n file_::_%n files_" : ["%n faili","%n fails","%n faili"],
+    "{dirs} and {files}" : "{dirs} un {files}",
     "You don’t have permission to upload or create files here" : "Jums nav tiesību, augšupielādēt vai veidot, šeit datnes",
     "_Uploading %n file_::_Uploading %n files_" : ["%n","Augšupielāde %n failu","Augšupielāde %n failus"],
+    "New" : "Jauna",
     "\"{name}\" is an invalid file name." : "\"{name}\" ir nepareizs datnes nosaukums.",
     "File name cannot be empty." : "Datnes nosaukums nevar būt tukšs.",
     "Your storage is full, files can not be updated or synced anymore!" : "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["atrasts pēc '{filter}'","atrasts pēc '{filter}'","atrasti pēc '{filter}'"],
-    "{dirs} and {files}" : "{dirs} un {files}",
     "Favorited" : "Favorīti",
     "Favorite" : "Iecienītais",
+    "Upload" : "Augšupielādēt",
+    "Text file" : "Teksta datne",
+    "Folder" : "Mape",
+    "New folder" : "Jauna mape",
     "An error occurred while trying to update the tags" : "Atjaunojot atzīmes notika kļūda",
     "A new file or folder has been <strong>created</strong>" : "<strong>Izveidots</strong> jauns fails vai mape",
     "A file or folder has been <strong>changed</strong>" : "<strong>Izmainīts</strong> fails vai mape",
@@ -91,16 +94,11 @@ OC.L10N.register(
     "Settings" : "Iestatījumi",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Izmantojot šo adresi, <a href=\"%s\" target=\"_blank\">piekļūstiet saviem failiem, izmantojot WebDAV</a>",
-    "New" : "Jauna",
-    "New text file" : "Jauna teksta datne",
-    "Text file" : "Teksta datne",
-    "New folder" : "Jauna mape",
-    "Folder" : "Mape",
-    "Upload" : "Augšupielādēt",
     "Cancel upload" : "Atcelt augšupielādi",
     "Upload some content or sync with your devices!" : "Augšupielādē kaut ko vai sinhronizē saturu ar savām ierīcēm!",
     "No entries found in this folder" : "Šajā mapē nekas nav atrasts",
     "Select all" : "Atzīmēt visu",
+    "Delete" : "Dzēst",
     "Upload too large" : "Datne ir par lielu, lai to augšupielādētu",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
     "Files are being scanned, please wait." : "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
diff --git a/apps/files/l10n/lv.json b/apps/files/l10n/lv.json
index 59220478b6..7a5a53c130 100644
--- a/apps/files/l10n/lv.json
+++ b/apps/files/l10n/lv.json
@@ -27,19 +27,14 @@
     "All files" : "Visas datnes",
     "Favorites" : "Iecienītie",
     "Home" : "Mājas",
+    "Close" : "Aizvērt",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Neizdodas augšupielādēt {filename}, jo tā ir vai nu mape vai 0 baitu saturošs fails.",
     "Total file size {size1} exceeds upload limit {size2}" : "Kopējais faila izmērs {size1} pārsniedz augšupielādes ierobežojumu {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nav pietiekami daudz brīvas vietas. Tiek augšupielādēti {size1}, bet pieejami tikai {size2}",
     "Upload cancelled." : "Augšupielāde ir atcelta.",
     "Could not get result from server." : "Nevar saņemt rezultātus no servera",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
-    "{new_name} already exists" : "{new_name} jau eksistē",
-    "Could not create file" : "Neizdevās izveidot datni",
-    "Could not create folder" : "Neizdevās izveidot mapi",
-    "Rename" : "Pārsaukt",
-    "Delete" : "Dzēst",
-    "Disconnect storage" : "Atvienot krātuvi",
-    "Unshare" : "Pārtraukt dalīšanos",
+    "Actions" : "Darbības",
     "Download" : "Lejupielādēt",
     "Select" : "Norādīt",
     "Pending" : "Gaida savu kārtu",
@@ -47,7 +42,10 @@
     "Error moving file." : "Kļūda, pārvietojot datni.",
     "Error moving file" : "Kļūda, pārvietojot datni",
     "Error" : "Kļūda",
+    "{new_name} already exists" : "{new_name} jau eksistē",
     "Could not rename file" : "Neizdevās pārsaukt datni",
+    "Could not create file" : "Neizdevās izveidot datni",
+    "Could not create folder" : "Neizdevās izveidot mapi",
     "Error deleting file." : "Kļūda, dzēšot datni.",
     "No entries in this folder match '{filter}'" : "Šajā mapē nekas nav atrasts, meklējot pēc '{filter}'",
     "Name" : "Nosaukums",
@@ -55,16 +53,21 @@
     "Modified" : "Mainīts",
     "_%n folder_::_%n folders_" : ["%n mapes","%n mape","%n mapes"],
     "_%n file_::_%n files_" : ["%n faili","%n fails","%n faili"],
+    "{dirs} and {files}" : "{dirs} un {files}",
     "You don’t have permission to upload or create files here" : "Jums nav tiesību, augšupielādēt vai veidot, šeit datnes",
     "_Uploading %n file_::_Uploading %n files_" : ["%n","Augšupielāde %n failu","Augšupielāde %n failus"],
+    "New" : "Jauna",
     "\"{name}\" is an invalid file name." : "\"{name}\" ir nepareizs datnes nosaukums.",
     "File name cannot be empty." : "Datnes nosaukums nevar būt tukšs.",
     "Your storage is full, files can not be updated or synced anymore!" : "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["atrasts pēc '{filter}'","atrasts pēc '{filter}'","atrasti pēc '{filter}'"],
-    "{dirs} and {files}" : "{dirs} un {files}",
     "Favorited" : "Favorīti",
     "Favorite" : "Iecienītais",
+    "Upload" : "Augšupielādēt",
+    "Text file" : "Teksta datne",
+    "Folder" : "Mape",
+    "New folder" : "Jauna mape",
     "An error occurred while trying to update the tags" : "Atjaunojot atzīmes notika kļūda",
     "A new file or folder has been <strong>created</strong>" : "<strong>Izveidots</strong> jauns fails vai mape",
     "A file or folder has been <strong>changed</strong>" : "<strong>Izmainīts</strong> fails vai mape",
@@ -89,16 +92,11 @@
     "Settings" : "Iestatījumi",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Izmantojot šo adresi, <a href=\"%s\" target=\"_blank\">piekļūstiet saviem failiem, izmantojot WebDAV</a>",
-    "New" : "Jauna",
-    "New text file" : "Jauna teksta datne",
-    "Text file" : "Teksta datne",
-    "New folder" : "Jauna mape",
-    "Folder" : "Mape",
-    "Upload" : "Augšupielādēt",
     "Cancel upload" : "Atcelt augšupielādi",
     "Upload some content or sync with your devices!" : "Augšupielādē kaut ko vai sinhronizē saturu ar savām ierīcēm!",
     "No entries found in this folder" : "Šajā mapē nekas nav atrasts",
     "Select all" : "Atzīmēt visu",
+    "Delete" : "Dzēst",
     "Upload too large" : "Datne ir par lielu, lai to augšupielādētu",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
     "Files are being scanned, please wait." : "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
diff --git a/apps/files/l10n/mk.js b/apps/files/l10n/mk.js
index fbda6b4d1f..b9225ac670 100644
--- a/apps/files/l10n/mk.js
+++ b/apps/files/l10n/mk.js
@@ -22,28 +22,32 @@ OC.L10N.register(
     "Files" : "Датотеки",
     "Favorites" : "Омилени",
     "Home" : "Дома",
+    "Close" : "Затвори",
     "Upload cancelled." : "Преземањето е прекинато.",
     "Could not get result from server." : "Не можам да добијам резултат од серверот.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
-    "{new_name} already exists" : "{new_name} веќе постои",
-    "Could not create file" : "Не множам да креирам датотека",
-    "Could not create folder" : "Не можам да креирам папка",
-    "Rename" : "Преименувај",
-    "Delete" : "Избриши",
-    "Unshare" : "Не споделувај",
+    "Actions" : "Акции",
     "Download" : "Преземи",
     "Select" : "Избери",
     "Pending" : "Чека",
     "Error moving file" : "Грешка при префрлање на датотека",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} веќе постои",
     "Could not rename file" : "Не можам да ја преименувам датотеката",
+    "Could not create file" : "Не множам да креирам датотека",
+    "Could not create folder" : "Не можам да креирам папка",
     "Name" : "Име",
     "Size" : "Големина",
     "Modified" : "Променето",
+    "{dirs} and {files}" : "{dirs} и {files}",
+    "New" : "Ново",
     "File name cannot be empty." : "Името на датотеката не може да биде празно.",
     "Your storage is full, files can not be updated or synced anymore!" : "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Вашиот сториџ е скоро полн ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} и {files}",
+    "Upload" : "Подигни",
+    "Text file" : "Текстуална датотека",
+    "Folder" : "Папка",
+    "New folder" : "Нова папка",
     "You created %1$s" : "Вие креиравте %1$s",
     "%2$s created %1$s" : "%2$s креирано %1$s",
     "You changed %1$s" : "Вие изменивте %1$s",
@@ -58,12 +62,8 @@ OC.L10N.register(
     "Save" : "Сними",
     "Settings" : "Подесувања",
     "WebDAV" : "WebDAV",
-    "New" : "Ново",
-    "Text file" : "Текстуална датотека",
-    "New folder" : "Нова папка",
-    "Folder" : "Папка",
-    "Upload" : "Подигни",
     "Cancel upload" : "Откажи прикачување",
+    "Delete" : "Избриши",
     "Upload too large" : "Фајлот кој се вчитува е преголем",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
     "Files are being scanned, please wait." : "Се скенираат датотеки, ве молам почекајте."
diff --git a/apps/files/l10n/mk.json b/apps/files/l10n/mk.json
index 7eb9488916..e6ce76ecb4 100644
--- a/apps/files/l10n/mk.json
+++ b/apps/files/l10n/mk.json
@@ -20,28 +20,32 @@
     "Files" : "Датотеки",
     "Favorites" : "Омилени",
     "Home" : "Дома",
+    "Close" : "Затвори",
     "Upload cancelled." : "Преземањето е прекинато.",
     "Could not get result from server." : "Не можам да добијам резултат од серверот.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
-    "{new_name} already exists" : "{new_name} веќе постои",
-    "Could not create file" : "Не множам да креирам датотека",
-    "Could not create folder" : "Не можам да креирам папка",
-    "Rename" : "Преименувај",
-    "Delete" : "Избриши",
-    "Unshare" : "Не споделувај",
+    "Actions" : "Акции",
     "Download" : "Преземи",
     "Select" : "Избери",
     "Pending" : "Чека",
     "Error moving file" : "Грешка при префрлање на датотека",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} веќе постои",
     "Could not rename file" : "Не можам да ја преименувам датотеката",
+    "Could not create file" : "Не множам да креирам датотека",
+    "Could not create folder" : "Не можам да креирам папка",
     "Name" : "Име",
     "Size" : "Големина",
     "Modified" : "Променето",
+    "{dirs} and {files}" : "{dirs} и {files}",
+    "New" : "Ново",
     "File name cannot be empty." : "Името на датотеката не може да биде празно.",
     "Your storage is full, files can not be updated or synced anymore!" : "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Вашиот сториџ е скоро полн ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} и {files}",
+    "Upload" : "Подигни",
+    "Text file" : "Текстуална датотека",
+    "Folder" : "Папка",
+    "New folder" : "Нова папка",
     "You created %1$s" : "Вие креиравте %1$s",
     "%2$s created %1$s" : "%2$s креирано %1$s",
     "You changed %1$s" : "Вие изменивте %1$s",
@@ -56,12 +60,8 @@
     "Save" : "Сними",
     "Settings" : "Подесувања",
     "WebDAV" : "WebDAV",
-    "New" : "Ново",
-    "Text file" : "Текстуална датотека",
-    "New folder" : "Нова папка",
-    "Folder" : "Папка",
-    "Upload" : "Подигни",
     "Cancel upload" : "Откажи прикачување",
+    "Delete" : "Избриши",
     "Upload too large" : "Фајлот кој се вчитува е преголем",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
     "Files are being scanned, please wait." : "Се скенираат датотеки, ве молам почекајте."
diff --git a/apps/files/l10n/mn.js b/apps/files/l10n/mn.js
index d55fa0c2b2..994f002b48 100644
--- a/apps/files/l10n/mn.js
+++ b/apps/files/l10n/mn.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "files",
     {
     "Files" : "Файлууд",
+    "Upload" : "Байршуулах",
     "A new file or folder has been <strong>created</strong>" : "Файл эсвэл хавтас амжилттай <strong>үүсгэгдлээ</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл эсвэл хавтас амжилттай <strong>солигдлоо</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Файл эсвэл хавтас амжилттай <strong>устгагдлаа</strong>",
@@ -16,7 +17,6 @@ OC.L10N.register(
     "You restored %1$s" : "Та %1$s-ийг сэргээлээ",
     "%2$s restored %1$s" : "%2$s %1$s-ийг сэргээлээ",
     "Save" : "Хадгалах",
-    "Settings" : "Тохиргоо",
-    "Upload" : "Байршуулах"
+    "Settings" : "Тохиргоо"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/mn.json b/apps/files/l10n/mn.json
index d2ff8f5fa4..f1b58c7e13 100644
--- a/apps/files/l10n/mn.json
+++ b/apps/files/l10n/mn.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Files" : "Файлууд",
+    "Upload" : "Байршуулах",
     "A new file or folder has been <strong>created</strong>" : "Файл эсвэл хавтас амжилттай <strong>үүсгэгдлээ</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл эсвэл хавтас амжилттай <strong>солигдлоо</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Файл эсвэл хавтас амжилттай <strong>устгагдлаа</strong>",
@@ -14,7 +15,6 @@
     "You restored %1$s" : "Та %1$s-ийг сэргээлээ",
     "%2$s restored %1$s" : "%2$s %1$s-ийг сэргээлээ",
     "Save" : "Хадгалах",
-    "Settings" : "Тохиргоо",
-    "Upload" : "Байршуулах"
+    "Settings" : "Тохиргоо"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/ms_MY.js b/apps/files/l10n/ms_MY.js
index 6f44e4524e..0bbbe400b2 100644
--- a/apps/files/l10n/ms_MY.js
+++ b/apps/files/l10n/ms_MY.js
@@ -10,15 +10,18 @@ OC.L10N.register(
     "Failed to write to disk" : "Gagal untuk disimpan",
     "Files" : "Fail-fail",
     "Home" : "Rumah",
+    "Close" : "Tutup",
     "Upload cancelled." : "Muatnaik dibatalkan.",
-    "Rename" : "Namakan",
-    "Delete" : "Padam",
     "Download" : "Muat turun",
     "Pending" : "Dalam proses",
     "Error" : "Ralat",
     "Name" : "Nama",
     "Size" : "Saiz",
     "Modified" : "Dimodifikasi",
+    "New" : "Baru",
+    "Upload" : "Muat naik",
+    "Text file" : "Fail teks",
+    "Folder" : "Folder",
     "You created %1$s" : "Anda telah membina %1$s",
     "%2$s created %1$s" : "%2$s membina %1$s",
     "You changed %1$s" : "Anda menukar %1$s",
@@ -27,11 +30,8 @@ OC.L10N.register(
     "max. possible: " : "maksimum:",
     "Save" : "Simpan",
     "Settings" : "Tetapan",
-    "New" : "Baru",
-    "Text file" : "Fail teks",
-    "Folder" : "Folder",
-    "Upload" : "Muat naik",
     "Cancel upload" : "Batal muat naik",
+    "Delete" : "Padam",
     "Upload too large" : "Muatnaik terlalu besar",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
     "Files are being scanned, please wait." : "Fail sedang diimbas, harap bersabar."
diff --git a/apps/files/l10n/ms_MY.json b/apps/files/l10n/ms_MY.json
index a3149f892e..071fab2319 100644
--- a/apps/files/l10n/ms_MY.json
+++ b/apps/files/l10n/ms_MY.json
@@ -8,15 +8,18 @@
     "Failed to write to disk" : "Gagal untuk disimpan",
     "Files" : "Fail-fail",
     "Home" : "Rumah",
+    "Close" : "Tutup",
     "Upload cancelled." : "Muatnaik dibatalkan.",
-    "Rename" : "Namakan",
-    "Delete" : "Padam",
     "Download" : "Muat turun",
     "Pending" : "Dalam proses",
     "Error" : "Ralat",
     "Name" : "Nama",
     "Size" : "Saiz",
     "Modified" : "Dimodifikasi",
+    "New" : "Baru",
+    "Upload" : "Muat naik",
+    "Text file" : "Fail teks",
+    "Folder" : "Folder",
     "You created %1$s" : "Anda telah membina %1$s",
     "%2$s created %1$s" : "%2$s membina %1$s",
     "You changed %1$s" : "Anda menukar %1$s",
@@ -25,11 +28,8 @@
     "max. possible: " : "maksimum:",
     "Save" : "Simpan",
     "Settings" : "Tetapan",
-    "New" : "Baru",
-    "Text file" : "Fail teks",
-    "Folder" : "Folder",
-    "Upload" : "Muat naik",
     "Cancel upload" : "Batal muat naik",
+    "Delete" : "Padam",
     "Upload too large" : "Muatnaik terlalu besar",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server",
     "Files are being scanned, please wait." : "Fail sedang diimbas, harap bersabar."
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
index b7741835c0..c91f212cf2 100644
--- a/apps/files/l10n/nb_NO.js
+++ b/apps/files/l10n/nb_NO.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Alle filer",
     "Favorites" : "Favoritter",
     "Home" : "Hjem",
+    "Close" : "Lukk",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "Total filstørrelse {size1} overstiger grense for opplasting {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig",
     "Upload cancelled." : "Opplasting avbrutt.",
     "Could not get result from server." : "Fikk ikke resultat fra serveren.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
-    "{new_name} already exists" : "{new_name} finnes allerede",
-    "Could not create file" : "Klarte ikke å opprette fil",
-    "Could not create folder" : "Klarte ikke å opprette mappe",
-    "Rename" : "Gi nytt navn",
-    "Delete" : "Slett",
-    "Disconnect storage" : "Koble fra lagring",
-    "Unshare" : "Avslutt deling",
-    "No permission to delete" : "Ikke tillatelse til å slette",
+    "Actions" : "Handlinger",
     "Download" : "Last ned",
     "Select" : "Velg",
     "Pending" : "Ventende",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Feil ved flytting av fil.",
     "Error moving file" : "Feil ved flytting av fil",
     "Error" : "Feil",
+    "{new_name} already exists" : "{new_name} finnes allerede",
     "Could not rename file" : "Klarte ikke å gi nytt navn til fil",
+    "Could not create file" : "Klarte ikke å opprette fil",
+    "Could not create folder" : "Klarte ikke å opprette mappe",
     "Error deleting file." : "Feil ved sletting av fil.",
     "No entries in this folder match '{filter}'" : "Ingen oppføringer i denne mappen stemmer med '{filter}'",
     "Name" : "Navn",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Endret",
     "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
     "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "{dirs} and {files}" : "{dirs} og {files}",
     "You don’t have permission to upload or create files here" : "Du har ikke tillatelse til å laste opp eller opprette filer her",
     "_Uploading %n file_::_Uploading %n files_" : ["Laster opp %n fil","Laster opp %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.",
     "File name cannot be empty." : "Filnavn kan ikke være tomt.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagringsplass for {owner} er full, filer kan ikke oppdateres eller synkroniseres lenger!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lagringsplass for {owner} er nesten full ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
-    "{dirs} and {files}" : "{dirs} og {files}",
+    "Path" : "Sti",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Er favoritt",
     "Favorite" : "Gjør til favoritt",
+    "{newname} already exists" : "{newname} finnes allerede",
+    "Upload" : "Last opp",
+    "Text file" : "Tekstfil",
+    "New text file.txt" : "Ny tekstfil.txt",
+    "Folder" : "Mappe",
+    "New folder" : "Ny mappe",
     "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av taggene",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mappe ble <strong>opprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe ble <strong>endret</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Filhåndtering",
     "Maximum upload size" : "Største opplastingsstørrelse",
     "max. possible: " : "max. mulige:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Med PHP-FPM kan det ta inntil 5 minutter fra denne verdien lagres til den trer i kraft.",
     "Save" : "Lagre",
     "Can not be edited from here due to insufficient permissions." : "Kan ikke redigeres her pga. manglende rettigheter.",
     "Settings" : "Innstillinger",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny tekstfil",
-    "Text file" : "Tekstfil",
-    "New folder" : "Ny mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Last opp",
     "Cancel upload" : "Avbryt opplasting",
     "No files in here" : "Ingen filer her",
     "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!",
     "No entries found in this folder" : "Ingen oppføringer funnet i denne mappen",
     "Select all" : "Velg alle",
+    "Delete" : "Slett",
     "Upload too large" : "Filen er for stor",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å laste opp er for store til å laste opp til denne serveren.",
     "Files are being scanned, please wait." : "Skanner filer, vennligst vent.",
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
index 662d8433c2..cd476ef3bc 100644
--- a/apps/files/l10n/nb_NO.json
+++ b/apps/files/l10n/nb_NO.json
@@ -27,20 +27,14 @@
     "All files" : "Alle filer",
     "Favorites" : "Favoritter",
     "Home" : "Hjem",
+    "Close" : "Lukk",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "Total filstørrelse {size1} overstiger grense for opplasting {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig",
     "Upload cancelled." : "Opplasting avbrutt.",
     "Could not get result from server." : "Fikk ikke resultat fra serveren.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
-    "{new_name} already exists" : "{new_name} finnes allerede",
-    "Could not create file" : "Klarte ikke å opprette fil",
-    "Could not create folder" : "Klarte ikke å opprette mappe",
-    "Rename" : "Gi nytt navn",
-    "Delete" : "Slett",
-    "Disconnect storage" : "Koble fra lagring",
-    "Unshare" : "Avslutt deling",
-    "No permission to delete" : "Ikke tillatelse til å slette",
+    "Actions" : "Handlinger",
     "Download" : "Last ned",
     "Select" : "Velg",
     "Pending" : "Ventende",
@@ -50,7 +44,10 @@
     "Error moving file." : "Feil ved flytting av fil.",
     "Error moving file" : "Feil ved flytting av fil",
     "Error" : "Feil",
+    "{new_name} already exists" : "{new_name} finnes allerede",
     "Could not rename file" : "Klarte ikke å gi nytt navn til fil",
+    "Could not create file" : "Klarte ikke å opprette fil",
+    "Could not create folder" : "Klarte ikke å opprette mappe",
     "Error deleting file." : "Feil ved sletting av fil.",
     "No entries in this folder match '{filter}'" : "Ingen oppføringer i denne mappen stemmer med '{filter}'",
     "Name" : "Navn",
@@ -58,8 +55,10 @@
     "Modified" : "Endret",
     "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
     "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "{dirs} and {files}" : "{dirs} og {files}",
     "You don’t have permission to upload or create files here" : "Du har ikke tillatelse til å laste opp eller opprette filer her",
     "_Uploading %n file_::_Uploading %n files_" : ["Laster opp %n fil","Laster opp %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.",
     "File name cannot be empty." : "Filnavn kan ikke være tomt.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Lagringsplass for {owner} er full, filer kan ikke oppdateres eller synkroniseres lenger!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Lagringsplass for {owner} er nesten full ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : [" stemmer med '{filter}'"," stemmer med '{filter}'"],
-    "{dirs} and {files}" : "{dirs} og {files}",
+    "Path" : "Sti",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Er favoritt",
     "Favorite" : "Gjør til favoritt",
+    "{newname} already exists" : "{newname} finnes allerede",
+    "Upload" : "Last opp",
+    "Text file" : "Tekstfil",
+    "New text file.txt" : "Ny tekstfil.txt",
+    "Folder" : "Mappe",
+    "New folder" : "Ny mappe",
     "An error occurred while trying to update the tags" : "En feil oppstod under oppdatering av taggene",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mappe ble <strong>opprettet</strong>",
     "A file or folder has been <strong>changed</strong>" : "En fil eller mappe ble <strong>endret</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "Filhåndtering",
     "Maximum upload size" : "Største opplastingsstørrelse",
     "max. possible: " : "max. mulige:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Med PHP-FPM kan det ta inntil 5 minutter fra denne verdien lagres til den trer i kraft.",
     "Save" : "Lagre",
     "Can not be edited from here due to insufficient permissions." : "Kan ikke redigeres her pga. manglende rettigheter.",
     "Settings" : "Innstillinger",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">få tilgang til filene dine via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny tekstfil",
-    "Text file" : "Tekstfil",
-    "New folder" : "Ny mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Last opp",
     "Cancel upload" : "Avbryt opplasting",
     "No files in here" : "Ingen filer her",
     "Upload some content or sync with your devices!" : "Last opp noe innhold eller synkroniser med enhetene dine!",
     "No entries found in this folder" : "Ingen oppføringer funnet i denne mappen",
     "Select all" : "Velg alle",
+    "Delete" : "Slett",
     "Upload too large" : "Filen er for stor",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å laste opp er for store til å laste opp til denne serveren.",
     "Files are being scanned, please wait." : "Skanner filer, vennligst vent.",
diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js
index 85bebde9c3..3470d011dc 100644
--- a/apps/files/l10n/nl.js
+++ b/apps/files/l10n/nl.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Alle bestanden",
     "Favorites" : "Favorieten",
     "Home" : "Thuis",
+    "Close" : "Sluiten",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is",
     "Total file size {size1} exceeds upload limit {size2}" : "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar",
     "Upload cancelled." : "Uploaden geannuleerd.",
     "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
-    "{new_name} already exists" : "{new_name} bestaat al",
-    "Could not create file" : "Kon bestand niet creëren",
-    "Could not create folder" : "Kon niet creëren map",
-    "Rename" : "Naam wijzigen",
-    "Delete" : "Verwijderen",
-    "Disconnect storage" : "Verbinding met opslag verbreken",
-    "Unshare" : "Stop met delen",
-    "No permission to delete" : "Geen permissie om te verwijderen",
+    "Actions" : "Acties",
     "Download" : "Downloaden",
     "Select" : "Selecteer",
     "Pending" : "In behandeling",
@@ -52,15 +46,20 @@ OC.L10N.register(
     "Error moving file." : "Fout bij verplaatsen bestand.",
     "Error moving file" : "Fout bij verplaatsen bestand",
     "Error" : "Fout",
+    "{new_name} already exists" : "{new_name} bestaat al",
     "Could not rename file" : "Kon de naam van het bestand niet wijzigen",
+    "Could not create file" : "Kon bestand niet creëren",
+    "Could not create folder" : "Kon niet creëren map",
     "Error deleting file." : "Fout bij verwijderen bestand.",
     "No entries in this folder match '{filter}'" : "Niets in deze map komt overeen met '{filter}'",
     "Name" : "Naam",
     "Size" : "Grootte",
     "Modified" : "Aangepast",
     "_%n file_::_%n files_" : ["%n bestand","%n bestanden"],
+    "{dirs} and {files}" : "{dirs} en {files}",
     "You don’t have permission to upload or create files here" : "U hebt geen toestemming om hier te uploaden of bestanden te maken",
     "_Uploading %n file_::_Uploading %n files_" : ["%n bestand aan het uploaden","%n bestanden aan het uploaden"],
+    "New" : "Nieuw",
     "\"{name}\" is an invalid file name." : "\"{name}\" is een ongeldige bestandsnaam.",
     "File name cannot be empty." : "Bestandsnaam kan niet leeg zijn.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Opslagruimte van {owner} zit vol, bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
@@ -68,9 +67,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Opslagruimte van {owner} zit bijna vol ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["komt overeen met '{filter}'","komen overeen met '{filter}'"],
-    "{dirs} and {files}" : "{dirs} en {files}",
+    "Path" : "Pad",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favoriet",
     "Favorite" : "Favoriet",
+    "{newname} already exists" : "{newname} bestaat al",
+    "Upload" : "Uploaden",
+    "Text file" : "Tekstbestand",
+    "New text file.txt" : "Nieuw tekstbestand.txt",
+    "Folder" : "Map",
+    "New folder" : "Nieuwe map",
     "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de tags bij te werken",
     "A new file or folder has been <strong>created</strong>" : "Een nieuw bestand of map is <strong>aangemaakt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Een bestand of map is <strong>gewijzigd</strong>",
@@ -92,22 +98,18 @@ OC.L10N.register(
     "File handling" : "Bestand",
     "Maximum upload size" : "Maximale bestandsgrootte voor uploads",
     "max. possible: " : "max. mogelijk: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Met PHP-FPM kan het tot 5 minuten duren voordat de aanpassing van deze waarde effect heeft.",
     "Save" : "Bewaren",
     "Can not be edited from here due to insufficient permissions." : "Kan hier niet worden bewerkt wegens onvoldoende permissies.",
     "Settings" : "Instellingen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>",
-    "New" : "Nieuw",
-    "New text file" : "Nieuw tekstbestand",
-    "Text file" : "Tekstbestand",
-    "New folder" : "Nieuwe map",
-    "Folder" : "Map",
-    "Upload" : "Uploaden",
     "Cancel upload" : "Upload afbreken",
     "No files in here" : "Hier geen bestanden",
     "Upload some content or sync with your devices!" : "Upload bestanden of synchroniseer met uw apparaten!",
     "No entries found in this folder" : "Niets",
     "Select all" : "Alles selecteren",
+    "Delete" : "Verwijderen",
     "Upload too large" : "Upload is te groot",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
     "Files are being scanned, please wait." : "Bestanden worden gescand, even wachten.",
diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json
index 9094ed1b03..04c0b7916b 100644
--- a/apps/files/l10n/nl.json
+++ b/apps/files/l10n/nl.json
@@ -27,20 +27,14 @@
     "All files" : "Alle bestanden",
     "Favorites" : "Favorieten",
     "Home" : "Thuis",
+    "Close" : "Sluiten",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is",
     "Total file size {size1} exceeds upload limit {size2}" : "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar",
     "Upload cancelled." : "Uploaden geannuleerd.",
     "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
-    "{new_name} already exists" : "{new_name} bestaat al",
-    "Could not create file" : "Kon bestand niet creëren",
-    "Could not create folder" : "Kon niet creëren map",
-    "Rename" : "Naam wijzigen",
-    "Delete" : "Verwijderen",
-    "Disconnect storage" : "Verbinding met opslag verbreken",
-    "Unshare" : "Stop met delen",
-    "No permission to delete" : "Geen permissie om te verwijderen",
+    "Actions" : "Acties",
     "Download" : "Downloaden",
     "Select" : "Selecteer",
     "Pending" : "In behandeling",
@@ -50,15 +44,20 @@
     "Error moving file." : "Fout bij verplaatsen bestand.",
     "Error moving file" : "Fout bij verplaatsen bestand",
     "Error" : "Fout",
+    "{new_name} already exists" : "{new_name} bestaat al",
     "Could not rename file" : "Kon de naam van het bestand niet wijzigen",
+    "Could not create file" : "Kon bestand niet creëren",
+    "Could not create folder" : "Kon niet creëren map",
     "Error deleting file." : "Fout bij verwijderen bestand.",
     "No entries in this folder match '{filter}'" : "Niets in deze map komt overeen met '{filter}'",
     "Name" : "Naam",
     "Size" : "Grootte",
     "Modified" : "Aangepast",
     "_%n file_::_%n files_" : ["%n bestand","%n bestanden"],
+    "{dirs} and {files}" : "{dirs} en {files}",
     "You don’t have permission to upload or create files here" : "U hebt geen toestemming om hier te uploaden of bestanden te maken",
     "_Uploading %n file_::_Uploading %n files_" : ["%n bestand aan het uploaden","%n bestanden aan het uploaden"],
+    "New" : "Nieuw",
     "\"{name}\" is an invalid file name." : "\"{name}\" is een ongeldige bestandsnaam.",
     "File name cannot be empty." : "Bestandsnaam kan niet leeg zijn.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Opslagruimte van {owner} zit vol, bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
@@ -66,9 +65,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Opslagruimte van {owner} zit bijna vol ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["komt overeen met '{filter}'","komen overeen met '{filter}'"],
-    "{dirs} and {files}" : "{dirs} en {files}",
+    "Path" : "Pad",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favoriet",
     "Favorite" : "Favoriet",
+    "{newname} already exists" : "{newname} bestaat al",
+    "Upload" : "Uploaden",
+    "Text file" : "Tekstbestand",
+    "New text file.txt" : "Nieuw tekstbestand.txt",
+    "Folder" : "Map",
+    "New folder" : "Nieuwe map",
     "An error occurred while trying to update the tags" : "Er trad een fout op bij uw poging de tags bij te werken",
     "A new file or folder has been <strong>created</strong>" : "Een nieuw bestand of map is <strong>aangemaakt</strong>",
     "A file or folder has been <strong>changed</strong>" : "Een bestand of map is <strong>gewijzigd</strong>",
@@ -90,22 +96,18 @@
     "File handling" : "Bestand",
     "Maximum upload size" : "Maximale bestandsgrootte voor uploads",
     "max. possible: " : "max. mogelijk: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Met PHP-FPM kan het tot 5 minuten duren voordat de aanpassing van deze waarde effect heeft.",
     "Save" : "Bewaren",
     "Can not be edited from here due to insufficient permissions." : "Kan hier niet worden bewerkt wegens onvoldoende permissies.",
     "Settings" : "Instellingen",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>",
-    "New" : "Nieuw",
-    "New text file" : "Nieuw tekstbestand",
-    "Text file" : "Tekstbestand",
-    "New folder" : "Nieuwe map",
-    "Folder" : "Map",
-    "Upload" : "Uploaden",
     "Cancel upload" : "Upload afbreken",
     "No files in here" : "Hier geen bestanden",
     "Upload some content or sync with your devices!" : "Upload bestanden of synchroniseer met uw apparaten!",
     "No entries found in this folder" : "Niets",
     "Select all" : "Alles selecteren",
+    "Delete" : "Verwijderen",
     "Upload too large" : "Upload is te groot",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
     "Files are being scanned, please wait." : "Bestanden worden gescand, even wachten.",
diff --git a/apps/files/l10n/nn_NO.js b/apps/files/l10n/nn_NO.js
index af4ec92771..cc993f5ca6 100644
--- a/apps/files/l10n/nn_NO.js
+++ b/apps/files/l10n/nn_NO.js
@@ -21,29 +21,33 @@ OC.L10N.register(
     "Files" : "Filer",
     "Favorites" : "Favorittar",
     "Home" : "Heime",
+    "Close" : "Lukk",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.",
     "Upload cancelled." : "Opplasting avbroten.",
     "Could not get result from server." : "Klarte ikkje å henta resultat frå tenaren.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
-    "{new_name} already exists" : "{new_name} finst allereie",
-    "Rename" : "Endra namn",
-    "Delete" : "Slett",
-    "Unshare" : "Udel",
+    "Actions" : "Handlingar",
     "Download" : "Last ned",
     "Pending" : "Under vegs",
     "Error moving file" : "Feil ved flytting av fil",
     "Error" : "Feil",
+    "{new_name} already exists" : "{new_name} finst allereie",
     "Name" : "Namn",
     "Size" : "Storleik",
     "Modified" : "Endra",
     "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
     "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "{dirs} and {files}" : "{dirs} og {files}",
     "_Uploading %n file_::_Uploading %n files_" : ["Lastar opp %n fil","Lastar opp %n filer"],
+    "New" : "Ny",
     "File name cannot be empty." : "Filnamnet kan ikkje vera tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringa di er nesten full ({usedSpacePercent} %)",
-    "{dirs} and {files}" : "{dirs} og {files}",
     "Favorite" : "Favoritt",
+    "Upload" : "Last opp",
+    "Text file" : "Tekst fil",
+    "Folder" : "Mappe",
+    "New folder" : "Ny mappe",
     "A new file or folder has been <strong>created</strong>" : "Ei ny fil eller mappe er <strong>oppretta</strong>",
     "A file or folder has been <strong>changed</strong>" : "Ei fil eller mappe er <strong>endra</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Ei fil eller mappe er <strong>sletta</strong>",
@@ -61,12 +65,8 @@ OC.L10N.register(
     "Save" : "Lagre",
     "Settings" : "Innstillingar",
     "WebDAV" : "WebDAV",
-    "New" : "Ny",
-    "Text file" : "Tekst fil",
-    "New folder" : "Ny mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Last opp",
     "Cancel upload" : "Avbryt opplasting",
+    "Delete" : "Slett",
     "Upload too large" : "For stor opplasting",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
     "Files are being scanned, please wait." : "Skannar filer, ver venleg og vent."
diff --git a/apps/files/l10n/nn_NO.json b/apps/files/l10n/nn_NO.json
index 8e0e297220..62d1cfb2c5 100644
--- a/apps/files/l10n/nn_NO.json
+++ b/apps/files/l10n/nn_NO.json
@@ -19,29 +19,33 @@
     "Files" : "Filer",
     "Favorites" : "Favorittar",
     "Home" : "Heime",
+    "Close" : "Lukk",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.",
     "Upload cancelled." : "Opplasting avbroten.",
     "Could not get result from server." : "Klarte ikkje å henta resultat frå tenaren.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
-    "{new_name} already exists" : "{new_name} finst allereie",
-    "Rename" : "Endra namn",
-    "Delete" : "Slett",
-    "Unshare" : "Udel",
+    "Actions" : "Handlingar",
     "Download" : "Last ned",
     "Pending" : "Under vegs",
     "Error moving file" : "Feil ved flytting av fil",
     "Error" : "Feil",
+    "{new_name} already exists" : "{new_name} finst allereie",
     "Name" : "Namn",
     "Size" : "Storleik",
     "Modified" : "Endra",
     "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
     "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "{dirs} and {files}" : "{dirs} og {files}",
     "_Uploading %n file_::_Uploading %n files_" : ["Lastar opp %n fil","Lastar opp %n filer"],
+    "New" : "Ny",
     "File name cannot be empty." : "Filnamnet kan ikkje vera tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Lagringa di er nesten full ({usedSpacePercent} %)",
-    "{dirs} and {files}" : "{dirs} og {files}",
     "Favorite" : "Favoritt",
+    "Upload" : "Last opp",
+    "Text file" : "Tekst fil",
+    "Folder" : "Mappe",
+    "New folder" : "Ny mappe",
     "A new file or folder has been <strong>created</strong>" : "Ei ny fil eller mappe er <strong>oppretta</strong>",
     "A file or folder has been <strong>changed</strong>" : "Ei fil eller mappe er <strong>endra</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Ei fil eller mappe er <strong>sletta</strong>",
@@ -59,12 +63,8 @@
     "Save" : "Lagre",
     "Settings" : "Innstillingar",
     "WebDAV" : "WebDAV",
-    "New" : "Ny",
-    "Text file" : "Tekst fil",
-    "New folder" : "Ny mappe",
-    "Folder" : "Mappe",
-    "Upload" : "Last opp",
     "Cancel upload" : "Avbryt opplasting",
+    "Delete" : "Slett",
     "Upload too large" : "For stor opplasting",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
     "Files are being scanned, please wait." : "Skannar filer, ver venleg og vent."
diff --git a/apps/files/l10n/oc.js b/apps/files/l10n/oc.js
index a3beb77ef2..75bceacac3 100644
--- a/apps/files/l10n/oc.js
+++ b/apps/files/l10n/oc.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Totes los fichièrs",
     "Favorites" : "Favorits",
     "Home" : "Mos fichièrs",
+    "Close" : "Tampar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible de mandar {filename} perque s'agís d'un repertòri o d'un fichièr de talha nulla",
     "Total file size {size1} exceeds upload limit {size2}" : "La talha totala del fichièr {size1} excedís la talha maximala de mandadís {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espaci liure insufisent : ensajatz de mandar {size1} mas solament {size2} son disponibles",
     "Upload cancelled." : "Mandadís anullat.",
     "Could not get result from server." : "Pòt pas recebre los resultats del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Lo mandadís del fichièr es en cors. Quitar aquesta pagina ara anullarà lo mandadís del fichièr.",
-    "{new_name} already exists" : "{new_name} existís ja",
-    "Could not create file" : "Impossible de crear lo fichièr",
-    "Could not create folder" : "Impossible de crear lo dorsièr",
-    "Rename" : "Renomenar",
-    "Delete" : "Suprimir",
-    "Disconnect storage" : "Desconnectar aqueste supòrt d'emmagazinatge",
-    "Unshare" : "Partejar pas mai",
-    "No permission to delete" : "Pas de permission de supression",
+    "Actions" : "Accions",
     "Download" : "Telecargar",
     "Select" : "Seleccionar",
     "Pending" : "En espèra",
@@ -50,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Error al moment del desplaçament del fichièr.",
     "Error moving file" : "Error al moment del desplaçament del fichièr",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} existís ja",
     "Could not rename file" : "Impossible de renomenar lo fichièr",
+    "Could not create file" : "Impossible de crear lo fichièr",
+    "Could not create folder" : "Impossible de crear lo dorsièr",
     "Error deleting file." : "Error pendent la supression del fichièr.",
     "No entries in this folder match '{filter}'" : "Cap d'entrada d'aqueste dorsièr correspond pas a '{filter}'",
     "Name" : "Nom",
@@ -58,16 +55,21 @@ OC.L10N.register(
     "Modified" : "Modificat",
     "_%n folder_::_%n folders_" : ["%n dorsièr","%n dorsièrs"],
     "_%n file_::_%n files_" : ["%n fichièr","%n fichièrs"],
+    "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Avètz pas la permission d'apondre de fichièrs aicí",
     "_Uploading %n file_::_Uploading %n files_" : ["Mandadís de %n fichièr","Mandadís de %n fichièrs"],
+    "New" : "Novèl",
     "\"{name}\" is an invalid file name." : "\"{name}\" es pas un nom de fichièr valid.",
     "File name cannot be empty." : "Lo nom de fichièr pòt pas èsser void.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vòstre espaci d'emmagazinatge es plen, los fichièrs pòdon pas mai èsser aponduts o sincronizats !",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vòstre espace d'emmagazinatge es gaireben plen ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["correspond a '{filter}'","correspondon a '{filter}'"],
-    "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Marcat coma favorit",
     "Favorite" : "Favorit",
+    "Upload" : "Cargament",
+    "Text file" : "Fichièr tèxte",
+    "Folder" : "Dorsièr",
+    "New folder" : "Novèl dorsièr",
     "An error occurred while trying to update the tags" : "Una error s'es produsida al moment de la mesa a jorn de las etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Un novèl fichièr o repertòri es estat <strong>creat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichièr o un repertòri es estat <strong>modificat</strong>",
@@ -94,17 +96,12 @@ OC.L10N.register(
     "Settings" : "Paramètres",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilizatz aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir a vòstres fichièrs per WebDAV</a>",
-    "New" : "Novèl",
-    "New text file" : "Novèl fichièr tèxte",
-    "Text file" : "Fichièr tèxte",
-    "New folder" : "Novèl dorsièr",
-    "Folder" : "Dorsièr",
-    "Upload" : "Cargament",
     "Cancel upload" : "Anullar lo mandadís",
     "No files in here" : "Pas cap de fichièr aicí",
     "Upload some content or sync with your devices!" : "Depausatz de contengut o sincronizatz vòstres aparelhs !",
     "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr",
     "Select all" : "Seleccionar tot",
+    "Delete" : "Suprimir",
     "Upload too large" : "Mandadís tròp voluminós",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los fichièrs qu'ensajatz de mandar depassan la talha maximala de mandadís permesa per aqueste servidor.",
     "Files are being scanned, please wait." : "Los fichièrs son en cors d'analisi, pacientatz.",
diff --git a/apps/files/l10n/oc.json b/apps/files/l10n/oc.json
index 1a90450202..20b690a2ed 100644
--- a/apps/files/l10n/oc.json
+++ b/apps/files/l10n/oc.json
@@ -27,20 +27,14 @@
     "All files" : "Totes los fichièrs",
     "Favorites" : "Favorits",
     "Home" : "Mos fichièrs",
+    "Close" : "Tampar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible de mandar {filename} perque s'agís d'un repertòri o d'un fichièr de talha nulla",
     "Total file size {size1} exceeds upload limit {size2}" : "La talha totala del fichièr {size1} excedís la talha maximala de mandadís {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espaci liure insufisent : ensajatz de mandar {size1} mas solament {size2} son disponibles",
     "Upload cancelled." : "Mandadís anullat.",
     "Could not get result from server." : "Pòt pas recebre los resultats del servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Lo mandadís del fichièr es en cors. Quitar aquesta pagina ara anullarà lo mandadís del fichièr.",
-    "{new_name} already exists" : "{new_name} existís ja",
-    "Could not create file" : "Impossible de crear lo fichièr",
-    "Could not create folder" : "Impossible de crear lo dorsièr",
-    "Rename" : "Renomenar",
-    "Delete" : "Suprimir",
-    "Disconnect storage" : "Desconnectar aqueste supòrt d'emmagazinatge",
-    "Unshare" : "Partejar pas mai",
-    "No permission to delete" : "Pas de permission de supression",
+    "Actions" : "Accions",
     "Download" : "Telecargar",
     "Select" : "Seleccionar",
     "Pending" : "En espèra",
@@ -48,7 +42,10 @@
     "Error moving file." : "Error al moment del desplaçament del fichièr.",
     "Error moving file" : "Error al moment del desplaçament del fichièr",
     "Error" : "Error",
+    "{new_name} already exists" : "{new_name} existís ja",
     "Could not rename file" : "Impossible de renomenar lo fichièr",
+    "Could not create file" : "Impossible de crear lo fichièr",
+    "Could not create folder" : "Impossible de crear lo dorsièr",
     "Error deleting file." : "Error pendent la supression del fichièr.",
     "No entries in this folder match '{filter}'" : "Cap d'entrada d'aqueste dorsièr correspond pas a '{filter}'",
     "Name" : "Nom",
@@ -56,16 +53,21 @@
     "Modified" : "Modificat",
     "_%n folder_::_%n folders_" : ["%n dorsièr","%n dorsièrs"],
     "_%n file_::_%n files_" : ["%n fichièr","%n fichièrs"],
+    "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Avètz pas la permission d'apondre de fichièrs aicí",
     "_Uploading %n file_::_Uploading %n files_" : ["Mandadís de %n fichièr","Mandadís de %n fichièrs"],
+    "New" : "Novèl",
     "\"{name}\" is an invalid file name." : "\"{name}\" es pas un nom de fichièr valid.",
     "File name cannot be empty." : "Lo nom de fichièr pòt pas èsser void.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vòstre espaci d'emmagazinatge es plen, los fichièrs pòdon pas mai èsser aponduts o sincronizats !",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vòstre espace d'emmagazinatge es gaireben plen ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["correspond a '{filter}'","correspondon a '{filter}'"],
-    "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Marcat coma favorit",
     "Favorite" : "Favorit",
+    "Upload" : "Cargament",
+    "Text file" : "Fichièr tèxte",
+    "Folder" : "Dorsièr",
+    "New folder" : "Novèl dorsièr",
     "An error occurred while trying to update the tags" : "Una error s'es produsida al moment de la mesa a jorn de las etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Un novèl fichièr o repertòri es estat <strong>creat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un fichièr o un repertòri es estat <strong>modificat</strong>",
@@ -92,17 +94,12 @@
     "Settings" : "Paramètres",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilizatz aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir a vòstres fichièrs per WebDAV</a>",
-    "New" : "Novèl",
-    "New text file" : "Novèl fichièr tèxte",
-    "Text file" : "Fichièr tèxte",
-    "New folder" : "Novèl dorsièr",
-    "Folder" : "Dorsièr",
-    "Upload" : "Cargament",
     "Cancel upload" : "Anullar lo mandadís",
     "No files in here" : "Pas cap de fichièr aicí",
     "Upload some content or sync with your devices!" : "Depausatz de contengut o sincronizatz vòstres aparelhs !",
     "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr",
     "Select all" : "Seleccionar tot",
+    "Delete" : "Suprimir",
     "Upload too large" : "Mandadís tròp voluminós",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los fichièrs qu'ensajatz de mandar depassan la talha maximala de mandadís permesa per aqueste servidor.",
     "Files are being scanned, please wait." : "Los fichièrs son en cors d'analisi, pacientatz.",
diff --git a/apps/files/l10n/pa.js b/apps/files/l10n/pa.js
index 19f9dd4eb6..c92f4473cc 100644
--- a/apps/files/l10n/pa.js
+++ b/apps/files/l10n/pa.js
@@ -3,12 +3,11 @@ OC.L10N.register(
     {
     "Unknown error" : "ਅਣਜਾਣ ਗਲਤੀ",
     "Files" : "ਫਾਇਲਾਂ",
-    "Rename" : "ਨਾਂ ਬਦਲੋ",
-    "Delete" : "ਹਟਾਓ",
     "Download" : "ਡਾਊਨਲੋਡ",
     "Error" : "ਗਲਤੀ",
-    "Settings" : "ਸੈਟਿੰਗ",
     "Upload" : "ਅੱਪਲੋਡ",
-    "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
+    "Settings" : "ਸੈਟਿੰਗ",
+    "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ",
+    "Delete" : "ਹਟਾਓ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/pa.json b/apps/files/l10n/pa.json
index 665a79f5d2..438a0cdb31 100644
--- a/apps/files/l10n/pa.json
+++ b/apps/files/l10n/pa.json
@@ -1,12 +1,11 @@
 { "translations": {
     "Unknown error" : "ਅਣਜਾਣ ਗਲਤੀ",
     "Files" : "ਫਾਇਲਾਂ",
-    "Rename" : "ਨਾਂ ਬਦਲੋ",
-    "Delete" : "ਹਟਾਓ",
     "Download" : "ਡਾਊਨਲੋਡ",
     "Error" : "ਗਲਤੀ",
-    "Settings" : "ਸੈਟਿੰਗ",
     "Upload" : "ਅੱਪਲੋਡ",
-    "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
+    "Settings" : "ਸੈਟਿੰਗ",
+    "Cancel upload" : "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ",
+    "Delete" : "ਹਟਾਓ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js
index daa623d3cd..c64f9c97d6 100644
--- a/apps/files/l10n/pl.js
+++ b/apps/files/l10n/pl.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Wszystkie pliki",
     "Favorites" : "Ulubione",
     "Home" : "Dom",
+    "Close" : "Zamknij",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów",
     "Total file size {size1} exceeds upload limit {size2}" : "Całkowity rozmiar {size1} przekracza limit uploadu {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}",
     "Upload cancelled." : "Wczytywanie anulowane.",
     "Could not get result from server." : "Nie można uzyskać wyniku z serwera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
-    "{new_name} already exists" : "{new_name} już istnieje",
-    "Could not create file" : "Nie można utworzyć pliku",
-    "Could not create folder" : "Nie można utworzyć folderu",
-    "Rename" : "Zmień nazwę",
-    "Delete" : "Usuń",
-    "Disconnect storage" : "Odłącz magazyn",
-    "Unshare" : "Zatrzymaj współdzielenie",
-    "No permission to delete" : "Brak uprawnień do usunięcia",
+    "Actions" : "Akcje",
     "Download" : "Pobierz",
     "Select" : "Wybierz",
     "Pending" : "Oczekujące",
@@ -50,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Błąd podczas przenoszenia pliku.",
     "Error moving file" : "Błąd prz przenoszeniu pliku",
     "Error" : "Błąd",
+    "{new_name} already exists" : "{new_name} już istnieje",
     "Could not rename file" : "Nie można zmienić nazwy pliku",
+    "Could not create file" : "Nie można utworzyć pliku",
+    "Could not create folder" : "Nie można utworzyć folderu",
     "Error deleting file." : "Błąd podczas usuwania pliku",
     "No entries in this folder match '{filter}'" : "Brak wyników pasujących do '{filter}'",
     "Name" : "Nazwa",
@@ -58,17 +55,22 @@ OC.L10N.register(
     "Modified" : "Modyfikacja",
     "_%n folder_::_%n folders_" : ["%n katalog","%n katalogi","%n katalogów"],
     "_%n file_::_%n files_" : ["%n plik","%n pliki","%n plików"],
+    "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Nie masz uprawnień do wczytywania lub tworzenia plików w tym miejscu",
     "_Uploading %n file_::_Uploading %n files_" : ["Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"],
+    "New" : "Nowy",
     "\"{name}\" is an invalid file name." : "\"{name}\" jest nieprawidłową nazwą pliku.",
     "File name cannot be empty." : "Nazwa pliku nie może być pusta.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Brak wolnego miejsca {owner}, pliki nie mogą zostać zaktualizowane lub synchronizowane! ",
     "Your storage is full, files can not be updated or synced anymore!" : "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Miejsce dla {owner} jest na wyczerpaniu ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Ulubione",
     "Favorite" : "Ulubione",
+    "Upload" : "Wyślij",
+    "Text file" : "Plik tekstowy",
+    "Folder" : "Folder",
+    "New folder" : "Nowy folder",
     "A new file or folder has been <strong>created</strong>" : "Nowy plik lub folder został <strong>utworzony</strong>",
     "A file or folder has been <strong>changed</strong>" : "Plik lub folder został <strong>zmieniony</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Plik lub folder został <strong>usunięty</strong>",
@@ -92,15 +94,10 @@ OC.L10N.register(
     "Settings" : "Ustawienia",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
-    "New" : "Nowy",
-    "New text file" : "Nowy plik tekstowy",
-    "Text file" : "Plik tekstowy",
-    "New folder" : "Nowy folder",
-    "Folder" : "Folder",
-    "Upload" : "Wyślij",
     "Cancel upload" : "Anuluj wysyłanie",
     "No entries found in this folder" : "Brak wpisów w tym folderze",
     "Select all" : "Wybierz wszystko",
+    "Delete" : "Usuń",
     "Upload too large" : "Ładowany plik jest za duży",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
     "Files are being scanned, please wait." : "Skanowanie plików, proszę czekać.",
diff --git a/apps/files/l10n/pl.json b/apps/files/l10n/pl.json
index a46afbcc9f..d5a3c33e69 100644
--- a/apps/files/l10n/pl.json
+++ b/apps/files/l10n/pl.json
@@ -27,20 +27,14 @@
     "All files" : "Wszystkie pliki",
     "Favorites" : "Ulubione",
     "Home" : "Dom",
+    "Close" : "Zamknij",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów",
     "Total file size {size1} exceeds upload limit {size2}" : "Całkowity rozmiar {size1} przekracza limit uploadu {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}",
     "Upload cancelled." : "Wczytywanie anulowane.",
     "Could not get result from server." : "Nie można uzyskać wyniku z serwera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
-    "{new_name} already exists" : "{new_name} już istnieje",
-    "Could not create file" : "Nie można utworzyć pliku",
-    "Could not create folder" : "Nie można utworzyć folderu",
-    "Rename" : "Zmień nazwę",
-    "Delete" : "Usuń",
-    "Disconnect storage" : "Odłącz magazyn",
-    "Unshare" : "Zatrzymaj współdzielenie",
-    "No permission to delete" : "Brak uprawnień do usunięcia",
+    "Actions" : "Akcje",
     "Download" : "Pobierz",
     "Select" : "Wybierz",
     "Pending" : "Oczekujące",
@@ -48,7 +42,10 @@
     "Error moving file." : "Błąd podczas przenoszenia pliku.",
     "Error moving file" : "Błąd prz przenoszeniu pliku",
     "Error" : "Błąd",
+    "{new_name} already exists" : "{new_name} już istnieje",
     "Could not rename file" : "Nie można zmienić nazwy pliku",
+    "Could not create file" : "Nie można utworzyć pliku",
+    "Could not create folder" : "Nie można utworzyć folderu",
     "Error deleting file." : "Błąd podczas usuwania pliku",
     "No entries in this folder match '{filter}'" : "Brak wyników pasujących do '{filter}'",
     "Name" : "Nazwa",
@@ -56,17 +53,22 @@
     "Modified" : "Modyfikacja",
     "_%n folder_::_%n folders_" : ["%n katalog","%n katalogi","%n katalogów"],
     "_%n file_::_%n files_" : ["%n plik","%n pliki","%n plików"],
+    "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Nie masz uprawnień do wczytywania lub tworzenia plików w tym miejscu",
     "_Uploading %n file_::_Uploading %n files_" : ["Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"],
+    "New" : "Nowy",
     "\"{name}\" is an invalid file name." : "\"{name}\" jest nieprawidłową nazwą pliku.",
     "File name cannot be empty." : "Nazwa pliku nie może być pusta.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Brak wolnego miejsca {owner}, pliki nie mogą zostać zaktualizowane lub synchronizowane! ",
     "Your storage is full, files can not be updated or synced anymore!" : "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Miejsce dla {owner} jest na wyczerpaniu ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Ulubione",
     "Favorite" : "Ulubione",
+    "Upload" : "Wyślij",
+    "Text file" : "Plik tekstowy",
+    "Folder" : "Folder",
+    "New folder" : "Nowy folder",
     "A new file or folder has been <strong>created</strong>" : "Nowy plik lub folder został <strong>utworzony</strong>",
     "A file or folder has been <strong>changed</strong>" : "Plik lub folder został <strong>zmieniony</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Plik lub folder został <strong>usunięty</strong>",
@@ -90,15 +92,10 @@
     "Settings" : "Ustawienia",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
-    "New" : "Nowy",
-    "New text file" : "Nowy plik tekstowy",
-    "Text file" : "Plik tekstowy",
-    "New folder" : "Nowy folder",
-    "Folder" : "Folder",
-    "Upload" : "Wyślij",
     "Cancel upload" : "Anuluj wysyłanie",
     "No entries found in this folder" : "Brak wpisów w tym folderze",
     "Select all" : "Wybierz wszystko",
+    "Delete" : "Usuń",
     "Upload too large" : "Ładowany plik jest za duży",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
     "Files are being scanned, please wait." : "Skanowanie plików, proszę czekać.",
diff --git a/apps/files/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
index 583123252f..7f154cbbf5 100644
--- a/apps/files/l10n/pt_BR.js
+++ b/apps/files/l10n/pt_BR.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Todos os arquivos",
     "Favorites" : "Favoritos",
     "Home" : "Home",
+    "Close" : "Fechar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do arquivo {size1} excede o limite de envio {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}",
     "Upload cancelled." : "Envio cancelado.",
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.",
-    "{new_name} already exists" : "{new_name} já existe",
-    "Could not create file" : "Não foi possível criar o arquivo",
-    "Could not create folder" : "Não foi possível criar a pasta",
-    "Rename" : "Renomear",
-    "Delete" : "Excluir",
-    "Disconnect storage" : "Desconectar armazenagem",
-    "Unshare" : "Descompartilhar",
-    "No permission to delete" : "Sem permissão para excluir",
+    "Actions" : "Ações",
     "Download" : "Baixar",
     "Select" : "Selecionar",
     "Pending" : "Pendente",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Erro movendo o arquivo.",
     "Error moving file" : "Erro movendo o arquivo",
     "Error" : "Erro",
+    "{new_name} already exists" : "{new_name} já existe",
     "Could not rename file" : "Não foi possível renomear o arquivo",
+    "Could not create file" : "Não foi possível criar o arquivo",
+    "Could not create folder" : "Não foi possível criar a pasta",
     "Error deleting file." : "Erro eliminando o arquivo.",
     "No entries in this folder match '{filter}'" : "Nenhuma entrada nesta pasta coincide com '{filter}'",
     "Name" : "Nome",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n pasta","%n pastas"],
     "_%n file_::_%n files_" : ["%n arquivo","%n arquivos"],
+    "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Você não tem permissão para enviar ou criar arquivos aqui",
     "_Uploading %n file_::_Uploading %n files_" : ["Enviando %n arquivo","Enviando %n arquivos"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de arquivo inválido.",
     "File name cannot be empty." : "O nome do arquivo não pode estar vazio.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Armazenamento do {owner} está cheio, os arquivos não podem ser mais atualizados ou sincronizados!",
@@ -69,9 +68,16 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Armazenamento do {owner} está quase cheio ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincide com '{filter}'","coincide com '{filter}'"],
-    "{dirs} and {files}" : "{dirs} e {files}",
+    "Path" : "Caminho",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favorito",
     "Favorite" : "Favorito",
+    "{newname} already exists" : "{newname} já existe",
+    "Upload" : "Enviar",
+    "Text file" : "Arquivo texto",
+    "New text file.txt" : "Novo texto file.txt",
+    "Folder" : "Pasta",
+    "New folder" : "Nova pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Um novo arquivo ou pasta foi <strong>criado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Um arquivo ou pasta foi <strong>modificado</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "Tratamento de Arquivo",
     "Maximum upload size" : "Tamanho máximo para envio",
     "max. possible: " : "max. possível:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Com PHP-FPM este valor pode demorar até 5 minutos para fazer efeito depois de ser salvo.",
     "Save" : "Salvar",
     "Can not be edited from here due to insufficient permissions." : "Não pode ser editado a partir daqui devido a permissões insuficientes.",
     "Settings" : "Configurações",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso aos seus Arquivos via WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Novo arquivo texto",
-    "Text file" : "Arquivo texto",
-    "New folder" : "Nova pasta",
-    "Folder" : "Pasta",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar envio",
     "No files in here" : "Nenhum arquivo aqui",
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!",
     "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta",
     "Select all" : "Selecionar tudo",
+    "Delete" : "Excluir",
     "Upload too large" : "Arquivo muito grande para envio",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os arquivos que você está tentando enviar excedeu o tamanho máximo para arquivos no servidor.",
     "Files are being scanned, please wait." : "Arquivos sendo escaneados, por favor aguarde.",
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
index 31227d66f8..81c76bb2b8 100644
--- a/apps/files/l10n/pt_BR.json
+++ b/apps/files/l10n/pt_BR.json
@@ -27,20 +27,14 @@
     "All files" : "Todos os arquivos",
     "Favorites" : "Favoritos",
     "Home" : "Home",
+    "Close" : "Fechar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do arquivo {size1} excede o limite de envio {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}",
     "Upload cancelled." : "Envio cancelado.",
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.",
-    "{new_name} already exists" : "{new_name} já existe",
-    "Could not create file" : "Não foi possível criar o arquivo",
-    "Could not create folder" : "Não foi possível criar a pasta",
-    "Rename" : "Renomear",
-    "Delete" : "Excluir",
-    "Disconnect storage" : "Desconectar armazenagem",
-    "Unshare" : "Descompartilhar",
-    "No permission to delete" : "Sem permissão para excluir",
+    "Actions" : "Ações",
     "Download" : "Baixar",
     "Select" : "Selecionar",
     "Pending" : "Pendente",
@@ -50,7 +44,10 @@
     "Error moving file." : "Erro movendo o arquivo.",
     "Error moving file" : "Erro movendo o arquivo",
     "Error" : "Erro",
+    "{new_name} already exists" : "{new_name} já existe",
     "Could not rename file" : "Não foi possível renomear o arquivo",
+    "Could not create file" : "Não foi possível criar o arquivo",
+    "Could not create folder" : "Não foi possível criar a pasta",
     "Error deleting file." : "Erro eliminando o arquivo.",
     "No entries in this folder match '{filter}'" : "Nenhuma entrada nesta pasta coincide com '{filter}'",
     "Name" : "Nome",
@@ -58,8 +55,10 @@
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n pasta","%n pastas"],
     "_%n file_::_%n files_" : ["%n arquivo","%n arquivos"],
+    "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Você não tem permissão para enviar ou criar arquivos aqui",
     "_Uploading %n file_::_Uploading %n files_" : ["Enviando %n arquivo","Enviando %n arquivos"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de arquivo inválido.",
     "File name cannot be empty." : "O nome do arquivo não pode estar vazio.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Armazenamento do {owner} está cheio, os arquivos não podem ser mais atualizados ou sincronizados!",
@@ -67,9 +66,16 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Armazenamento do {owner} está quase cheio ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["coincide com '{filter}'","coincide com '{filter}'"],
-    "{dirs} and {files}" : "{dirs} e {files}",
+    "Path" : "Caminho",
+    "_%n byte_::_%n bytes_" : ["%n byte","%n bytes"],
     "Favorited" : "Favorito",
     "Favorite" : "Favorito",
+    "{newname} already exists" : "{newname} já existe",
+    "Upload" : "Enviar",
+    "Text file" : "Arquivo texto",
+    "New text file.txt" : "Novo texto file.txt",
+    "Folder" : "Pasta",
+    "New folder" : "Nova pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro enquanto tentava atualizar as etiquetas",
     "A new file or folder has been <strong>created</strong>" : "Um novo arquivo ou pasta foi <strong>criado</strong>",
     "A file or folder has been <strong>changed</strong>" : "Um arquivo ou pasta foi <strong>modificado</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "Tratamento de Arquivo",
     "Maximum upload size" : "Tamanho máximo para envio",
     "max. possible: " : "max. possível:",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "Com PHP-FPM este valor pode demorar até 5 minutos para fazer efeito depois de ser salvo.",
     "Save" : "Salvar",
     "Can not be edited from here due to insufficient permissions." : "Não pode ser editado a partir daqui devido a permissões insuficientes.",
     "Settings" : "Configurações",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso aos seus Arquivos via WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Novo arquivo texto",
-    "Text file" : "Arquivo texto",
-    "New folder" : "Nova pasta",
-    "Folder" : "Pasta",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar envio",
     "No files in here" : "Nenhum arquivo aqui",
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com seus dispositivos!",
     "No entries found in this folder" : "Nenhuma entrada foi encontrada nesta pasta",
     "Select all" : "Selecionar tudo",
+    "Delete" : "Excluir",
     "Upload too large" : "Arquivo muito grande para envio",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os arquivos que você está tentando enviar excedeu o tamanho máximo para arquivos no servidor.",
     "Files are being scanned, please wait." : "Arquivos sendo escaneados, por favor aguarde.",
diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js
index d1830fefd9..32f7dee7d4 100644
--- a/apps/files/l10n/pt_PT.js
+++ b/apps/files/l10n/pt_PT.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Todos os ficheiros",
     "Favorites" : "Favoritos",
     "Home" : "Casa",
+    "Close" : "Fechar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível",
     "Upload cancelled." : "Envio cancelado.",
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
-    "{new_name} already exists" : "O nome {new_name} já existe",
-    "Could not create file" : "Não pôde criar ficheiro",
-    "Could not create folder" : "Não pôde criar pasta",
-    "Rename" : "Renomear",
-    "Delete" : "Apagar",
-    "Disconnect storage" : "Desconete o armazenamento",
-    "Unshare" : "Deixar de partilhar",
-    "No permission to delete" : "Não tem permissão para apagar",
+    "Actions" : "Ações",
     "Download" : "Descarregar",
     "Select" : "Selecionar",
     "Pending" : "Pendente",
@@ -50,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Erro a mover o ficheiro.",
     "Error moving file" : "Erro ao mover o ficheiro",
     "Error" : "Erro",
+    "{new_name} already exists" : "O nome {new_name} já existe",
     "Could not rename file" : "Não pôde renomear o ficheiro",
+    "Could not create file" : "Não pôde criar ficheiro",
+    "Could not create folder" : "Não pôde criar pasta",
     "Error deleting file." : "Erro ao apagar o ficheiro.",
     "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'",
     "Name" : "Nome",
@@ -58,16 +55,21 @@ OC.L10N.register(
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n pasta","%n pastas"],
     "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
+    "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Você não tem permissão para enviar ou criar ficheiros aqui",
     "_Uploading %n file_::_Uploading %n files_" : ["A carregar %n ficheiro","A carregar %n ficheiros"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de ficheiro inválido.",
     "File name cannot be empty." : "O nome do ficheiro não pode estar em branco.",
     "Your storage is full, files can not be updated or synced anymore!" : "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
     "Your storage is almost full ({usedSpacePercent}%)" : "O seu armazenamento está quase cheiro ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
-    "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Assinalado como Favorito",
     "Favorite" : "Favorito",
+    "Upload" : "Enviar",
+    "Text file" : "Ficheiro de Texto",
+    "Folder" : "Pasta",
+    "New folder" : "Nova Pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as tags",
     "A new file or folder has been <strong>created</strong>" : "Foi <strong>criado</strong> um novo ficheiro ou pasta",
     "A file or folder has been <strong>changed</strong>" : "Foi <strong>alterado</strong> um ficheiro ou pasta",
@@ -94,17 +96,12 @@ OC.L10N.register(
     "Settings" : "Definições",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Novo ficheiro de texto",
-    "Text file" : "Ficheiro de Texto",
-    "New folder" : "Nova Pasta",
-    "Folder" : "Pasta",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar o envio",
     "No files in here" : "Nenhuns ficheiros aqui",
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!",
     "No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
     "Select all" : "Seleccionar todos",
+    "Delete" : "Apagar",
     "Upload too large" : "Upload muito grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
     "Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.",
diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json
index f0d2d6b74d..5c6a8aecec 100644
--- a/apps/files/l10n/pt_PT.json
+++ b/apps/files/l10n/pt_PT.json
@@ -27,20 +27,14 @@
     "All files" : "Todos os ficheiros",
     "Favorites" : "Favoritos",
     "Home" : "Casa",
+    "Close" : "Fechar",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes",
     "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível",
     "Upload cancelled." : "Envio cancelado.",
     "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
-    "{new_name} already exists" : "O nome {new_name} já existe",
-    "Could not create file" : "Não pôde criar ficheiro",
-    "Could not create folder" : "Não pôde criar pasta",
-    "Rename" : "Renomear",
-    "Delete" : "Apagar",
-    "Disconnect storage" : "Desconete o armazenamento",
-    "Unshare" : "Deixar de partilhar",
-    "No permission to delete" : "Não tem permissão para apagar",
+    "Actions" : "Ações",
     "Download" : "Descarregar",
     "Select" : "Selecionar",
     "Pending" : "Pendente",
@@ -48,7 +42,10 @@
     "Error moving file." : "Erro a mover o ficheiro.",
     "Error moving file" : "Erro ao mover o ficheiro",
     "Error" : "Erro",
+    "{new_name} already exists" : "O nome {new_name} já existe",
     "Could not rename file" : "Não pôde renomear o ficheiro",
+    "Could not create file" : "Não pôde criar ficheiro",
+    "Could not create folder" : "Não pôde criar pasta",
     "Error deleting file." : "Erro ao apagar o ficheiro.",
     "No entries in this folder match '{filter}'" : "Nenhumas entradas nesta pasta correspondem a '{filter}'",
     "Name" : "Nome",
@@ -56,16 +53,21 @@
     "Modified" : "Modificado",
     "_%n folder_::_%n folders_" : ["%n pasta","%n pastas"],
     "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
+    "{dirs} and {files}" : "{dirs} e {files}",
     "You don’t have permission to upload or create files here" : "Você não tem permissão para enviar ou criar ficheiros aqui",
     "_Uploading %n file_::_Uploading %n files_" : ["A carregar %n ficheiro","A carregar %n ficheiros"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de ficheiro inválido.",
     "File name cannot be empty." : "O nome do ficheiro não pode estar em branco.",
     "Your storage is full, files can not be updated or synced anymore!" : "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
     "Your storage is almost full ({usedSpacePercent}%)" : "O seu armazenamento está quase cheiro ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["corresponde a '{filter}'","correspondem a '{filter}'"],
-    "{dirs} and {files}" : "{dirs} e {files}",
     "Favorited" : "Assinalado como Favorito",
     "Favorite" : "Favorito",
+    "Upload" : "Enviar",
+    "Text file" : "Ficheiro de Texto",
+    "Folder" : "Pasta",
+    "New folder" : "Nova Pasta",
     "An error occurred while trying to update the tags" : "Ocorreu um erro ao tentar atualizar as tags",
     "A new file or folder has been <strong>created</strong>" : "Foi <strong>criado</strong> um novo ficheiro ou pasta",
     "A file or folder has been <strong>changed</strong>" : "Foi <strong>alterado</strong> um ficheiro ou pasta",
@@ -92,17 +94,12 @@
     "Settings" : "Definições",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>",
-    "New" : "Novo",
-    "New text file" : "Novo ficheiro de texto",
-    "Text file" : "Ficheiro de Texto",
-    "New folder" : "Nova Pasta",
-    "Folder" : "Pasta",
-    "Upload" : "Enviar",
     "Cancel upload" : "Cancelar o envio",
     "No files in here" : "Nenhuns ficheiros aqui",
     "Upload some content or sync with your devices!" : "Carregue algum conteúdo ou sincronize com os seus aparelhos!",
     "No entries found in this folder" : "Não foram encontradas entradas nesta pasta",
     "Select all" : "Seleccionar todos",
+    "Delete" : "Apagar",
     "Upload too large" : "Upload muito grande",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
     "Files are being scanned, please wait." : "Os ficheiros estão a ser analisados, por favor aguarde.",
diff --git a/apps/files/l10n/ro.js b/apps/files/l10n/ro.js
index 541ff6e444..35753e97da 100644
--- a/apps/files/l10n/ro.js
+++ b/apps/files/l10n/ro.js
@@ -29,40 +29,43 @@ OC.L10N.register(
     "All files" : "Toate fișierele.",
     "Favorites" : "Favorite",
     "Home" : "Acasă",
+    "Close" : "Închide",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți",
     "Total file size {size1} exceeds upload limit {size2}" : "Mărimea fișierului este {size1} ce depășește limita de încărcare de {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas",
     "Upload cancelled." : "Încărcare anulată.",
     "Could not get result from server." : "Nu se poate obține rezultatul de la server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
-    "{new_name} already exists" : "{new_name} există deja",
-    "Could not create file" : "Nu s-a putut crea fisierul",
-    "Could not create folder" : "Nu s-a putut crea folderul",
-    "Rename" : "Redenumește",
-    "Delete" : "Șterge",
-    "Disconnect storage" : "Deconectează stocarea",
-    "Unshare" : "Nu mai partaja",
+    "Actions" : "Acțiuni",
     "Download" : "Descarcă",
     "Select" : "Alege",
     "Pending" : "În așteptare",
     "Error moving file." : "Eroare la mutarea fișierului.",
     "Error moving file" : "Eroare la mutarea fișierului",
     "Error" : "Eroare",
+    "{new_name} already exists" : "{new_name} există deja",
     "Could not rename file" : "Nu s-a putut redenumi fișierul",
+    "Could not create file" : "Nu s-a putut crea fisierul",
+    "Could not create folder" : "Nu s-a putut crea folderul",
     "Error deleting file." : "Eroare la ștergerea fișierului.",
     "Name" : "Nume",
     "Size" : "Mărime",
     "Modified" : "Modificat",
     "_%n folder_::_%n folders_" : ["%n director","%n directoare","%n directoare"],
     "_%n file_::_%n files_" : ["%n fișier","%n fișiere","%n fișiere"],
+    "{dirs} and {files}" : "{dirs} și {files}",
     "You don’t have permission to upload or create files here" : "Nu aveți permisiunea de a încărca sau crea fișiere aici",
     "_Uploading %n file_::_Uploading %n files_" : ["Se încarcă %n fișier.","Se încarcă %n fișiere.","Se încarcă %n fișiere."],
+    "New" : "Nou",
     "\"{name}\" is an invalid file name." : "\"{name}\" este un nume de fișier nevalid.",
     "File name cannot be empty." : "Numele fișierului nu poate rămâne gol.",
     "Your storage is full, files can not be updated or synced anymore!" : "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Spațiul de stocare este aproape plin ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} și {files}",
     "Favorite" : "Favorit",
+    "Upload" : "Încărcă",
+    "Text file" : "Fișier text",
+    "Folder" : "Dosar",
+    "New folder" : "Un nou dosar",
     "A new file or folder has been <strong>created</strong>" : "Un nou fișier sau dosar a fost <strong>creat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un nou fișier sau dosar a fost <strong>modificat</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un nou fișier sau dosar a fost <strong>șters</strong>",
@@ -86,14 +89,9 @@ OC.L10N.register(
     "Settings" : "Setări",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>",
-    "New" : "Nou",
-    "New text file" : "Un nou fișier text",
-    "Text file" : "Fișier text",
-    "New folder" : "Un nou dosar",
-    "Folder" : "Dosar",
-    "Upload" : "Încărcă",
     "Cancel upload" : "Anulează încărcarea",
     "Select all" : "Selectează tot",
+    "Delete" : "Șterge",
     "Upload too large" : "Fișierul încărcat este prea mare",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.",
     "Files are being scanned, please wait." : "Fișierele sunt scanate, te rog așteaptă.",
diff --git a/apps/files/l10n/ro.json b/apps/files/l10n/ro.json
index 6c4536d535..22d66f8dbf 100644
--- a/apps/files/l10n/ro.json
+++ b/apps/files/l10n/ro.json
@@ -27,40 +27,43 @@
     "All files" : "Toate fișierele.",
     "Favorites" : "Favorite",
     "Home" : "Acasă",
+    "Close" : "Închide",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți",
     "Total file size {size1} exceeds upload limit {size2}" : "Mărimea fișierului este {size1} ce depășește limita de încărcare de {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas",
     "Upload cancelled." : "Încărcare anulată.",
     "Could not get result from server." : "Nu se poate obține rezultatul de la server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
-    "{new_name} already exists" : "{new_name} există deja",
-    "Could not create file" : "Nu s-a putut crea fisierul",
-    "Could not create folder" : "Nu s-a putut crea folderul",
-    "Rename" : "Redenumește",
-    "Delete" : "Șterge",
-    "Disconnect storage" : "Deconectează stocarea",
-    "Unshare" : "Nu mai partaja",
+    "Actions" : "Acțiuni",
     "Download" : "Descarcă",
     "Select" : "Alege",
     "Pending" : "În așteptare",
     "Error moving file." : "Eroare la mutarea fișierului.",
     "Error moving file" : "Eroare la mutarea fișierului",
     "Error" : "Eroare",
+    "{new_name} already exists" : "{new_name} există deja",
     "Could not rename file" : "Nu s-a putut redenumi fișierul",
+    "Could not create file" : "Nu s-a putut crea fisierul",
+    "Could not create folder" : "Nu s-a putut crea folderul",
     "Error deleting file." : "Eroare la ștergerea fișierului.",
     "Name" : "Nume",
     "Size" : "Mărime",
     "Modified" : "Modificat",
     "_%n folder_::_%n folders_" : ["%n director","%n directoare","%n directoare"],
     "_%n file_::_%n files_" : ["%n fișier","%n fișiere","%n fișiere"],
+    "{dirs} and {files}" : "{dirs} și {files}",
     "You don’t have permission to upload or create files here" : "Nu aveți permisiunea de a încărca sau crea fișiere aici",
     "_Uploading %n file_::_Uploading %n files_" : ["Se încarcă %n fișier.","Se încarcă %n fișiere.","Se încarcă %n fișiere."],
+    "New" : "Nou",
     "\"{name}\" is an invalid file name." : "\"{name}\" este un nume de fișier nevalid.",
     "File name cannot be empty." : "Numele fișierului nu poate rămâne gol.",
     "Your storage is full, files can not be updated or synced anymore!" : "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Spațiul de stocare este aproape plin ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} și {files}",
     "Favorite" : "Favorit",
+    "Upload" : "Încărcă",
+    "Text file" : "Fișier text",
+    "Folder" : "Dosar",
+    "New folder" : "Un nou dosar",
     "A new file or folder has been <strong>created</strong>" : "Un nou fișier sau dosar a fost <strong>creat</strong>",
     "A file or folder has been <strong>changed</strong>" : "Un nou fișier sau dosar a fost <strong>modificat</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Un nou fișier sau dosar a fost <strong>șters</strong>",
@@ -84,14 +87,9 @@
     "Settings" : "Setări",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Folosește această adresă <a href=\"%s\" target=\"_blank\">pentru acces la fișierele tale folosind WebDAV</a>",
-    "New" : "Nou",
-    "New text file" : "Un nou fișier text",
-    "Text file" : "Fișier text",
-    "New folder" : "Un nou dosar",
-    "Folder" : "Dosar",
-    "Upload" : "Încărcă",
     "Cancel upload" : "Anulează încărcarea",
     "Select all" : "Selectează tot",
+    "Delete" : "Șterge",
     "Upload too large" : "Fișierul încărcat este prea mare",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.",
     "Files are being scanned, please wait." : "Fișierele sunt scanate, te rog așteaptă.",
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
index a2a7bc69c9..962698709c 100644
--- a/apps/files/l10n/ru.js
+++ b/apps/files/l10n/ru.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Все файлы",
     "Favorites" : "Избранное",
     "Home" : "Главная",
+    "Close" : "Закрыть",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера",
     "Total file size {size1} exceeds upload limit {size2}" : "Полный размер файла {size1} превышает лимит по загрузке {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, Вы загружаете {size1}, но осталось только {size2}",
     "Upload cancelled." : "Загрузка отменена.",
     "Could not get result from server." : "Не удалось получить ответ от сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
-    "{new_name} already exists" : "{new_name} уже существует",
-    "Could not create file" : "Не удалось создать файл",
-    "Could not create folder" : "Не удалось создать каталог",
-    "Rename" : "Переименовать",
-    "Delete" : "Удалить",
-    "Disconnect storage" : "Отсоединить хранилище",
-    "Unshare" : "Закрыть доступ",
-    "No permission to delete" : "Недостаточно прав для удаления",
+    "Actions" : "Действия",
     "Download" : "Скачать",
     "Select" : "Выбрать",
     "Pending" : "Ожидание",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Ошибка при перемещении файла.",
     "Error moving file" : "Ошибка при перемещении файла",
     "Error" : "Ошибка",
+    "{new_name} already exists" : "{new_name} уже существует",
     "Could not rename file" : "Не удалось переименовать файл",
+    "Could not create file" : "Не удалось создать файл",
+    "Could not create folder" : "Не удалось создать каталог",
     "Error deleting file." : "Ошибка при удалении файла.",
     "No entries in this folder match '{filter}'" : "В данном каталоге нет элементов соответствующих '{filter}'",
     "Name" : "Имя",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Изменён",
     "_%n folder_::_%n folders_" : ["%n каталог","%n каталога","%n каталогов","%n каталогов"],
     "_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов","%n файлов"],
+    "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "У вас нет прав для загрузки или создания файлов здесь.",
     "_Uploading %n file_::_Uploading %n files_" : ["Закачка %n файла","Закачка %n файлов","Закачка %n файлов","Закачка %n файлов"],
+    "New" : "Новый",
     "\"{name}\" is an invalid file name." : "\"{name}\" это неправильное имя файла.",
     "File name cannot be empty." : "Имя файла не может быть пустым.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Хранилище {owner} переполнено, файлы больше не могут быть обновлены или синхронизированы!",
@@ -69,9 +68,14 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Хранилище {owner} практически заполнено ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["соответствует '{filter}'","соответствуют '{filter}'","соответствуют '{filter}'","соответствуют '{filter}'"],
-    "{dirs} and {files}" : "{dirs} и {files}",
+    "Path" : "Путь",
+    "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"],
     "Favorited" : "Избранное",
     "Favorite" : "Избранное",
+    "Upload" : "Загрузить",
+    "Text file" : "Текстовый файл",
+    "Folder" : "Каталог",
+    "New folder" : "Новый каталог",
     "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка",
     "A new file or folder has been <strong>created</strong>" : "<strong>Создан</strong> новый файл или каталог",
     "A file or folder has been <strong>changed</strong>" : "<strong>Изменён</strong> файл или каталог",
@@ -93,22 +97,18 @@ OC.L10N.register(
     "File handling" : "Управление файлами",
     "Maximum upload size" : "Максимальный размер загружаемого файла",
     "max. possible: " : "макс. возможно: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "При использовании PHP-FPM может потребоваться до 5 минут, чтобы это значение встпуило в силу после сохранения.",
     "Save" : "Сохранить",
     "Can not be edited from here due to insufficient permissions." : "Невозможно отредактировать здесь из-за нехватки полномочий.",
     "Settings" : "Настройки",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Используйте этот адрес для <a href=\"%s\" target=\"_blank\">доступа файлам через WebDAV</a>",
-    "New" : "Новый",
-    "New text file" : "Новый текстовый файл",
-    "Text file" : "Текстовый файл",
-    "New folder" : "Новый каталог",
-    "Folder" : "Каталог",
-    "Upload" : "Загрузить",
     "Cancel upload" : "Отменить загрузку",
     "No files in here" : "Здесь нет файлов",
     "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!",
     "No entries found in this folder" : "Ничего не найдено",
     "Select all" : "Выбрать все",
+    "Delete" : "Удалить",
     "Upload too large" : "Файл слишком велик",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.",
     "Files are being scanned, please wait." : "Идет сканирование файлов. Пожалуйста подождите.",
diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json
index 80487e989f..410ef1d9cb 100644
--- a/apps/files/l10n/ru.json
+++ b/apps/files/l10n/ru.json
@@ -27,20 +27,14 @@
     "All files" : "Все файлы",
     "Favorites" : "Избранное",
     "Home" : "Главная",
+    "Close" : "Закрыть",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера",
     "Total file size {size1} exceeds upload limit {size2}" : "Полный размер файла {size1} превышает лимит по загрузке {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостаточно свободного места, Вы загружаете {size1}, но осталось только {size2}",
     "Upload cancelled." : "Загрузка отменена.",
     "Could not get result from server." : "Не удалось получить ответ от сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
-    "{new_name} already exists" : "{new_name} уже существует",
-    "Could not create file" : "Не удалось создать файл",
-    "Could not create folder" : "Не удалось создать каталог",
-    "Rename" : "Переименовать",
-    "Delete" : "Удалить",
-    "Disconnect storage" : "Отсоединить хранилище",
-    "Unshare" : "Закрыть доступ",
-    "No permission to delete" : "Недостаточно прав для удаления",
+    "Actions" : "Действия",
     "Download" : "Скачать",
     "Select" : "Выбрать",
     "Pending" : "Ожидание",
@@ -50,7 +44,10 @@
     "Error moving file." : "Ошибка при перемещении файла.",
     "Error moving file" : "Ошибка при перемещении файла",
     "Error" : "Ошибка",
+    "{new_name} already exists" : "{new_name} уже существует",
     "Could not rename file" : "Не удалось переименовать файл",
+    "Could not create file" : "Не удалось создать файл",
+    "Could not create folder" : "Не удалось создать каталог",
     "Error deleting file." : "Ошибка при удалении файла.",
     "No entries in this folder match '{filter}'" : "В данном каталоге нет элементов соответствующих '{filter}'",
     "Name" : "Имя",
@@ -58,8 +55,10 @@
     "Modified" : "Изменён",
     "_%n folder_::_%n folders_" : ["%n каталог","%n каталога","%n каталогов","%n каталогов"],
     "_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов","%n файлов"],
+    "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "У вас нет прав для загрузки или создания файлов здесь.",
     "_Uploading %n file_::_Uploading %n files_" : ["Закачка %n файла","Закачка %n файлов","Закачка %n файлов","Закачка %n файлов"],
+    "New" : "Новый",
     "\"{name}\" is an invalid file name." : "\"{name}\" это неправильное имя файла.",
     "File name cannot be empty." : "Имя файла не может быть пустым.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Хранилище {owner} переполнено, файлы больше не могут быть обновлены или синхронизированы!",
@@ -67,9 +66,14 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Хранилище {owner} практически заполнено ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["соответствует '{filter}'","соответствуют '{filter}'","соответствуют '{filter}'","соответствуют '{filter}'"],
-    "{dirs} and {files}" : "{dirs} и {files}",
+    "Path" : "Путь",
+    "_%n byte_::_%n bytes_" : ["%n байт","%n байта","%n байтов","%n байта(ов)"],
     "Favorited" : "Избранное",
     "Favorite" : "Избранное",
+    "Upload" : "Загрузить",
+    "Text file" : "Текстовый файл",
+    "Folder" : "Каталог",
+    "New folder" : "Новый каталог",
     "An error occurred while trying to update the tags" : "Во время обновления тегов возникла ошибка",
     "A new file or folder has been <strong>created</strong>" : "<strong>Создан</strong> новый файл или каталог",
     "A file or folder has been <strong>changed</strong>" : "<strong>Изменён</strong> файл или каталог",
@@ -91,22 +95,18 @@
     "File handling" : "Управление файлами",
     "Maximum upload size" : "Максимальный размер загружаемого файла",
     "max. possible: " : "макс. возможно: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "При использовании PHP-FPM может потребоваться до 5 минут, чтобы это значение встпуило в силу после сохранения.",
     "Save" : "Сохранить",
     "Can not be edited from here due to insufficient permissions." : "Невозможно отредактировать здесь из-за нехватки полномочий.",
     "Settings" : "Настройки",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Используйте этот адрес для <a href=\"%s\" target=\"_blank\">доступа файлам через WebDAV</a>",
-    "New" : "Новый",
-    "New text file" : "Новый текстовый файл",
-    "Text file" : "Текстовый файл",
-    "New folder" : "Новый каталог",
-    "Folder" : "Каталог",
-    "Upload" : "Загрузить",
     "Cancel upload" : "Отменить загрузку",
     "No files in here" : "Здесь нет файлов",
     "Upload some content or sync with your devices!" : "Загрузите что-нибудь или синхронизируйте со своими устройствами!",
     "No entries found in this folder" : "Ничего не найдено",
     "Select all" : "Выбрать все",
+    "Delete" : "Удалить",
     "Upload too large" : "Файл слишком велик",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.",
     "Files are being scanned, please wait." : "Идет сканирование файлов. Пожалуйста подождите.",
diff --git a/apps/files/l10n/si_LK.js b/apps/files/l10n/si_LK.js
index 67730c92ed..ea63cda82d 100644
--- a/apps/files/l10n/si_LK.js
+++ b/apps/files/l10n/si_LK.js
@@ -10,17 +10,19 @@ OC.L10N.register(
     "Failed to write to disk" : "තැටිගත කිරීම අසාර්ථකයි",
     "Files" : "ගොනු",
     "Home" : "නිවස",
+    "Close" : "වසන්න",
     "Upload cancelled." : "උඩුගත කිරීම අත් හරින්න ලදී",
     "File upload is in progress. Leaving the page now will cancel the upload." : "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
-    "Rename" : "නැවත නම් කරන්න",
-    "Delete" : "මකා දමන්න",
-    "Unshare" : "නොබෙදු",
     "Download" : "බාන්න",
     "Select" : "තෝරන්න",
     "Error" : "දෝෂයක්",
     "Name" : "නම",
     "Size" : "ප්‍රමාණය",
     "Modified" : "වෙනස් කළ",
+    "New" : "නව",
+    "Upload" : "උඩුගත කරන්න",
+    "Text file" : "පෙළ ගොනුව",
+    "Folder" : "ෆෝල්ඩරය",
     "A new file or folder has been <strong>created</strong>" : "නව ගොනුවක් හෝ බහාලුමක් <strong> නිර්මාණය කර ඇත</ strong> ",
     "A file or folder has been <strong>changed</strong>" : "ගොනුවක් හෝ ෆෝල්ඩරයක් <strong>වෙනස්</strong> වී ඇත",
     "A file or folder has been <strong>deleted</strong>" : "ගොනුවක් හෝ ෆෝල්ඩරයක් <strong>මකා දමා</strong> ඇත",
@@ -30,11 +32,8 @@ OC.L10N.register(
     "max. possible: " : "හැකි උපරිමය:",
     "Save" : "සුරකින්න",
     "Settings" : "සිටුවම්",
-    "New" : "නව",
-    "Text file" : "පෙළ ගොනුව",
-    "Folder" : "ෆෝල්ඩරය",
-    "Upload" : "උඩුගත කරන්න",
     "Cancel upload" : "උඩුගත කිරීම අත් හරින්න",
+    "Delete" : "මකා දමන්න",
     "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
     "Files are being scanned, please wait." : "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
diff --git a/apps/files/l10n/si_LK.json b/apps/files/l10n/si_LK.json
index 2f07c4cce2..6cfbe30ff4 100644
--- a/apps/files/l10n/si_LK.json
+++ b/apps/files/l10n/si_LK.json
@@ -8,17 +8,19 @@
     "Failed to write to disk" : "තැටිගත කිරීම අසාර්ථකයි",
     "Files" : "ගොනු",
     "Home" : "නිවස",
+    "Close" : "වසන්න",
     "Upload cancelled." : "උඩුගත කිරීම අත් හරින්න ලදී",
     "File upload is in progress. Leaving the page now will cancel the upload." : "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
-    "Rename" : "නැවත නම් කරන්න",
-    "Delete" : "මකා දමන්න",
-    "Unshare" : "නොබෙදු",
     "Download" : "බාන්න",
     "Select" : "තෝරන්න",
     "Error" : "දෝෂයක්",
     "Name" : "නම",
     "Size" : "ප්‍රමාණය",
     "Modified" : "වෙනස් කළ",
+    "New" : "නව",
+    "Upload" : "උඩුගත කරන්න",
+    "Text file" : "පෙළ ගොනුව",
+    "Folder" : "ෆෝල්ඩරය",
     "A new file or folder has been <strong>created</strong>" : "නව ගොනුවක් හෝ බහාලුමක් <strong> නිර්මාණය කර ඇත</ strong> ",
     "A file or folder has been <strong>changed</strong>" : "ගොනුවක් හෝ ෆෝල්ඩරයක් <strong>වෙනස්</strong> වී ඇත",
     "A file or folder has been <strong>deleted</strong>" : "ගොනුවක් හෝ ෆෝල්ඩරයක් <strong>මකා දමා</strong> ඇත",
@@ -28,11 +30,8 @@
     "max. possible: " : "හැකි උපරිමය:",
     "Save" : "සුරකින්න",
     "Settings" : "සිටුවම්",
-    "New" : "නව",
-    "Text file" : "පෙළ ගොනුව",
-    "Folder" : "ෆෝල්ඩරය",
-    "Upload" : "උඩුගත කරන්න",
     "Cancel upload" : "උඩුගත කිරීම අත් හරින්න",
+    "Delete" : "මකා දමන්න",
     "Upload too large" : "උඩුගත කිරීම විශාල වැඩිය",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය",
     "Files are being scanned, please wait." : "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
diff --git a/apps/files/l10n/sk.js b/apps/files/l10n/sk.js
deleted file mode 100644
index 47af64a493..0000000000
--- a/apps/files/l10n/sk.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Share" : "Zdieľať",
-    "Delete" : "Odstrániť",
-    "Save" : "Uložiť",
-    "Download" : "Stiahnuť"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files/l10n/sk.json b/apps/files/l10n/sk.json
deleted file mode 100644
index a61d2917bc..0000000000
--- a/apps/files/l10n/sk.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Share" : "Zdieľať",
-    "Delete" : "Odstrániť",
-    "Save" : "Uložiť",
-    "Download" : "Stiahnuť"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/sk_SK.js b/apps/files/l10n/sk_SK.js
index 809e9567b9..ebe1973a9e 100644
--- a/apps/files/l10n/sk_SK.js
+++ b/apps/files/l10n/sk_SK.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Všetky súbory",
     "Favorites" : "Obľúbené",
     "Home" : "Domov",
+    "Close" : "Zavrieť",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov",
     "Total file size {size1} exceeds upload limit {size2}" : "Celková veľkosť súboru {size1} prekračuje upload limit {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}",
     "Upload cancelled." : "Odosielanie je zrušené.",
     "Could not get result from server." : "Nepodarilo sa dostať výsledky zo servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
-    "{new_name} already exists" : "{new_name} už existuje",
-    "Could not create file" : "Nemožno vytvoriť súbor",
-    "Could not create folder" : "Nemožno vytvoriť priečinok",
-    "Rename" : "Premenovať",
-    "Delete" : "Zmazať",
-    "Disconnect storage" : "Odpojiť úložisko",
-    "Unshare" : "Zrušiť zdieľanie",
-    "No permission to delete" : "Žiadne povolenie na odstránenie",
+    "Actions" : "Akcie",
     "Download" : "Sťahovanie",
     "Select" : "Vybrať",
     "Pending" : "Čaká",
@@ -51,7 +45,10 @@ OC.L10N.register(
     "Error moving file." : "Chyba pri presune súboru.",
     "Error moving file" : "Chyba pri presúvaní súboru",
     "Error" : "Chyba",
+    "{new_name} already exists" : "{new_name} už existuje",
     "Could not rename file" : "Nemožno premenovať súbor",
+    "Could not create file" : "Nemožno vytvoriť súbor",
+    "Could not create folder" : "Nemožno vytvoriť priečinok",
     "Error deleting file." : "Chyba pri mazaní súboru.",
     "No entries in this folder match '{filter}'" : "V tomto priečinku nič nezodpovedá '{filter}'",
     "Name" : "Názov",
@@ -59,16 +56,21 @@ OC.L10N.register(
     "Modified" : "Upravené",
     "_%n folder_::_%n folders_" : ["%n priečinok","%n priečinky","%n priečinkov"],
     "_%n file_::_%n files_" : ["%n súbor","%n súbory","%n súborov"],
+    "{dirs} and {files}" : "{dirs} a {files}",
     "You don’t have permission to upload or create files here" : "Nemáte oprávnenie sem nahrávať alebo vytvoriť súbory",
     "_Uploading %n file_::_Uploading %n files_" : ["Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"],
+    "New" : "Nový",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatné meno súboru.",
     "File name cannot be empty." : "Meno súboru nemôže byť prázdne",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["zodpovedá '{filter}'","zodpovedá '{filter}'","zodpovedá '{filter}'"],
-    "{dirs} and {files}" : "{dirs} a {files}",
     "Favorited" : "Pridané k obľúbeným",
     "Favorite" : "Obľúbené",
+    "Upload" : "Nahrať",
+    "Text file" : "Textový súbor",
+    "Folder" : "Priečinok",
+    "New folder" : "Nový priečinok",
     "An error occurred while trying to update the tags" : "Pri pokuse o aktualizáciu štítkov došlo k chybe",
     "A new file or folder has been <strong>created</strong>" : "Nový súbor alebo priečinok bol <strong>vytvorený</strong>",
     "A file or folder has been <strong>changed</strong>" : "Súbor alebo priečinok bol <strong>zmenený</strong>",
@@ -93,17 +95,12 @@ OC.L10N.register(
     "Settings" : "Nastavenia",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>",
-    "New" : "Nový",
-    "New text file" : "Nový textový súbor",
-    "Text file" : "Textový súbor",
-    "New folder" : "Nový priečinok",
-    "Folder" : "Priečinok",
-    "Upload" : "Nahrať",
     "Cancel upload" : "Zrušiť nahrávanie",
     "No files in here" : "Nie sú tu žiadne súbory",
     "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!",
     "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené",
     "Select all" : "Vybrať všetko",
+    "Delete" : "Zmazať",
     "Upload too large" : "Nahrávanie je príliš veľké",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
     "Files are being scanned, please wait." : "Čakajte, súbory sú prehľadávané.",
diff --git a/apps/files/l10n/sk_SK.json b/apps/files/l10n/sk_SK.json
index 2702076b23..ccd7a04569 100644
--- a/apps/files/l10n/sk_SK.json
+++ b/apps/files/l10n/sk_SK.json
@@ -27,20 +27,14 @@
     "All files" : "Všetky súbory",
     "Favorites" : "Obľúbené",
     "Home" : "Domov",
+    "Close" : "Zavrieť",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov",
     "Total file size {size1} exceeds upload limit {size2}" : "Celková veľkosť súboru {size1} prekračuje upload limit {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}",
     "Upload cancelled." : "Odosielanie je zrušené.",
     "Could not get result from server." : "Nepodarilo sa dostať výsledky zo servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
-    "{new_name} already exists" : "{new_name} už existuje",
-    "Could not create file" : "Nemožno vytvoriť súbor",
-    "Could not create folder" : "Nemožno vytvoriť priečinok",
-    "Rename" : "Premenovať",
-    "Delete" : "Zmazať",
-    "Disconnect storage" : "Odpojiť úložisko",
-    "Unshare" : "Zrušiť zdieľanie",
-    "No permission to delete" : "Žiadne povolenie na odstránenie",
+    "Actions" : "Akcie",
     "Download" : "Sťahovanie",
     "Select" : "Vybrať",
     "Pending" : "Čaká",
@@ -49,7 +43,10 @@
     "Error moving file." : "Chyba pri presune súboru.",
     "Error moving file" : "Chyba pri presúvaní súboru",
     "Error" : "Chyba",
+    "{new_name} already exists" : "{new_name} už existuje",
     "Could not rename file" : "Nemožno premenovať súbor",
+    "Could not create file" : "Nemožno vytvoriť súbor",
+    "Could not create folder" : "Nemožno vytvoriť priečinok",
     "Error deleting file." : "Chyba pri mazaní súboru.",
     "No entries in this folder match '{filter}'" : "V tomto priečinku nič nezodpovedá '{filter}'",
     "Name" : "Názov",
@@ -57,16 +54,21 @@
     "Modified" : "Upravené",
     "_%n folder_::_%n folders_" : ["%n priečinok","%n priečinky","%n priečinkov"],
     "_%n file_::_%n files_" : ["%n súbor","%n súbory","%n súborov"],
+    "{dirs} and {files}" : "{dirs} a {files}",
     "You don’t have permission to upload or create files here" : "Nemáte oprávnenie sem nahrávať alebo vytvoriť súbory",
     "_Uploading %n file_::_Uploading %n files_" : ["Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"],
+    "New" : "Nový",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatné meno súboru.",
     "File name cannot be empty." : "Meno súboru nemôže byť prázdne",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["zodpovedá '{filter}'","zodpovedá '{filter}'","zodpovedá '{filter}'"],
-    "{dirs} and {files}" : "{dirs} a {files}",
     "Favorited" : "Pridané k obľúbeným",
     "Favorite" : "Obľúbené",
+    "Upload" : "Nahrať",
+    "Text file" : "Textový súbor",
+    "Folder" : "Priečinok",
+    "New folder" : "Nový priečinok",
     "An error occurred while trying to update the tags" : "Pri pokuse o aktualizáciu štítkov došlo k chybe",
     "A new file or folder has been <strong>created</strong>" : "Nový súbor alebo priečinok bol <strong>vytvorený</strong>",
     "A file or folder has been <strong>changed</strong>" : "Súbor alebo priečinok bol <strong>zmenený</strong>",
@@ -91,17 +93,12 @@
     "Settings" : "Nastavenia",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>",
-    "New" : "Nový",
-    "New text file" : "Nový textový súbor",
-    "Text file" : "Textový súbor",
-    "New folder" : "Nový priečinok",
-    "Folder" : "Priečinok",
-    "Upload" : "Nahrať",
     "Cancel upload" : "Zrušiť nahrávanie",
     "No files in here" : "Nie sú tu žiadne súbory",
     "Upload some content or sync with your devices!" : "Nahrajte nejaký obsah alebo synchronizujte zo svojimi zariadeniami!",
     "No entries found in this folder" : "V tomto priečinku nebolo nič nájdené",
     "Select all" : "Vybrať všetko",
+    "Delete" : "Zmazať",
     "Upload too large" : "Nahrávanie je príliš veľké",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
     "Files are being scanned, please wait." : "Čakajte, súbory sú prehľadávané.",
diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js
index 299bce880f..2d296468d6 100644
--- a/apps/files/l10n/sl.js
+++ b/apps/files/l10n/sl.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Vse datoteke",
     "Favorites" : "Priljubljene",
     "Home" : "Domači naslov",
+    "Close" : "Zapri",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.",
     "Total file size {size1} exceeds upload limit {size2}" : "Skupna velikost {size1} presega omejitev velikosti {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.",
     "Upload cancelled." : "Pošiljanje je preklicano.",
     "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
-    "{new_name} already exists" : "{new_name} že obstaja",
-    "Could not create file" : "Ni mogoče ustvariti datoteke",
-    "Could not create folder" : "Ni mogoče ustvariti mape",
-    "Rename" : "Preimenuj",
-    "Delete" : "Izbriši",
-    "Disconnect storage" : "Odklopi shrambo",
-    "Unshare" : "Prekini souporabo",
-    "No permission to delete" : "Ni ustreznih dovoljenj za brisanje tega stika",
+    "Actions" : "Dejanja",
     "Download" : "Prejmi",
     "Select" : "Izberi",
     "Pending" : "V čakanju ...",
@@ -50,7 +44,10 @@ OC.L10N.register(
     "Error moving file." : "Napaka premikanja datoteke.",
     "Error moving file" : "Napaka premikanja datoteke",
     "Error" : "Napaka",
+    "{new_name} already exists" : "{new_name} že obstaja",
     "Could not rename file" : "Ni mogoče preimenovati datoteke",
+    "Could not create file" : "Ni mogoče ustvariti datoteke",
+    "Could not create folder" : "Ni mogoče ustvariti mape",
     "Error deleting file." : "Napaka brisanja datoteke.",
     "No entries in this folder match '{filter}'" : "Ni zadetkov, ki bi bili skladni z nizom '{filter}'",
     "Name" : "Ime",
@@ -58,8 +55,10 @@ OC.L10N.register(
     "Modified" : "Spremenjeno",
     "_%n folder_::_%n folders_" : ["%n mapa","%n mapi","%n mape","%n map"],
     "_%n file_::_%n files_" : ["%n datoteka","%n datoteki","%n datoteke","%n datotek"],
+    "{dirs} and {files}" : "{dirs} in {files}",
     "You don’t have permission to upload or create files here" : "Ni ustreznih dovoljenj za pošiljanje ali ustvarjanje datotek na tem mestu.",
     "_Uploading %n file_::_Uploading %n files_" : ["Posodabljanje %n datoteke","Posodabljanje %n datotek","Posodabljanje %n datotek","Posodabljanje %n datotek"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neveljavno ime datoteke.",
     "File name cannot be empty." : "Ime datoteke ne sme biti prazno polje.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Shramba uporabnika {owner} je polna, zato datotek ni več mogoče posodabljati in usklajevati!",
@@ -67,9 +66,12 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Shramba uporabnika {owner} je polna ({usedSpacePercent}%).",
     "Your storage is almost full ({usedSpacePercent}%)" : "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["se sklada s filtrom '{filter}'","se skladata s filtrom '{filter}'","se skladajo s filtrom '{filter}'","se skladajo s filtrom '{filter}'"],
-    "{dirs} and {files}" : "{dirs} in {files}",
     "Favorited" : "Označeno kot priljubljeno",
     "Favorite" : "Priljubljene",
+    "Upload" : "Pošlji",
+    "Text file" : "Besedilna datoteka",
+    "Folder" : "Mapa",
+    "New folder" : "Nova mapa",
     "An error occurred while trying to update the tags" : "Prišlo je do napake med posodabljanjem oznak",
     "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je <strong>ustvarjena</strong>",
     "A file or folder has been <strong>changed</strong>" : "Datoteka ali mapa je <strong>spremenjena</strong>.",
@@ -96,17 +98,12 @@ OC.L10N.register(
     "Settings" : "Nastavitve",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek peko sistema WebDAV</a>.",
-    "New" : "Novo",
-    "New text file" : "Nova besedilna datoteka",
-    "Text file" : "Besedilna datoteka",
-    "New folder" : "Nova mapa",
-    "Folder" : "Mapa",
-    "Upload" : "Pošlji",
     "Cancel upload" : "Prekliči pošiljanje",
     "No files in here" : "V mapi ni datotek",
     "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!",
     "No entries found in this folder" : "V tej mapi ni najdenih predmetov.",
     "Select all" : "izberi vse",
+    "Delete" : "Izbriši",
     "Upload too large" : "Prekoračenje omejitve velikosti",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
     "Files are being scanned, please wait." : "Poteka preučevanje datotek, počakajte ...",
diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json
index 7e684c04ef..0cb69f5f7a 100644
--- a/apps/files/l10n/sl.json
+++ b/apps/files/l10n/sl.json
@@ -27,20 +27,14 @@
     "All files" : "Vse datoteke",
     "Favorites" : "Priljubljene",
     "Home" : "Domači naslov",
+    "Close" : "Zapri",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.",
     "Total file size {size1} exceeds upload limit {size2}" : "Skupna velikost {size1} presega omejitev velikosti {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.",
     "Upload cancelled." : "Pošiljanje je preklicano.",
     "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
-    "{new_name} already exists" : "{new_name} že obstaja",
-    "Could not create file" : "Ni mogoče ustvariti datoteke",
-    "Could not create folder" : "Ni mogoče ustvariti mape",
-    "Rename" : "Preimenuj",
-    "Delete" : "Izbriši",
-    "Disconnect storage" : "Odklopi shrambo",
-    "Unshare" : "Prekini souporabo",
-    "No permission to delete" : "Ni ustreznih dovoljenj za brisanje tega stika",
+    "Actions" : "Dejanja",
     "Download" : "Prejmi",
     "Select" : "Izberi",
     "Pending" : "V čakanju ...",
@@ -48,7 +42,10 @@
     "Error moving file." : "Napaka premikanja datoteke.",
     "Error moving file" : "Napaka premikanja datoteke",
     "Error" : "Napaka",
+    "{new_name} already exists" : "{new_name} že obstaja",
     "Could not rename file" : "Ni mogoče preimenovati datoteke",
+    "Could not create file" : "Ni mogoče ustvariti datoteke",
+    "Could not create folder" : "Ni mogoče ustvariti mape",
     "Error deleting file." : "Napaka brisanja datoteke.",
     "No entries in this folder match '{filter}'" : "Ni zadetkov, ki bi bili skladni z nizom '{filter}'",
     "Name" : "Ime",
@@ -56,8 +53,10 @@
     "Modified" : "Spremenjeno",
     "_%n folder_::_%n folders_" : ["%n mapa","%n mapi","%n mape","%n map"],
     "_%n file_::_%n files_" : ["%n datoteka","%n datoteki","%n datoteke","%n datotek"],
+    "{dirs} and {files}" : "{dirs} in {files}",
     "You don’t have permission to upload or create files here" : "Ni ustreznih dovoljenj za pošiljanje ali ustvarjanje datotek na tem mestu.",
     "_Uploading %n file_::_Uploading %n files_" : ["Posodabljanje %n datoteke","Posodabljanje %n datotek","Posodabljanje %n datotek","Posodabljanje %n datotek"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" je neveljavno ime datoteke.",
     "File name cannot be empty." : "Ime datoteke ne sme biti prazno polje.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Shramba uporabnika {owner} je polna, zato datotek ni več mogoče posodabljati in usklajevati!",
@@ -65,9 +64,12 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Shramba uporabnika {owner} je polna ({usedSpacePercent}%).",
     "Your storage is almost full ({usedSpacePercent}%)" : "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["se sklada s filtrom '{filter}'","se skladata s filtrom '{filter}'","se skladajo s filtrom '{filter}'","se skladajo s filtrom '{filter}'"],
-    "{dirs} and {files}" : "{dirs} in {files}",
     "Favorited" : "Označeno kot priljubljeno",
     "Favorite" : "Priljubljene",
+    "Upload" : "Pošlji",
+    "Text file" : "Besedilna datoteka",
+    "Folder" : "Mapa",
+    "New folder" : "Nova mapa",
     "An error occurred while trying to update the tags" : "Prišlo je do napake med posodabljanjem oznak",
     "A new file or folder has been <strong>created</strong>" : "Nova datoteka ali mapa je <strong>ustvarjena</strong>",
     "A file or folder has been <strong>changed</strong>" : "Datoteka ali mapa je <strong>spremenjena</strong>.",
@@ -94,17 +96,12 @@
     "Settings" : "Nastavitve",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek peko sistema WebDAV</a>.",
-    "New" : "Novo",
-    "New text file" : "Nova besedilna datoteka",
-    "Text file" : "Besedilna datoteka",
-    "New folder" : "Nova mapa",
-    "Folder" : "Mapa",
-    "Upload" : "Pošlji",
     "Cancel upload" : "Prekliči pošiljanje",
     "No files in here" : "V mapi ni datotek",
     "Upload some content or sync with your devices!" : "Uvozite vsebino ali pa omogočite usklajevanje z napravami!",
     "No entries found in this folder" : "V tej mapi ni najdenih predmetov.",
     "Select all" : "izberi vse",
+    "Delete" : "Izbriši",
     "Upload too large" : "Prekoračenje omejitve velikosti",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
     "Files are being scanned, please wait." : "Poteka preučevanje datotek, počakajte ...",
diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js
index e171d3d1e9..2b87c39d96 100644
--- a/apps/files/l10n/sq.js
+++ b/apps/files/l10n/sq.js
@@ -28,38 +28,40 @@ OC.L10N.register(
     "Files" : "Skedarë",
     "All files" : "Të gjithë",
     "Home" : "Shtëpi",
+    "Close" : "Mbyll",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nuk mund të ngarkohet {filename} sepse është dosje ose ka 0 byte",
     "Total file size {size1} exceeds upload limit {size2}" : "Përmasa totale {size1} e skedarit tejkalon limitin e ngarkimit {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, ju po ngarkoni {size1} por vetëm {size2} është e lirë",
     "Upload cancelled." : "Ngarkimi u anullua",
     "Could not get result from server." : "Nuk mund të merret ndonjë rezultat nga serveri.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
-    "{new_name} already exists" : "{new_name} është ekzistues ",
-    "Could not create file" : "Skedari nuk mund të krijohet",
-    "Could not create folder" : "I pamundur krijimi i kartelës",
-    "Rename" : "Riemëro",
-    "Delete" : "Fshi",
-    "Disconnect storage" : "Shkëput hapësirën e memorizimit",
-    "Unshare" : "Hiq ndarjen",
     "Download" : "Shkarko",
     "Pending" : "Në vijim",
     "Error moving file." : "Gabim në lëvizjen e skedarëve.",
     "Error moving file" : "Gabim lëvizjen dokumentave",
     "Error" : "Gabim",
+    "{new_name} already exists" : "{new_name} është ekzistues ",
     "Could not rename file" : "Riemërtimi i skedarit nuk është i mundur",
+    "Could not create file" : "Skedari nuk mund të krijohet",
+    "Could not create folder" : "I pamundur krijimi i kartelës",
     "Error deleting file." : "Gabim gjatë fshirjes së skedarit.",
     "Name" : "Emri",
     "Size" : "Madhësia",
     "Modified" : "Ndryshuar",
     "_%n folder_::_%n folders_" : ["%n dosje","%n dosje"],
     "_%n file_::_%n files_" : ["%n skedar","%n skedarë"],
+    "{dirs} and {files}" : "{dirs} dhe {files}",
     "You don’t have permission to upload or create files here" : "Ju nuk keni të drejta për të ngarkuar apo krijuar skedarë këtu",
     "_Uploading %n file_::_Uploading %n files_" : ["Po ngarkoj %n skedar","Po ngarkoj %n skedarë"],
+    "New" : "E re",
     "\"{name}\" is an invalid file name." : "\"{name}\" është emër i pavlefshëm.",
     "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.",
     "Your storage is full, files can not be updated or synced anymore!" : "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Hapsira juaj e arkivimit është pothuajse në fund  ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} dhe {files}",
+    "Upload" : "Ngarko",
+    "Text file" : "Skedar tekst",
+    "Folder" : "Dosje",
+    "New folder" : "Dosje e're",
     "A new file or folder has been <strong>created</strong>" : "Një skedar ose një dosje e re është <strong>krijuar</strong>",
     "A file or folder has been <strong>changed</strong>" : "Një skedar ose një dosje ka <strong>ndryshuar</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Një skedar ose një dosje është <strong>fshirë</strong>",
@@ -83,13 +85,8 @@ OC.L10N.register(
     "Settings" : "Konfigurime",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\">qasje në skedarët tuaj me anë të WebDAV</a>",
-    "New" : "E re",
-    "New text file" : "Skedar i ri tekst",
-    "Text file" : "Skedar tekst",
-    "New folder" : "Dosje e're",
-    "Folder" : "Dosje",
-    "Upload" : "Ngarko",
     "Cancel upload" : "Anullo ngarkimin",
+    "Delete" : "Fshi",
     "Upload too large" : "Ngarkimi shumë i madh",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri.",
     "Files are being scanned, please wait." : "Skanerizimi i skedarit në proces. Ju lutem prisni.",
diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json
index 624f85bf0c..1e755ee80f 100644
--- a/apps/files/l10n/sq.json
+++ b/apps/files/l10n/sq.json
@@ -26,38 +26,40 @@
     "Files" : "Skedarë",
     "All files" : "Të gjithë",
     "Home" : "Shtëpi",
+    "Close" : "Mbyll",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nuk mund të ngarkohet {filename} sepse është dosje ose ka 0 byte",
     "Total file size {size1} exceeds upload limit {size2}" : "Përmasa totale {size1} e skedarit tejkalon limitin e ngarkimit {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, ju po ngarkoni {size1} por vetëm {size2} është e lirë",
     "Upload cancelled." : "Ngarkimi u anullua",
     "Could not get result from server." : "Nuk mund të merret ndonjë rezultat nga serveri.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
-    "{new_name} already exists" : "{new_name} është ekzistues ",
-    "Could not create file" : "Skedari nuk mund të krijohet",
-    "Could not create folder" : "I pamundur krijimi i kartelës",
-    "Rename" : "Riemëro",
-    "Delete" : "Fshi",
-    "Disconnect storage" : "Shkëput hapësirën e memorizimit",
-    "Unshare" : "Hiq ndarjen",
     "Download" : "Shkarko",
     "Pending" : "Në vijim",
     "Error moving file." : "Gabim në lëvizjen e skedarëve.",
     "Error moving file" : "Gabim lëvizjen dokumentave",
     "Error" : "Gabim",
+    "{new_name} already exists" : "{new_name} është ekzistues ",
     "Could not rename file" : "Riemërtimi i skedarit nuk është i mundur",
+    "Could not create file" : "Skedari nuk mund të krijohet",
+    "Could not create folder" : "I pamundur krijimi i kartelës",
     "Error deleting file." : "Gabim gjatë fshirjes së skedarit.",
     "Name" : "Emri",
     "Size" : "Madhësia",
     "Modified" : "Ndryshuar",
     "_%n folder_::_%n folders_" : ["%n dosje","%n dosje"],
     "_%n file_::_%n files_" : ["%n skedar","%n skedarë"],
+    "{dirs} and {files}" : "{dirs} dhe {files}",
     "You don’t have permission to upload or create files here" : "Ju nuk keni të drejta për të ngarkuar apo krijuar skedarë këtu",
     "_Uploading %n file_::_Uploading %n files_" : ["Po ngarkoj %n skedar","Po ngarkoj %n skedarë"],
+    "New" : "E re",
     "\"{name}\" is an invalid file name." : "\"{name}\" është emër i pavlefshëm.",
     "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.",
     "Your storage is full, files can not be updated or synced anymore!" : "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Hapsira juaj e arkivimit është pothuajse në fund  ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} dhe {files}",
+    "Upload" : "Ngarko",
+    "Text file" : "Skedar tekst",
+    "Folder" : "Dosje",
+    "New folder" : "Dosje e're",
     "A new file or folder has been <strong>created</strong>" : "Një skedar ose një dosje e re është <strong>krijuar</strong>",
     "A file or folder has been <strong>changed</strong>" : "Një skedar ose një dosje ka <strong>ndryshuar</strong>",
     "A file or folder has been <strong>deleted</strong>" : "Një skedar ose një dosje është <strong>fshirë</strong>",
@@ -81,13 +83,8 @@
     "Settings" : "Konfigurime",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Përdorni këtë adresë për <a href=\"%s\" target=\"_blank\">qasje në skedarët tuaj me anë të WebDAV</a>",
-    "New" : "E re",
-    "New text file" : "Skedar i ri tekst",
-    "Text file" : "Skedar tekst",
-    "New folder" : "Dosje e're",
-    "Folder" : "Dosje",
-    "Upload" : "Ngarko",
     "Cancel upload" : "Anullo ngarkimin",
+    "Delete" : "Fshi",
     "Upload too large" : "Ngarkimi shumë i madh",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri.",
     "Files are being scanned, please wait." : "Skanerizimi i skedarit në proces. Ju lutem prisni.",
diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js
index 060ac4d506..597389e15d 100644
--- a/apps/files/l10n/sr.js
+++ b/apps/files/l10n/sr.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Сви фајлови",
     "Favorites" : "Омиљени",
     "Home" : "Почетна",
+    "Close" : "Затвори",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Не могу да отпремим {filename} јер је то директоријум или има 0 бајтова",
     "Total file size {size1} exceeds upload limit {size2}" : "Величина {size1} превазилази ограничење за отпремање од {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Нема простора. Отпремате {size1} али само {size2} је преостало",
     "Upload cancelled." : "Отпремање је отказано.",
     "Could not get result from server." : "Не могу да добијем резултат са сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање фајла је у току. Ако сада напустите страницу, отказаћете отпремање.",
-    "{new_name} already exists" : "{new_name} већ постоји",
-    "Could not create file" : "Не могу да створим фајл",
-    "Could not create folder" : "Не могу да створим фасциклу",
-    "Rename" : "Преименуј",
-    "Delete" : "Обриши",
-    "Disconnect storage" : "Искључи складиште",
-    "Unshare" : "Не дели",
-    "No permission to delete" : "Без дозволе за брисање",
+    "Actions" : "Радње",
     "Download" : "Преузми",
     "Select" : "Изабери",
     "Pending" : "На чекању",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Грешка при премештању фајла.",
     "Error moving file" : "Грешка при премештању фајла",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} већ постоји",
     "Could not rename file" : "Не могу да преименујем фајл",
+    "Could not create file" : "Не могу да створим фајл",
+    "Could not create folder" : "Не могу да створим фасциклу",
     "Error deleting file." : "Грешка при брисању фајла.",
     "No entries in this folder match '{filter}'" : "У овој фасцикли ништа се не поклапа са '{filter}'",
     "Name" : "Назив",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Измењен",
     "_%n folder_::_%n folders_" : ["%n фасцикла","%n фасцикле","%n фасцикли"],
     "_%n file_::_%n files_" : ["%n фајл","%n фајла","%n фајлова"],
+    "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "Немате дозволе да овде отпремате или стварате фајлове",
     "_Uploading %n file_::_Uploading %n files_" : ["Отпремам %n фајл","Отпремам %n фајла","Отпремам %n фајлова"],
+    "New" : "Ново",
     "\"{name}\" is an invalid file name." : "\"{name}\" није исправан назив фајла.",
     "File name cannot be empty." : "Назив фајла не може бити празан.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Складиште корисника {owner} је пуно. Фајлови се не могу ажурирати нити синхронизовати!",
@@ -69,9 +68,12 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Складиште корисника {owner} је скоро пуно ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше складиште је скоро пуно ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["се поклапа са '{filter}'","се поклапају са '{filter}'","се поклапа са '{filter}'"],
-    "{dirs} and {files}" : "{dirs} и {files}",
     "Favorited" : "Омиљено",
     "Favorite" : "Омиљени",
+    "Upload" : "Отпреми",
+    "Text file" : "текстуални фајл",
+    "Folder" : "фасцикла",
+    "New folder" : "Нова фасцикла",
     "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака",
     "A new file or folder has been <strong>created</strong>" : "Нови фајл или фасцикла су <strong>направљени</strong>",
     "A file or folder has been <strong>changed</strong>" : "Фајл или фасцикла су <strong>измењени</strong>",
@@ -98,17 +100,12 @@ OC.L10N.register(
     "Settings" : "Поставке",
     "WebDAV" : "ВебДАВ",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Користите ову адресу да <a href=\"%s\" target=\"_blank\"> приступите фајловима преко ВебДАВ-а</a>",
-    "New" : "Ново",
-    "New text file" : "Нов текстуални фајл",
-    "Text file" : "текстуални фајл",
-    "New folder" : "Нова фасцикла",
-    "Folder" : "фасцикла",
-    "Upload" : "Отпреми",
     "Cancel upload" : "Откажи отпремање",
     "No files in here" : "Овде нема фајлова",
     "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!",
     "No entries found in this folder" : "Нема ничега у овој фасцикли",
     "Select all" : "Означи све",
+    "Delete" : "Обриши",
     "Upload too large" : "Отпремање је превелико",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Фајлови које желите да отпремите превазилазе ограничење отпремања на овом серверу.",
     "Files are being scanned, please wait." : "Скенирам фајлове, сачекајте.",
diff --git a/apps/files/l10n/sr.json b/apps/files/l10n/sr.json
index 69fefcaf2b..ec2fcc101e 100644
--- a/apps/files/l10n/sr.json
+++ b/apps/files/l10n/sr.json
@@ -27,20 +27,14 @@
     "All files" : "Сви фајлови",
     "Favorites" : "Омиљени",
     "Home" : "Почетна",
+    "Close" : "Затвори",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Не могу да отпремим {filename} јер је то директоријум или има 0 бајтова",
     "Total file size {size1} exceeds upload limit {size2}" : "Величина {size1} превазилази ограничење за отпремање од {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Нема простора. Отпремате {size1} али само {size2} је преостало",
     "Upload cancelled." : "Отпремање је отказано.",
     "Could not get result from server." : "Не могу да добијем резултат са сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање фајла је у току. Ако сада напустите страницу, отказаћете отпремање.",
-    "{new_name} already exists" : "{new_name} већ постоји",
-    "Could not create file" : "Не могу да створим фајл",
-    "Could not create folder" : "Не могу да створим фасциклу",
-    "Rename" : "Преименуј",
-    "Delete" : "Обриши",
-    "Disconnect storage" : "Искључи складиште",
-    "Unshare" : "Не дели",
-    "No permission to delete" : "Без дозволе за брисање",
+    "Actions" : "Радње",
     "Download" : "Преузми",
     "Select" : "Изабери",
     "Pending" : "На чекању",
@@ -50,7 +44,10 @@
     "Error moving file." : "Грешка при премештању фајла.",
     "Error moving file" : "Грешка при премештању фајла",
     "Error" : "Грешка",
+    "{new_name} already exists" : "{new_name} већ постоји",
     "Could not rename file" : "Не могу да преименујем фајл",
+    "Could not create file" : "Не могу да створим фајл",
+    "Could not create folder" : "Не могу да створим фасциклу",
     "Error deleting file." : "Грешка при брисању фајла.",
     "No entries in this folder match '{filter}'" : "У овој фасцикли ништа се не поклапа са '{filter}'",
     "Name" : "Назив",
@@ -58,8 +55,10 @@
     "Modified" : "Измењен",
     "_%n folder_::_%n folders_" : ["%n фасцикла","%n фасцикле","%n фасцикли"],
     "_%n file_::_%n files_" : ["%n фајл","%n фајла","%n фајлова"],
+    "{dirs} and {files}" : "{dirs} и {files}",
     "You don’t have permission to upload or create files here" : "Немате дозволе да овде отпремате или стварате фајлове",
     "_Uploading %n file_::_Uploading %n files_" : ["Отпремам %n фајл","Отпремам %n фајла","Отпремам %n фајлова"],
+    "New" : "Ново",
     "\"{name}\" is an invalid file name." : "\"{name}\" није исправан назив фајла.",
     "File name cannot be empty." : "Назив фајла не може бити празан.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "Складиште корисника {owner} је пуно. Фајлови се не могу ажурирати нити синхронизовати!",
@@ -67,9 +66,12 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "Складиште корисника {owner} је скоро пуно ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше складиште је скоро пуно ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["се поклапа са '{filter}'","се поклапају са '{filter}'","се поклапа са '{filter}'"],
-    "{dirs} and {files}" : "{dirs} и {files}",
     "Favorited" : "Омиљено",
     "Favorite" : "Омиљени",
+    "Upload" : "Отпреми",
+    "Text file" : "текстуални фајл",
+    "Folder" : "фасцикла",
+    "New folder" : "Нова фасцикла",
     "An error occurred while trying to update the tags" : "Дошло је до грешке при покушају ажурирања ознака",
     "A new file or folder has been <strong>created</strong>" : "Нови фајл или фасцикла су <strong>направљени</strong>",
     "A file or folder has been <strong>changed</strong>" : "Фајл или фасцикла су <strong>измењени</strong>",
@@ -96,17 +98,12 @@
     "Settings" : "Поставке",
     "WebDAV" : "ВебДАВ",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Користите ову адресу да <a href=\"%s\" target=\"_blank\"> приступите фајловима преко ВебДАВ-а</a>",
-    "New" : "Ново",
-    "New text file" : "Нов текстуални фајл",
-    "Text file" : "текстуални фајл",
-    "New folder" : "Нова фасцикла",
-    "Folder" : "фасцикла",
-    "Upload" : "Отпреми",
     "Cancel upload" : "Откажи отпремање",
     "No files in here" : "Овде нема фајлова",
     "Upload some content or sync with your devices!" : "Отпремите неки садржај или синхронизујте са вашим уређајима!",
     "No entries found in this folder" : "Нема ничега у овој фасцикли",
     "Select all" : "Означи све",
+    "Delete" : "Обриши",
     "Upload too large" : "Отпремање је превелико",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Фајлови које желите да отпремите превазилазе ограничење отпремања на овом серверу.",
     "Files are being scanned, please wait." : "Скенирам фајлове, сачекајте.",
diff --git a/apps/files/l10n/sr@latin.js b/apps/files/l10n/sr@latin.js
index acd0a988ec..b00575619e 100644
--- a/apps/files/l10n/sr@latin.js
+++ b/apps/files/l10n/sr@latin.js
@@ -29,19 +29,13 @@ OC.L10N.register(
     "All files" : "Svi fajlovi",
     "Favorites" : "Omiljeni",
     "Home" : "Početna",
+    "Close" : "Zatvori",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne mogu da otpremim {filename} jer je to direktorijum ili ima 0 bajtova",
     "Total file size {size1} exceeds upload limit {size2}" : "Veličina {size1} prevazilazi ograničenje za otpremanje od {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema prostora. Otpremate {size1} ali samo {size2} je preostalo",
     "Upload cancelled." : "Otpremanje je otkazano.",
     "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Ne mogu da stvorim fajl",
-    "Could not create folder" : "Ne mogu da stvorim fasciklu",
-    "Rename" : "Preimenuj",
-    "Delete" : "Obriši",
-    "Disconnect storage" : "Isključi skladište",
-    "Unshare" : "Ne deli",
     "Download" : "Preuzmi",
     "Select" : "Izaberi",
     "Pending" : "Na čekanju",
@@ -49,7 +43,10 @@ OC.L10N.register(
     "Error moving file." : "Greška pri premeštanju fajla.",
     "Error moving file" : "Greška pri premeštanju fajla",
     "Error" : "Greška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Ne mogu da preimenujem fajl",
+    "Could not create file" : "Ne mogu da stvorim fajl",
+    "Could not create folder" : "Ne mogu da stvorim fasciklu",
     "Error deleting file." : "Greška pri brisanju fajla.",
     "No entries in this folder match '{filter}'" : "U ovoj fascikli ništa se ne poklapa sa '{filter}'",
     "Name" : "Naziv",
@@ -57,16 +54,21 @@ OC.L10N.register(
     "Modified" : "Izmenjen",
     "_%n folder_::_%n folders_" : ["%n fascikla","%n fascikle","%n fascikli"],
     "_%n file_::_%n files_" : ["%n fajl","%n fajla","%n fajlova"],
+    "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Nemate dozvole da ovde otpremate ili stvarate fajlove",
     "_Uploading %n file_::_Uploading %n files_" : ["Otpremam %n fajl","Otpremam %n fajla","Otpremam %n fajlova"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" nije ispravan naziv fajla.",
     "File name cannot be empty." : "Naziv fajla ne može biti prazan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše skladište je puno. Fajlovi više ne mogu biti ažurirani ni sinhronizovani!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše skladište je skoro puno ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["se poklapa sa '{filter}'","se poklapaju sa '{filter}'","se poklapa sa '{filter}'"],
-    "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Omiljeno",
     "Favorite" : "Omiljeni",
+    "Upload" : "Otpremi",
+    "Text file" : "tekstualni fajl",
+    "Folder" : "fascikla",
+    "New folder" : "Nova fascikla",
     "An error occurred while trying to update the tags" : "Došlo je do greške pri pokušaju ažuriranja oznaka",
     "A new file or folder has been <strong>created</strong>" : "Novi fajl ili fascikla su <strong>napravljeni</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fajl ili fascikla su <strong>izmenjeni</strong>",
@@ -93,17 +95,12 @@ OC.L10N.register(
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristite ovu adresu da <a href=\"%s\" target=\"_blank\"> pristupite fajlovima preko WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nov tekstualni fajl",
-    "Text file" : "tekstualni fajl",
-    "New folder" : "Nova fascikla",
-    "Folder" : "fascikla",
-    "Upload" : "Otpremi",
     "Cancel upload" : "Otkaži otpremanje",
     "No files in here" : "Ovde nema fajlova",
     "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!",
     "No entries found in this folder" : "Nema ničega u ovoj fascikli",
     "Select all" : "Označi sve",
+    "Delete" : "Obriši",
     "Upload too large" : "Otpremanje je preveliko",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da otpremite prevazilaze ograničenje otpremanja na ovom serveru.",
     "Files are being scanned, please wait." : "Skeniram fajlove, sačekajte.",
diff --git a/apps/files/l10n/sr@latin.json b/apps/files/l10n/sr@latin.json
index cb6882c5c5..b6ffda5aa6 100644
--- a/apps/files/l10n/sr@latin.json
+++ b/apps/files/l10n/sr@latin.json
@@ -27,19 +27,13 @@
     "All files" : "Svi fajlovi",
     "Favorites" : "Omiljeni",
     "Home" : "Početna",
+    "Close" : "Zatvori",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne mogu da otpremim {filename} jer je to direktorijum ili ima 0 bajtova",
     "Total file size {size1} exceeds upload limit {size2}" : "Veličina {size1} prevazilazi ograničenje za otpremanje od {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nema prostora. Otpremate {size1} ali samo {size2} je preostalo",
     "Upload cancelled." : "Otpremanje je otkazano.",
     "Could not get result from server." : "Ne mogu da dobijem rezultat sa servera.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Otpremanje fajla je u toku. Ako sada napustite stranicu, otkazaćete otpremanje.",
-    "{new_name} already exists" : "{new_name} već postoji",
-    "Could not create file" : "Ne mogu da stvorim fajl",
-    "Could not create folder" : "Ne mogu da stvorim fasciklu",
-    "Rename" : "Preimenuj",
-    "Delete" : "Obriši",
-    "Disconnect storage" : "Isključi skladište",
-    "Unshare" : "Ne deli",
     "Download" : "Preuzmi",
     "Select" : "Izaberi",
     "Pending" : "Na čekanju",
@@ -47,7 +41,10 @@
     "Error moving file." : "Greška pri premeštanju fajla.",
     "Error moving file" : "Greška pri premeštanju fajla",
     "Error" : "Greška",
+    "{new_name} already exists" : "{new_name} već postoji",
     "Could not rename file" : "Ne mogu da preimenujem fajl",
+    "Could not create file" : "Ne mogu da stvorim fajl",
+    "Could not create folder" : "Ne mogu da stvorim fasciklu",
     "Error deleting file." : "Greška pri brisanju fajla.",
     "No entries in this folder match '{filter}'" : "U ovoj fascikli ništa se ne poklapa sa '{filter}'",
     "Name" : "Naziv",
@@ -55,16 +52,21 @@
     "Modified" : "Izmenjen",
     "_%n folder_::_%n folders_" : ["%n fascikla","%n fascikle","%n fascikli"],
     "_%n file_::_%n files_" : ["%n fajl","%n fajla","%n fajlova"],
+    "{dirs} and {files}" : "{dirs} i {files}",
     "You don’t have permission to upload or create files here" : "Nemate dozvole da ovde otpremate ili stvarate fajlove",
     "_Uploading %n file_::_Uploading %n files_" : ["Otpremam %n fajl","Otpremam %n fajla","Otpremam %n fajlova"],
+    "New" : "Novo",
     "\"{name}\" is an invalid file name." : "\"{name}\" nije ispravan naziv fajla.",
     "File name cannot be empty." : "Naziv fajla ne može biti prazan.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše skladište je puno. Fajlovi više ne mogu biti ažurirani ni sinhronizovani!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Vaše skladište je skoro puno ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["se poklapa sa '{filter}'","se poklapaju sa '{filter}'","se poklapa sa '{filter}'"],
-    "{dirs} and {files}" : "{dirs} i {files}",
     "Favorited" : "Omiljeno",
     "Favorite" : "Omiljeni",
+    "Upload" : "Otpremi",
+    "Text file" : "tekstualni fajl",
+    "Folder" : "fascikla",
+    "New folder" : "Nova fascikla",
     "An error occurred while trying to update the tags" : "Došlo je do greške pri pokušaju ažuriranja oznaka",
     "A new file or folder has been <strong>created</strong>" : "Novi fajl ili fascikla su <strong>napravljeni</strong>",
     "A file or folder has been <strong>changed</strong>" : "Fajl ili fascikla su <strong>izmenjeni</strong>",
@@ -91,17 +93,12 @@
     "Settings" : "Postavke",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Koristite ovu adresu da <a href=\"%s\" target=\"_blank\"> pristupite fajlovima preko WebDAV-a</a>",
-    "New" : "Novo",
-    "New text file" : "Nov tekstualni fajl",
-    "Text file" : "tekstualni fajl",
-    "New folder" : "Nova fascikla",
-    "Folder" : "fascikla",
-    "Upload" : "Otpremi",
     "Cancel upload" : "Otkaži otpremanje",
     "No files in here" : "Ovde nema fajlova",
     "Upload some content or sync with your devices!" : "Otpremite neki sadržaj ili sinhronizujte sa vašim uređajima!",
     "No entries found in this folder" : "Nema ničega u ovoj fascikli",
     "Select all" : "Označi sve",
+    "Delete" : "Obriši",
     "Upload too large" : "Otpremanje je preveliko",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da otpremite prevazilaze ograničenje otpremanja na ovom serveru.",
     "Files are being scanned, please wait." : "Skeniram fajlove, sačekajte.",
diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js
index 9af440dcbc..5f9a08404d 100644
--- a/apps/files/l10n/sv.js
+++ b/apps/files/l10n/sv.js
@@ -29,19 +29,14 @@ OC.L10N.register(
     "All files" : "Alla filer",
     "Favorites" : "Favoriter",
     "Home" : "Hem",
+    "Close" : "Stäng",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.",
     "Total file size {size1} exceeds upload limit {size2}" : "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.",
     "Upload cancelled." : "Uppladdning avbruten.",
     "Could not get result from server." : "Gick inte att hämta resultat från server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
-    "{new_name} already exists" : "{new_name} finns redan",
-    "Could not create file" : "Kunde ej skapa fil",
-    "Could not create folder" : "Kunde ej skapa katalog",
-    "Rename" : "Byt namn",
-    "Delete" : "Radera",
-    "Disconnect storage" : "Koppla bort lagring",
-    "Unshare" : "Sluta dela",
+    "Actions" : "Åtgärder",
     "Download" : "Ladda ner",
     "Select" : "Välj",
     "Pending" : "Väntar",
@@ -49,22 +44,30 @@ OC.L10N.register(
     "Error moving file." : "Fel vid flytt av fil.",
     "Error moving file" : "Fel uppstod vid flyttning av fil",
     "Error" : "Fel",
+    "{new_name} already exists" : "{new_name} finns redan",
     "Could not rename file" : "Kan ej byta filnamn",
+    "Could not create file" : "Kunde ej skapa fil",
+    "Could not create folder" : "Kunde ej skapa katalog",
     "Error deleting file." : "Kunde inte ta bort filen.",
     "Name" : "Namn",
     "Size" : "Storlek",
     "Modified" : "Ändrad",
     "_%n folder_::_%n folders_" : ["%n mapp","%n mappar"],
     "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "{dirs} and {files}" : "{dirs} och {files}",
     "You don’t have permission to upload or create files here" : "Du har ej tillåtelse att ladda upp eller skapa filer här",
     "_Uploading %n file_::_Uploading %n files_" : ["Laddar upp %n fil","Laddar upp %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "\"{name}\" är ett ogiltligt filnamn.",
     "File name cannot be empty." : "Filnamn kan inte vara tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} och {files}",
     "Favorited" : "Favoritiserad",
     "Favorite" : "Favorit",
+    "Upload" : "Ladda upp",
+    "Text file" : "Textfil",
+    "Folder" : "Mapp",
+    "New folder" : "Ny mapp",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mapp har blivit <strong>skapad</strong>",
     "A file or folder has been <strong>changed</strong>" : "En ny fil eller mapp har blivit <strong>ändrad</strong>",
     "A file or folder has been <strong>deleted</strong>" : "En ny fil eller mapp har blivit <strong>raderad</strong>",
@@ -88,15 +91,10 @@ OC.L10N.register(
     "Settings" : "Inställningar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Använd denna adress till <a href=\"%s\" target=\"_blank\">nå dina Filer via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny textfil",
-    "Text file" : "Textfil",
-    "New folder" : "Ny mapp",
-    "Folder" : "Mapp",
-    "Upload" : "Ladda upp",
     "Cancel upload" : "Avbryt uppladdning",
     "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!",
     "Select all" : "Välj allt",
+    "Delete" : "Radera",
     "Upload too large" : "För stor uppladdning",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
     "Files are being scanned, please wait." : "Filer skannas, var god vänta",
diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json
index 0da4cbe5f5..e6775948cf 100644
--- a/apps/files/l10n/sv.json
+++ b/apps/files/l10n/sv.json
@@ -27,19 +27,14 @@
     "All files" : "Alla filer",
     "Favorites" : "Favoriter",
     "Home" : "Hem",
+    "Close" : "Stäng",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.",
     "Total file size {size1} exceeds upload limit {size2}" : "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.",
     "Upload cancelled." : "Uppladdning avbruten.",
     "Could not get result from server." : "Gick inte att hämta resultat från server.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
-    "{new_name} already exists" : "{new_name} finns redan",
-    "Could not create file" : "Kunde ej skapa fil",
-    "Could not create folder" : "Kunde ej skapa katalog",
-    "Rename" : "Byt namn",
-    "Delete" : "Radera",
-    "Disconnect storage" : "Koppla bort lagring",
-    "Unshare" : "Sluta dela",
+    "Actions" : "Åtgärder",
     "Download" : "Ladda ner",
     "Select" : "Välj",
     "Pending" : "Väntar",
@@ -47,22 +42,30 @@
     "Error moving file." : "Fel vid flytt av fil.",
     "Error moving file" : "Fel uppstod vid flyttning av fil",
     "Error" : "Fel",
+    "{new_name} already exists" : "{new_name} finns redan",
     "Could not rename file" : "Kan ej byta filnamn",
+    "Could not create file" : "Kunde ej skapa fil",
+    "Could not create folder" : "Kunde ej skapa katalog",
     "Error deleting file." : "Kunde inte ta bort filen.",
     "Name" : "Namn",
     "Size" : "Storlek",
     "Modified" : "Ändrad",
     "_%n folder_::_%n folders_" : ["%n mapp","%n mappar"],
     "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "{dirs} and {files}" : "{dirs} och {files}",
     "You don’t have permission to upload or create files here" : "Du har ej tillåtelse att ladda upp eller skapa filer här",
     "_Uploading %n file_::_Uploading %n files_" : ["Laddar upp %n fil","Laddar upp %n filer"],
+    "New" : "Ny",
     "\"{name}\" is an invalid file name." : "\"{name}\" är ett ogiltligt filnamn.",
     "File name cannot be empty." : "Filnamn kan inte vara tomt.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} och {files}",
     "Favorited" : "Favoritiserad",
     "Favorite" : "Favorit",
+    "Upload" : "Ladda upp",
+    "Text file" : "Textfil",
+    "Folder" : "Mapp",
+    "New folder" : "Ny mapp",
     "A new file or folder has been <strong>created</strong>" : "En ny fil eller mapp har blivit <strong>skapad</strong>",
     "A file or folder has been <strong>changed</strong>" : "En ny fil eller mapp har blivit <strong>ändrad</strong>",
     "A file or folder has been <strong>deleted</strong>" : "En ny fil eller mapp har blivit <strong>raderad</strong>",
@@ -86,15 +89,10 @@
     "Settings" : "Inställningar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Använd denna adress till <a href=\"%s\" target=\"_blank\">nå dina Filer via WebDAV</a>",
-    "New" : "Ny",
-    "New text file" : "Ny textfil",
-    "Text file" : "Textfil",
-    "New folder" : "Ny mapp",
-    "Folder" : "Mapp",
-    "Upload" : "Ladda upp",
     "Cancel upload" : "Avbryt uppladdning",
     "Upload some content or sync with your devices!" : "Ladda upp innehåll eller synkronisera med dina enheter!",
     "Select all" : "Välj allt",
+    "Delete" : "Radera",
     "Upload too large" : "För stor uppladdning",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
     "Files are being scanned, please wait." : "Filer skannas, var god vänta",
diff --git a/apps/files/l10n/ta_IN.js b/apps/files/l10n/ta_IN.js
index c12b3fc948..c845333808 100644
--- a/apps/files/l10n/ta_IN.js
+++ b/apps/files/l10n/ta_IN.js
@@ -2,6 +2,8 @@ OC.L10N.register(
     "files",
     {
     "Files" : "கோப்புகள்",
+    "Upload" : "பதிவேற்று",
+    "New folder" : "புதிய கோப்புறை",
     "A new file or folder has been <strong>created</strong>" : "ஒரு புதிய கோப்புறை அல்லது ஆவணம் <strong> உருவாக்கப்பட்டுள்ளது.</strong>",
     "A file or folder has been <strong>changed</strong>" : "ஒரு கோப்புறை அல்லது ஆவணம் <strong>மாற்றம் செய்யப்பட்டுள்ளது.</strong>",
     "A file or folder has been <strong>deleted</strong>" : "ஒரு கோப்புறை அல்லது ஆவணம்  <strong> நீக்கப்பட்டுள்ளது. </strong>",
@@ -11,8 +13,6 @@ OC.L10N.register(
     "%2$s changed %1$s" : "%2$s  %1$s 'ல் மாற்றம் செய்துள்ளார். ",
     "You deleted %1$s" : "நீங்கள் %1$s 'ஐ நீக்கி உள்ளீர்கள்.",
     "%2$s deleted %1$s" : "%2$s , %1$s 'ஐ நீக்கியுள்ளார்.",
-    "Settings" : "அமைப்புகள்",
-    "New folder" : "புதிய கோப்புறை",
-    "Upload" : "பதிவேற்று"
+    "Settings" : "அமைப்புகள்"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ta_IN.json b/apps/files/l10n/ta_IN.json
index 086a341661..392601a375 100644
--- a/apps/files/l10n/ta_IN.json
+++ b/apps/files/l10n/ta_IN.json
@@ -1,5 +1,7 @@
 { "translations": {
     "Files" : "கோப்புகள்",
+    "Upload" : "பதிவேற்று",
+    "New folder" : "புதிய கோப்புறை",
     "A new file or folder has been <strong>created</strong>" : "ஒரு புதிய கோப்புறை அல்லது ஆவணம் <strong> உருவாக்கப்பட்டுள்ளது.</strong>",
     "A file or folder has been <strong>changed</strong>" : "ஒரு கோப்புறை அல்லது ஆவணம் <strong>மாற்றம் செய்யப்பட்டுள்ளது.</strong>",
     "A file or folder has been <strong>deleted</strong>" : "ஒரு கோப்புறை அல்லது ஆவணம்  <strong> நீக்கப்பட்டுள்ளது. </strong>",
@@ -9,8 +11,6 @@
     "%2$s changed %1$s" : "%2$s  %1$s 'ல் மாற்றம் செய்துள்ளார். ",
     "You deleted %1$s" : "நீங்கள் %1$s 'ஐ நீக்கி உள்ளீர்கள்.",
     "%2$s deleted %1$s" : "%2$s , %1$s 'ஐ நீக்கியுள்ளார்.",
-    "Settings" : "அமைப்புகள்",
-    "New folder" : "புதிய கோப்புறை",
-    "Upload" : "பதிவேற்று"
+    "Settings" : "அமைப்புகள்"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/ta_LK.js b/apps/files/l10n/ta_LK.js
index 7b1ccf9bbc..90a955e135 100644
--- a/apps/files/l10n/ta_LK.js
+++ b/apps/files/l10n/ta_LK.js
@@ -11,30 +11,30 @@ OC.L10N.register(
     "Files" : "கோப்புகள்",
     "Favorites" : "விருப்பங்கள்",
     "Home" : "அகம்",
+    "Close" : "மூடுக",
     "Upload cancelled." : "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
     "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
-    "{new_name} already exists" : "{new_name} ஏற்கனவே உள்ளது",
-    "Rename" : "பெயர்மாற்றம்",
-    "Delete" : "நீக்குக",
-    "Unshare" : "பகிரப்படாதது",
+    "Actions" : "செயல்கள்",
     "Download" : "பதிவிறக்குக",
     "Select" : "தெரிக",
     "Pending" : "நிலுவையிலுள்ள",
     "Error" : "வழு",
+    "{new_name} already exists" : "{new_name} ஏற்கனவே உள்ளது",
     "Name" : "பெயர்",
     "Size" : "அளவு",
     "Modified" : "மாற்றப்பட்டது",
+    "New" : "புதிய",
     "Favorite" : "விருப்பமான",
+    "Upload" : "பதிவேற்றுக",
+    "Text file" : "கோப்பு உரை",
+    "Folder" : "கோப்புறை",
     "File handling" : "கோப்பு கையாளுதல்",
     "Maximum upload size" : "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
     "max. possible: " : "ஆகக் கூடியது:",
     "Save" : "சேமிக்க ",
     "Settings" : "அமைப்புகள்",
-    "New" : "புதிய",
-    "Text file" : "கோப்பு உரை",
-    "Folder" : "கோப்புறை",
-    "Upload" : "பதிவேற்றுக",
     "Cancel upload" : "பதிவேற்றலை இரத்து செய்க",
+    "Delete" : "நீக்குக",
     "Upload too large" : "பதிவேற்றல் மிகப்பெரியது",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.",
     "Files are being scanned, please wait." : "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
diff --git a/apps/files/l10n/ta_LK.json b/apps/files/l10n/ta_LK.json
index 28a039f4c3..64220b8674 100644
--- a/apps/files/l10n/ta_LK.json
+++ b/apps/files/l10n/ta_LK.json
@@ -9,30 +9,30 @@
     "Files" : "கோப்புகள்",
     "Favorites" : "விருப்பங்கள்",
     "Home" : "அகம்",
+    "Close" : "மூடுக",
     "Upload cancelled." : "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
     "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
-    "{new_name} already exists" : "{new_name} ஏற்கனவே உள்ளது",
-    "Rename" : "பெயர்மாற்றம்",
-    "Delete" : "நீக்குக",
-    "Unshare" : "பகிரப்படாதது",
+    "Actions" : "செயல்கள்",
     "Download" : "பதிவிறக்குக",
     "Select" : "தெரிக",
     "Pending" : "நிலுவையிலுள்ள",
     "Error" : "வழு",
+    "{new_name} already exists" : "{new_name} ஏற்கனவே உள்ளது",
     "Name" : "பெயர்",
     "Size" : "அளவு",
     "Modified" : "மாற்றப்பட்டது",
+    "New" : "புதிய",
     "Favorite" : "விருப்பமான",
+    "Upload" : "பதிவேற்றுக",
+    "Text file" : "கோப்பு உரை",
+    "Folder" : "கோப்புறை",
     "File handling" : "கோப்பு கையாளுதல்",
     "Maximum upload size" : "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
     "max. possible: " : "ஆகக் கூடியது:",
     "Save" : "சேமிக்க ",
     "Settings" : "அமைப்புகள்",
-    "New" : "புதிய",
-    "Text file" : "கோப்பு உரை",
-    "Folder" : "கோப்புறை",
-    "Upload" : "பதிவேற்றுக",
     "Cancel upload" : "பதிவேற்றலை இரத்து செய்க",
+    "Delete" : "நீக்குக",
     "Upload too large" : "பதிவேற்றல் மிகப்பெரியது",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.",
     "Files are being scanned, please wait." : "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
diff --git a/apps/files/l10n/te.js b/apps/files/l10n/te.js
index f78e7bade5..51f6b1c529 100644
--- a/apps/files/l10n/te.js
+++ b/apps/files/l10n/te.js
@@ -1,13 +1,14 @@
 OC.L10N.register(
     "files",
     {
-    "Delete" : "తొలగించు",
+    "Close" : "మూసివేయి",
     "Error" : "పొరపాటు",
     "Name" : "పేరు",
     "Size" : "పరిమాణం",
+    "Folder" : "సంచయం",
+    "New folder" : "కొత్త సంచయం",
     "Save" : "భద్రపరచు",
     "Settings" : "అమరికలు",
-    "New folder" : "కొత్త సంచయం",
-    "Folder" : "సంచయం"
+    "Delete" : "తొలగించు"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/te.json b/apps/files/l10n/te.json
index 364456e183..fa7efa9d70 100644
--- a/apps/files/l10n/te.json
+++ b/apps/files/l10n/te.json
@@ -1,11 +1,12 @@
 { "translations": {
-    "Delete" : "తొలగించు",
+    "Close" : "మూసివేయి",
     "Error" : "పొరపాటు",
     "Name" : "పేరు",
     "Size" : "పరిమాణం",
+    "Folder" : "సంచయం",
+    "New folder" : "కొత్త సంచయం",
     "Save" : "భద్రపరచు",
     "Settings" : "అమరికలు",
-    "New folder" : "కొత్త సంచయం",
-    "Folder" : "సంచయం"
+    "Delete" : "తొలగించు"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/th_TH.js b/apps/files/l10n/th_TH.js
index 40af2bb490..2b092551a1 100644
--- a/apps/files/l10n/th_TH.js
+++ b/apps/files/l10n/th_TH.js
@@ -22,27 +22,21 @@ OC.L10N.register(
     "Missing a temporary folder" : "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
     "Failed to write to disk" : "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
     "Not enough storage available" : "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน",
-    "Upload failed. Could not find uploaded file" : "อัปโหลดล้มเหลว ไม่สามารถหาไฟล์ที่จะอัพโหลด",
+    "Upload failed. Could not find uploaded file" : "อัพโหลดล้มเหลว ไม่สามารถหาไฟล์ที่จะอัพโหลด",
     "Upload failed. Could not get file info." : "อัพโหลดล้มเหลว ไม่สามารถรับข้อมูลไฟล์",
     "Invalid directory." : "ไดเร็กทอรี่ไม่ถูกต้อง",
     "Files" : "ไฟล์",
     "All files" : "ไฟล์ทั้งหมด",
     "Favorites" : "รายการโปรด",
     "Home" : "บ้าน",
+    "Close" : "ปิด",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "ไม่สามารถอัพโหลด {filename} มันเป็นไดเรกทอรีหรือมี 0 ไบต์",
     "Total file size {size1} exceeds upload limit {size2}" : "ขนาดไฟล์ {size1} ทั้งหมดเกินขีดจำกัด ของการอัพโหลด {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "พื้นที่ว่างไม่เพียงพอคุณจะอัพโหลด {size1} แต่มีพืนที่แค่ {size2}",
     "Upload cancelled." : "การอัพโหลดถูกยกเลิก",
     "Could not get result from server." : "ไม่สามารถรับผลลัพธ์จากเซิร์ฟเวอร์",
     "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
-    "{new_name} already exists" : "{new_name} มีอยู่แล้วในระบบ",
-    "Could not create file" : "ไม่สามารถสร้างไฟล์",
-    "Could not create folder" : "ไม่สามารถสร้างโฟลเดอร์",
-    "Rename" : "เปลี่ยนชื่อ",
-    "Delete" : "ลบ",
-    "Disconnect storage" : "ยกเลิกการเชื่อมต่อการจัดเก็บข้อมูล",
-    "Unshare" : "ยกเลิกการแชร์",
-    "No permission to delete" : "ไม่อนุญาตให้ลบ",
+    "Actions" : "การกระทำ",
     "Download" : "ดาวน์โหลด",
     "Select" : "เลือก",
     "Pending" : "อยู่ระหว่างดำเนินการ",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "ข้อผิดพลาดในการเคลื่อนย้ายไฟล์",
     "Error moving file" : "ข้อผิดพลาดในการเคลื่อนย้ายไฟล์",
     "Error" : "ข้อผิดพลาด",
+    "{new_name} already exists" : "{new_name} มีอยู่แล้วในระบบ",
     "Could not rename file" : "ไม่สามารถเปลี่ยนชื่อไฟล์",
+    "Could not create file" : "ไม่สามารถสร้างไฟล์",
+    "Could not create folder" : "ไม่สามารถสร้างโฟลเดอร์",
     "Error deleting file." : "เกิดข้อผิดพลาดในการลบไฟล์",
     "No entries in this folder match '{filter}'" : "ไม่มีรายการในโฟลเดอร์นี้ที่ตรงกับ '{filter}'",
     "Name" : "ชื่อ",
@@ -60,18 +57,27 @@ OC.L10N.register(
     "Modified" : "แก้ไขแล้ว",
     "_%n folder_::_%n folders_" : ["%n โฟลเดอร์"],
     "_%n file_::_%n files_" : ["%n ไฟล์"],
+    "{dirs} and {files}" : "{dirs} และ {files}",
     "You don’t have permission to upload or create files here" : "คุณไม่ได้รับอนุญาตให้อัพโหลดหรือสร้างไฟล์ที่นี่",
     "_Uploading %n file_::_Uploading %n files_" : ["อัพโหลด %n ไฟล์"],
+    "New" : "ใหม่",
     "\"{name}\" is an invalid file name." : "\"{name}\" เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
     "File name cannot be empty." : "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
-    "Storage of {owner} is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของ {owner} เต็มแล้ว  ไฟล์ไม่สามารถอัพเดทหรือผสานข้อมูลได้อีก!",
-    "Your storage is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานข้อมูลได้อีก!",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของ {owner} เต็มแล้ว  ไฟล์ไม่สามารถอัพเดทหรือประสานข้อมูลได้อีก!",
+    "Your storage is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือประสานข้อมูลได้อีก!",
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "พื้นที่จัดเก็บข้อมูลของ {owner} ใกล้เต็มแล้ว\nใช้พื้นที่ไปแล้ว: ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว \nใช้พื้นที่ไปแล้ว: ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["ตรงกับ '{filter}'"],
-    "{dirs} and {files}" : "{dirs} และ {files}",
+    "Path" : "เส้นทาง",
+    "_%n byte_::_%n bytes_" : ["%n ไบต์"],
     "Favorited" : "รายการโปรด",
     "Favorite" : "รายการโปรด",
+    "{newname} already exists" : "{newname} ถูกใช้ไปแล้ว",
+    "Upload" : "อัพโหลด",
+    "Text file" : "ไฟล์ข้อความ",
+    "New text file.txt" : "ไฟล์ข้อความใหม่ .txt",
+    "Folder" : "แฟ้มเอกสาร",
+    "New folder" : "โฟลเดอร์ใหม่",
     "An error occurred while trying to update the tags" : "เกิดข้อผิดพลาดขณะที่พยายามจะปรับปรุงแท็ก",
     "A new file or folder has been <strong>created</strong>" : "มีไฟล์ใหม่หรือโฟลเดอร์ได้ถูก <strong>สร้างขึ้น!</strong>",
     "A file or folder has been <strong>changed</strong>" : "มีไฟล์หรือโฟลเดอร์ได้ถูก <strong>เปลี่ยน!</strong>",
@@ -93,22 +99,18 @@ OC.L10N.register(
     "File handling" : "การจัดการไฟล์",
     "Maximum upload size" : "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
     "max. possible: " : "จำนวนสูงสุดที่สามารถทำได้: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "ด้วยค่า PHP-FPM นี้อาจใช้เวลาถึง 5 นาที จะมีผลหลังจากการบันทึก",
     "Save" : "บันทึก",
     "Can not be edited from here due to insufficient permissions." : "ไม่สามารถแก้ไขได้จากที่นี่เนื่องจากสิทธิ์ไม่เพียงพอ",
     "Settings" : "ตั้งค่า",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "ใช้ที่อยู่นี้เพื่อ <a href=\"%s\" target=\"_blank\">เข้าถึงไฟล์ของคุณผ่าน WebDAV</a>",
-    "New" : "ใหม่",
-    "New text file" : "ไฟล์ข้อความใหม่",
-    "Text file" : "ไฟล์ข้อความ",
-    "New folder" : "โฟลเดอร์ใหม่",
-    "Folder" : "แฟ้มเอกสาร",
-    "Upload" : "อัพโหลด",
     "Cancel upload" : "ยกเลิกการอัพโหลด",
     "No files in here" : "ไม่มีไฟล์ที่นี่",
-    "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือผสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง",
+    "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือประสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง",
     "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้",
     "Select all" : "เลือกทั้งหมด",
+    "Delete" : "ลบ",
     "Upload too large" : "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
     "Files are being scanned, please wait." : "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
diff --git a/apps/files/l10n/th_TH.json b/apps/files/l10n/th_TH.json
index a6febf6fad..3125adc820 100644
--- a/apps/files/l10n/th_TH.json
+++ b/apps/files/l10n/th_TH.json
@@ -20,27 +20,21 @@
     "Missing a temporary folder" : "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
     "Failed to write to disk" : "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
     "Not enough storage available" : "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน",
-    "Upload failed. Could not find uploaded file" : "อัปโหลดล้มเหลว ไม่สามารถหาไฟล์ที่จะอัพโหลด",
+    "Upload failed. Could not find uploaded file" : "อัพโหลดล้มเหลว ไม่สามารถหาไฟล์ที่จะอัพโหลด",
     "Upload failed. Could not get file info." : "อัพโหลดล้มเหลว ไม่สามารถรับข้อมูลไฟล์",
     "Invalid directory." : "ไดเร็กทอรี่ไม่ถูกต้อง",
     "Files" : "ไฟล์",
     "All files" : "ไฟล์ทั้งหมด",
     "Favorites" : "รายการโปรด",
     "Home" : "บ้าน",
+    "Close" : "ปิด",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "ไม่สามารถอัพโหลด {filename} มันเป็นไดเรกทอรีหรือมี 0 ไบต์",
     "Total file size {size1} exceeds upload limit {size2}" : "ขนาดไฟล์ {size1} ทั้งหมดเกินขีดจำกัด ของการอัพโหลด {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "พื้นที่ว่างไม่เพียงพอคุณจะอัพโหลด {size1} แต่มีพืนที่แค่ {size2}",
     "Upload cancelled." : "การอัพโหลดถูกยกเลิก",
     "Could not get result from server." : "ไม่สามารถรับผลลัพธ์จากเซิร์ฟเวอร์",
     "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
-    "{new_name} already exists" : "{new_name} มีอยู่แล้วในระบบ",
-    "Could not create file" : "ไม่สามารถสร้างไฟล์",
-    "Could not create folder" : "ไม่สามารถสร้างโฟลเดอร์",
-    "Rename" : "เปลี่ยนชื่อ",
-    "Delete" : "ลบ",
-    "Disconnect storage" : "ยกเลิกการเชื่อมต่อการจัดเก็บข้อมูล",
-    "Unshare" : "ยกเลิกการแชร์",
-    "No permission to delete" : "ไม่อนุญาตให้ลบ",
+    "Actions" : "การกระทำ",
     "Download" : "ดาวน์โหลด",
     "Select" : "เลือก",
     "Pending" : "อยู่ระหว่างดำเนินการ",
@@ -50,7 +44,10 @@
     "Error moving file." : "ข้อผิดพลาดในการเคลื่อนย้ายไฟล์",
     "Error moving file" : "ข้อผิดพลาดในการเคลื่อนย้ายไฟล์",
     "Error" : "ข้อผิดพลาด",
+    "{new_name} already exists" : "{new_name} มีอยู่แล้วในระบบ",
     "Could not rename file" : "ไม่สามารถเปลี่ยนชื่อไฟล์",
+    "Could not create file" : "ไม่สามารถสร้างไฟล์",
+    "Could not create folder" : "ไม่สามารถสร้างโฟลเดอร์",
     "Error deleting file." : "เกิดข้อผิดพลาดในการลบไฟล์",
     "No entries in this folder match '{filter}'" : "ไม่มีรายการในโฟลเดอร์นี้ที่ตรงกับ '{filter}'",
     "Name" : "ชื่อ",
@@ -58,18 +55,27 @@
     "Modified" : "แก้ไขแล้ว",
     "_%n folder_::_%n folders_" : ["%n โฟลเดอร์"],
     "_%n file_::_%n files_" : ["%n ไฟล์"],
+    "{dirs} and {files}" : "{dirs} และ {files}",
     "You don’t have permission to upload or create files here" : "คุณไม่ได้รับอนุญาตให้อัพโหลดหรือสร้างไฟล์ที่นี่",
     "_Uploading %n file_::_Uploading %n files_" : ["อัพโหลด %n ไฟล์"],
+    "New" : "ใหม่",
     "\"{name}\" is an invalid file name." : "\"{name}\" เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
     "File name cannot be empty." : "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
-    "Storage of {owner} is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของ {owner} เต็มแล้ว  ไฟล์ไม่สามารถอัพเดทหรือผสานข้อมูลได้อีก!",
-    "Your storage is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานข้อมูลได้อีก!",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของ {owner} เต็มแล้ว  ไฟล์ไม่สามารถอัพเดทหรือประสานข้อมูลได้อีก!",
+    "Your storage is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือประสานข้อมูลได้อีก!",
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "พื้นที่จัดเก็บข้อมูลของ {owner} ใกล้เต็มแล้ว\nใช้พื้นที่ไปแล้ว: ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว \nใช้พื้นที่ไปแล้ว: ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["ตรงกับ '{filter}'"],
-    "{dirs} and {files}" : "{dirs} และ {files}",
+    "Path" : "เส้นทาง",
+    "_%n byte_::_%n bytes_" : ["%n ไบต์"],
     "Favorited" : "รายการโปรด",
     "Favorite" : "รายการโปรด",
+    "{newname} already exists" : "{newname} ถูกใช้ไปแล้ว",
+    "Upload" : "อัพโหลด",
+    "Text file" : "ไฟล์ข้อความ",
+    "New text file.txt" : "ไฟล์ข้อความใหม่ .txt",
+    "Folder" : "แฟ้มเอกสาร",
+    "New folder" : "โฟลเดอร์ใหม่",
     "An error occurred while trying to update the tags" : "เกิดข้อผิดพลาดขณะที่พยายามจะปรับปรุงแท็ก",
     "A new file or folder has been <strong>created</strong>" : "มีไฟล์ใหม่หรือโฟลเดอร์ได้ถูก <strong>สร้างขึ้น!</strong>",
     "A file or folder has been <strong>changed</strong>" : "มีไฟล์หรือโฟลเดอร์ได้ถูก <strong>เปลี่ยน!</strong>",
@@ -91,22 +97,18 @@
     "File handling" : "การจัดการไฟล์",
     "Maximum upload size" : "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
     "max. possible: " : "จำนวนสูงสุดที่สามารถทำได้: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "ด้วยค่า PHP-FPM นี้อาจใช้เวลาถึง 5 นาที จะมีผลหลังจากการบันทึก",
     "Save" : "บันทึก",
     "Can not be edited from here due to insufficient permissions." : "ไม่สามารถแก้ไขได้จากที่นี่เนื่องจากสิทธิ์ไม่เพียงพอ",
     "Settings" : "ตั้งค่า",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "ใช้ที่อยู่นี้เพื่อ <a href=\"%s\" target=\"_blank\">เข้าถึงไฟล์ของคุณผ่าน WebDAV</a>",
-    "New" : "ใหม่",
-    "New text file" : "ไฟล์ข้อความใหม่",
-    "Text file" : "ไฟล์ข้อความ",
-    "New folder" : "โฟลเดอร์ใหม่",
-    "Folder" : "แฟ้มเอกสาร",
-    "Upload" : "อัพโหลด",
     "Cancel upload" : "ยกเลิกการอัพโหลด",
     "No files in here" : "ไม่มีไฟล์ที่นี่",
-    "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือผสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง",
+    "Upload some content or sync with your devices!" : "อัพโหลดเนื้อหาบางส่วนหรือประสานข้อมูลกับอุปกรณ์ของคุณ! อีกครั้ง",
     "No entries found in this folder" : "ไม่พบรายการในโฟลเดอร์นี้",
     "Select all" : "เลือกทั้งหมด",
+    "Delete" : "ลบ",
     "Upload too large" : "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
     "Files are being scanned, please wait." : "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
index dbc91ba15d..157280b696 100644
--- a/apps/files/l10n/tr.js
+++ b/apps/files/l10n/tr.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Tüm dosyalar",
     "Favorites" : "Sık kullanılanlar",
     "Home" : "Ev",
+    "Close" : "Kapat",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi",
     "Total file size {size1} exceeds upload limit {size2}" : "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut",
     "Upload cancelled." : "Yükleme iptal edildi.",
     "Could not get result from server." : "Sunucudan sonuç alınamadı.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
-    "{new_name} already exists" : "{new_name} zaten mevcut",
-    "Could not create file" : "Dosya oluşturulamadı",
-    "Could not create folder" : "Klasör oluşturulamadı",
-    "Rename" : "Yeniden adlandır",
-    "Delete" : "Sil",
-    "Disconnect storage" : "Depolama bağlantısını kes",
-    "Unshare" : "Paylaşmayı Kaldır",
-    "No permission to delete" : "Silmeye izin yok",
+    "Actions" : "Eylemler",
     "Download" : "İndir",
     "Select" : "Seç",
     "Pending" : "Bekliyor",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "Dosya taşıma hatası.",
     "Error moving file" : "Dosya taşıma hatası",
     "Error" : "Hata",
+    "{new_name} already exists" : "{new_name} zaten mevcut",
     "Could not rename file" : "Dosya adlandırılamadı",
+    "Could not create file" : "Dosya oluşturulamadı",
+    "Could not create folder" : "Klasör oluşturulamadı",
     "Error deleting file." : "Dosya silinirken hata.",
     "No entries in this folder match '{filter}'" : "Bu klasörde hiçbir girdi '{filter}' ile eşleşmiyor",
     "Name" : "İsim",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "Değiştirilme",
     "_%n folder_::_%n folders_" : ["%n klasör","%n klasör"],
     "_%n file_::_%n files_" : ["%n dosya","%n dosya"],
+    "{dirs} and {files}" : "{dirs} ve {files}",
     "You don’t have permission to upload or create files here" : "Buraya dosya yükleme veya oluşturma izniniz yok",
     "_Uploading %n file_::_Uploading %n files_" : ["%n dosya yükleniyor","%n dosya yükleniyor"],
+    "New" : "Yeni",
     "\"{name}\" is an invalid file name." : "\"{name}\" geçersiz bir dosya adı.",
     "File name cannot be empty." : "Dosya adı boş olamaz.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} depolama alanı dolu, artık dosyalar güncellenmeyecek yada eşitlenmeyecek.",
@@ -69,9 +68,14 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : " {owner} depolama alanı neredeyse dolu ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Depolama alanınız neredeyse dolu (%{usedSpacePercent})",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}' ile eşleşiyor","'{filter}' ile eşleşiyor"],
-    "{dirs} and {files}" : "{dirs} ve {files}",
+    "Path" : "Yol",
+    "_%n byte_::_%n bytes_" : ["%n bayt","%n bayt"],
     "Favorited" : "Sık kullanılanlara eklendi",
     "Favorite" : "Sık kullanılan",
+    "Upload" : "Yükle",
+    "Text file" : "Metin dosyası",
+    "Folder" : "Klasör",
+    "New folder" : "Yeni klasör",
     "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu",
     "A new file or folder has been <strong>created</strong>" : "Yeni bir dosya veya klasör <strong>oluşturuldu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Bir dosya veya klasör <strong>değiştirildi</strong>",
@@ -93,22 +97,18 @@ OC.L10N.register(
     "File handling" : "Dosya işlemleri",
     "Maximum upload size" : "Azami yükleme boyutu",
     "max. possible: " : "mümkün olan en fazla: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM ile bu değerin kaydedildikten sonra etkili olabilmesi için 5 dakika gerekebilir.",
     "Save" : "Kaydet",
     "Can not be edited from here due to insufficient permissions." : "Yetersiz izinler buradan düzenlenemez.",
     "Settings" : "Ayarlar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın",
-    "New" : "Yeni",
-    "New text file" : "Yeni metin dosyası",
-    "Text file" : "Metin dosyası",
-    "New folder" : "Yeni klasör",
-    "Folder" : "Klasör",
-    "Upload" : "Yükle",
     "Cancel upload" : "Yüklemeyi iptal et",
     "No files in here" : "Burada hiç dosya yok",
     "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!",
     "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı",
     "Select all" : "Tümünü seç",
+    "Delete" : "Sil",
     "Upload too large" : "Yükleme çok büyük",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yüklemeye çalıştığınız dosyalar bu sunucudaki azami yükleme boyutunu aşıyor.",
     "Files are being scanned, please wait." : "Dosyalar taranıyor, lütfen bekleyin.",
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
index eb967e2e3e..8a15f7ff31 100644
--- a/apps/files/l10n/tr.json
+++ b/apps/files/l10n/tr.json
@@ -27,20 +27,14 @@
     "All files" : "Tüm dosyalar",
     "Favorites" : "Sık kullanılanlar",
     "Home" : "Ev",
+    "Close" : "Kapat",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi",
     "Total file size {size1} exceeds upload limit {size2}" : "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut",
     "Upload cancelled." : "Yükleme iptal edildi.",
     "Could not get result from server." : "Sunucudan sonuç alınamadı.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
-    "{new_name} already exists" : "{new_name} zaten mevcut",
-    "Could not create file" : "Dosya oluşturulamadı",
-    "Could not create folder" : "Klasör oluşturulamadı",
-    "Rename" : "Yeniden adlandır",
-    "Delete" : "Sil",
-    "Disconnect storage" : "Depolama bağlantısını kes",
-    "Unshare" : "Paylaşmayı Kaldır",
-    "No permission to delete" : "Silmeye izin yok",
+    "Actions" : "Eylemler",
     "Download" : "İndir",
     "Select" : "Seç",
     "Pending" : "Bekliyor",
@@ -50,7 +44,10 @@
     "Error moving file." : "Dosya taşıma hatası.",
     "Error moving file" : "Dosya taşıma hatası",
     "Error" : "Hata",
+    "{new_name} already exists" : "{new_name} zaten mevcut",
     "Could not rename file" : "Dosya adlandırılamadı",
+    "Could not create file" : "Dosya oluşturulamadı",
+    "Could not create folder" : "Klasör oluşturulamadı",
     "Error deleting file." : "Dosya silinirken hata.",
     "No entries in this folder match '{filter}'" : "Bu klasörde hiçbir girdi '{filter}' ile eşleşmiyor",
     "Name" : "İsim",
@@ -58,8 +55,10 @@
     "Modified" : "Değiştirilme",
     "_%n folder_::_%n folders_" : ["%n klasör","%n klasör"],
     "_%n file_::_%n files_" : ["%n dosya","%n dosya"],
+    "{dirs} and {files}" : "{dirs} ve {files}",
     "You don’t have permission to upload or create files here" : "Buraya dosya yükleme veya oluşturma izniniz yok",
     "_Uploading %n file_::_Uploading %n files_" : ["%n dosya yükleniyor","%n dosya yükleniyor"],
+    "New" : "Yeni",
     "\"{name}\" is an invalid file name." : "\"{name}\" geçersiz bir dosya adı.",
     "File name cannot be empty." : "Dosya adı boş olamaz.",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} depolama alanı dolu, artık dosyalar güncellenmeyecek yada eşitlenmeyecek.",
@@ -67,9 +66,14 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : " {owner} depolama alanı neredeyse dolu ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "Depolama alanınız neredeyse dolu (%{usedSpacePercent})",
     "_matches '{filter}'_::_match '{filter}'_" : ["'{filter}' ile eşleşiyor","'{filter}' ile eşleşiyor"],
-    "{dirs} and {files}" : "{dirs} ve {files}",
+    "Path" : "Yol",
+    "_%n byte_::_%n bytes_" : ["%n bayt","%n bayt"],
     "Favorited" : "Sık kullanılanlara eklendi",
     "Favorite" : "Sık kullanılan",
+    "Upload" : "Yükle",
+    "Text file" : "Metin dosyası",
+    "Folder" : "Klasör",
+    "New folder" : "Yeni klasör",
     "An error occurred while trying to update the tags" : "Etiketler güncellenmeye çalışılırken bir hata oluştu",
     "A new file or folder has been <strong>created</strong>" : "Yeni bir dosya veya klasör <strong>oluşturuldu</strong>",
     "A file or folder has been <strong>changed</strong>" : "Bir dosya veya klasör <strong>değiştirildi</strong>",
@@ -91,22 +95,18 @@
     "File handling" : "Dosya işlemleri",
     "Maximum upload size" : "Azami yükleme boyutu",
     "max. possible: " : "mümkün olan en fazla: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "PHP-FPM ile bu değerin kaydedildikten sonra etkili olabilmesi için 5 dakika gerekebilir.",
     "Save" : "Kaydet",
     "Can not be edited from here due to insufficient permissions." : "Yetersiz izinler buradan düzenlenemez.",
     "Settings" : "Ayarlar",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın",
-    "New" : "Yeni",
-    "New text file" : "Yeni metin dosyası",
-    "Text file" : "Metin dosyası",
-    "New folder" : "Yeni klasör",
-    "Folder" : "Klasör",
-    "Upload" : "Yükle",
     "Cancel upload" : "Yüklemeyi iptal et",
     "No files in here" : "Burada hiç dosya yok",
     "Upload some content or sync with your devices!" : "Bir şeyler yükleyin veya aygıtlarınızla eşitleyin!",
     "No entries found in this folder" : "Bu klasörde hiçbir girdi bulunamadı",
     "Select all" : "Tümünü seç",
+    "Delete" : "Sil",
     "Upload too large" : "Yükleme çok büyük",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Yüklemeye çalıştığınız dosyalar bu sunucudaki azami yükleme boyutunu aşıyor.",
     "Files are being scanned, please wait." : "Dosyalar taranıyor, lütfen bekleyin.",
diff --git a/apps/files/l10n/ug.js b/apps/files/l10n/ug.js
index 43968c76cb..8d6dabd50d 100644
--- a/apps/files/l10n/ug.js
+++ b/apps/files/l10n/ug.js
@@ -11,28 +11,28 @@ OC.L10N.register(
     "Files" : "ھۆججەتلەر",
     "Favorites" : "يىغقۇچ",
     "Home" : "ئۆي",
+    "Close" : "ياپ",
     "Upload cancelled." : "يۈكلەشتىن ۋاز كەچتى.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
-    "{new_name} already exists" : "{new_name} مەۋجۇت",
-    "Rename" : "ئات ئۆزگەرت",
-    "Delete" : "ئۆچۈر",
-    "Unshare" : "ھەمبەھىرلىمە",
+    "Actions" : "مەشغۇلاتلار",
     "Download" : "چۈشۈر",
     "Pending" : "كۈتۈۋاتىدۇ",
     "Error" : "خاتالىق",
+    "{new_name} already exists" : "{new_name} مەۋجۇت",
     "Name" : "ئاتى",
     "Size" : "چوڭلۇقى",
     "Modified" : "ئۆزگەرتكەن",
+    "New" : "يېڭى",
     "Favorite" : "يىغقۇچ",
+    "Upload" : "يۈكلە",
+    "Text file" : "تېكىست ھۆججەت",
+    "Folder" : "قىسقۇچ",
+    "New folder" : "يېڭى قىسقۇچ",
     "Save" : "ساقلا",
     "Settings" : "تەڭشەكلەر",
     "WebDAV" : "WebDAV",
-    "New" : "يېڭى",
-    "Text file" : "تېكىست ھۆججەت",
-    "New folder" : "يېڭى قىسقۇچ",
-    "Folder" : "قىسقۇچ",
-    "Upload" : "يۈكلە",
     "Cancel upload" : "يۈكلەشتىن ۋاز كەچ",
+    "Delete" : "ئۆچۈر",
     "Upload too large" : "يۈكلەندىغىنى بەك چوڭ"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files/l10n/ug.json b/apps/files/l10n/ug.json
index 6d11a28e90..86bd8391af 100644
--- a/apps/files/l10n/ug.json
+++ b/apps/files/l10n/ug.json
@@ -9,28 +9,28 @@
     "Files" : "ھۆججەتلەر",
     "Favorites" : "يىغقۇچ",
     "Home" : "ئۆي",
+    "Close" : "ياپ",
     "Upload cancelled." : "يۈكلەشتىن ۋاز كەچتى.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
-    "{new_name} already exists" : "{new_name} مەۋجۇت",
-    "Rename" : "ئات ئۆزگەرت",
-    "Delete" : "ئۆچۈر",
-    "Unshare" : "ھەمبەھىرلىمە",
+    "Actions" : "مەشغۇلاتلار",
     "Download" : "چۈشۈر",
     "Pending" : "كۈتۈۋاتىدۇ",
     "Error" : "خاتالىق",
+    "{new_name} already exists" : "{new_name} مەۋجۇت",
     "Name" : "ئاتى",
     "Size" : "چوڭلۇقى",
     "Modified" : "ئۆزگەرتكەن",
+    "New" : "يېڭى",
     "Favorite" : "يىغقۇچ",
+    "Upload" : "يۈكلە",
+    "Text file" : "تېكىست ھۆججەت",
+    "Folder" : "قىسقۇچ",
+    "New folder" : "يېڭى قىسقۇچ",
     "Save" : "ساقلا",
     "Settings" : "تەڭشەكلەر",
     "WebDAV" : "WebDAV",
-    "New" : "يېڭى",
-    "Text file" : "تېكىست ھۆججەت",
-    "New folder" : "يېڭى قىسقۇچ",
-    "Folder" : "قىسقۇچ",
-    "Upload" : "يۈكلە",
     "Cancel upload" : "يۈكلەشتىن ۋاز كەچ",
+    "Delete" : "ئۆچۈر",
     "Upload too large" : "يۈكلەندىغىنى بەك چوڭ"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js
index 167897b57e..a06cc2f3d7 100644
--- a/apps/files/l10n/uk.js
+++ b/apps/files/l10n/uk.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "Усі файли",
     "Favorites" : "Улюблені",
     "Home" : "Домашня адреса",
+    "Close" : "Закрити",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неможливо вивантажити {filename}, оскільки це каталог або файл має розмір 0 байт.",
     "Total file size {size1} exceeds upload limit {size2}" : "Розмір файлу {size1} перевищує обмеження {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостатньо вільного місця, ви вивантажуєте {size1}, а залишилося лише {size2}",
     "Upload cancelled." : "Вивантаження скасовано.",
     "Could not get result from server." : "Не вдалося отримати результат від сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується вивантаження файлу. Закриття цієї сторінки приведе до скасування вивантаження.",
-    "{new_name} already exists" : "{new_name} вже існує",
-    "Could not create file" : "Не вдалося створити файл",
-    "Could not create folder" : "Не вдалося створити теку",
-    "Rename" : "Перейменувати",
-    "Delete" : "Видалити",
-    "Disconnect storage" : "Від’єднати сховище",
-    "Unshare" : "Закрити спільний доступ",
-    "No permission to delete" : "Недостатньо прав для видалення",
+    "Actions" : "Дії",
     "Download" : "Завантажити",
     "Select" : "Оберіть",
     "Pending" : "Очікування",
@@ -51,7 +45,10 @@ OC.L10N.register(
     "Error moving file." : "Помилка переміщення файлу.",
     "Error moving file" : "Помилка переміщення файлу",
     "Error" : "Помилка",
+    "{new_name} already exists" : "{new_name} вже існує",
     "Could not rename file" : "Неможливо перейменувати файл",
+    "Could not create file" : "Не вдалося створити файл",
+    "Could not create folder" : "Не вдалося створити теку",
     "Error deleting file." : "Помилка видалення файлу.",
     "No entries in this folder match '{filter}'" : "Нічого не знайдено в цій теці  '{filter}'",
     "Name" : "Ім'я",
@@ -59,16 +56,21 @@ OC.L10N.register(
     "Modified" : "Змінено",
     "_%n folder_::_%n folders_" : ["%n тека ","теки : %n ","теки : %n "],
     "_%n file_::_%n files_" : ["%n файл ","файли : %n ","файли : %n "],
+    "{dirs} and {files}" : "{dirs} і {files}",
     "You don’t have permission to upload or create files here" : "У вас недостатньо прав для вивантаження або створення тут файлів",
     "_Uploading %n file_::_Uploading %n files_" : ["Вивантаження %n файлу","Вивантаження %n файлів","Вивантаження %n файлів"],
+    "New" : "Створити",
     "\"{name}\" is an invalid file name." : "\"{name}\" - некоректне ім'я файлу.",
     "File name cannot be empty." : " Ім'я файлу не може бути порожнім.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше сховище майже повне ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["знайдено '{filter}'","знайдено '{filter}'","знайдено '{filter}'"],
-    "{dirs} and {files}" : "{dirs} і {files}",
     "Favorited" : "Улюблений",
     "Favorite" : "Улюблений",
+    "Upload" : "Вивантажити",
+    "Text file" : "Текстовий файл",
+    "Folder" : "Тека",
+    "New folder" : "Нова тека",
     "An error occurred while trying to update the tags" : "Виникла помилка при спробі оновити мітки",
     "A new file or folder has been <strong>created</strong>" : "Новий файл або теку було <strong>створено</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл або теку було <strong> змінено </strong>",
@@ -95,17 +97,12 @@ OC.L10N.register(
     "Settings" : "Налаштування",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Для доступу до файлів через WebDAV використовуйте <a href=\"%s\" target=\"_blank\">це посилання</a>",
-    "New" : "Створити",
-    "New text file" : "Новий текстовий файл",
-    "Text file" : "Текстовий файл",
-    "New folder" : "Нова тека",
-    "Folder" : "Тека",
-    "Upload" : "Вивантажити",
     "Cancel upload" : "Скасувати вивантаження",
     "No files in here" : "Тут немає файлів",
     "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!",
     "No entries found in this folder" : "В цій теці нічого немає",
     "Select all" : "Вибрати всі",
+    "Delete" : "Видалити",
     "Upload too large" : "Файл занадто великий",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файли,що ви намагаєтесь вивантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
     "Files are being scanned, please wait." : "Файли перевіряються, зачекайте, будь-ласка.",
diff --git a/apps/files/l10n/uk.json b/apps/files/l10n/uk.json
index 803d988762..964ada95de 100644
--- a/apps/files/l10n/uk.json
+++ b/apps/files/l10n/uk.json
@@ -27,20 +27,14 @@
     "All files" : "Усі файли",
     "Favorites" : "Улюблені",
     "Home" : "Домашня адреса",
+    "Close" : "Закрити",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неможливо вивантажити {filename}, оскільки це каталог або файл має розмір 0 байт.",
     "Total file size {size1} exceeds upload limit {size2}" : "Розмір файлу {size1} перевищує обмеження {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостатньо вільного місця, ви вивантажуєте {size1}, а залишилося лише {size2}",
     "Upload cancelled." : "Вивантаження скасовано.",
     "Could not get result from server." : "Не вдалося отримати результат від сервера.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується вивантаження файлу. Закриття цієї сторінки приведе до скасування вивантаження.",
-    "{new_name} already exists" : "{new_name} вже існує",
-    "Could not create file" : "Не вдалося створити файл",
-    "Could not create folder" : "Не вдалося створити теку",
-    "Rename" : "Перейменувати",
-    "Delete" : "Видалити",
-    "Disconnect storage" : "Від’єднати сховище",
-    "Unshare" : "Закрити спільний доступ",
-    "No permission to delete" : "Недостатньо прав для видалення",
+    "Actions" : "Дії",
     "Download" : "Завантажити",
     "Select" : "Оберіть",
     "Pending" : "Очікування",
@@ -49,7 +43,10 @@
     "Error moving file." : "Помилка переміщення файлу.",
     "Error moving file" : "Помилка переміщення файлу",
     "Error" : "Помилка",
+    "{new_name} already exists" : "{new_name} вже існує",
     "Could not rename file" : "Неможливо перейменувати файл",
+    "Could not create file" : "Не вдалося створити файл",
+    "Could not create folder" : "Не вдалося створити теку",
     "Error deleting file." : "Помилка видалення файлу.",
     "No entries in this folder match '{filter}'" : "Нічого не знайдено в цій теці  '{filter}'",
     "Name" : "Ім'я",
@@ -57,16 +54,21 @@
     "Modified" : "Змінено",
     "_%n folder_::_%n folders_" : ["%n тека ","теки : %n ","теки : %n "],
     "_%n file_::_%n files_" : ["%n файл ","файли : %n ","файли : %n "],
+    "{dirs} and {files}" : "{dirs} і {files}",
     "You don’t have permission to upload or create files here" : "У вас недостатньо прав для вивантаження або створення тут файлів",
     "_Uploading %n file_::_Uploading %n files_" : ["Вивантаження %n файлу","Вивантаження %n файлів","Вивантаження %n файлів"],
+    "New" : "Створити",
     "\"{name}\" is an invalid file name." : "\"{name}\" - некоректне ім'я файлу.",
     "File name cannot be empty." : " Ім'я файлу не може бути порожнім.",
     "Your storage is full, files can not be updated or synced anymore!" : "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
     "Your storage is almost full ({usedSpacePercent}%)" : "Ваше сховище майже повне ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["знайдено '{filter}'","знайдено '{filter}'","знайдено '{filter}'"],
-    "{dirs} and {files}" : "{dirs} і {files}",
     "Favorited" : "Улюблений",
     "Favorite" : "Улюблений",
+    "Upload" : "Вивантажити",
+    "Text file" : "Текстовий файл",
+    "Folder" : "Тека",
+    "New folder" : "Нова тека",
     "An error occurred while trying to update the tags" : "Виникла помилка при спробі оновити мітки",
     "A new file or folder has been <strong>created</strong>" : "Новий файл або теку було <strong>створено</strong>",
     "A file or folder has been <strong>changed</strong>" : "Файл або теку було <strong> змінено </strong>",
@@ -93,17 +95,12 @@
     "Settings" : "Налаштування",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Для доступу до файлів через WebDAV використовуйте <a href=\"%s\" target=\"_blank\">це посилання</a>",
-    "New" : "Створити",
-    "New text file" : "Новий текстовий файл",
-    "Text file" : "Текстовий файл",
-    "New folder" : "Нова тека",
-    "Folder" : "Тека",
-    "Upload" : "Вивантажити",
     "Cancel upload" : "Скасувати вивантаження",
     "No files in here" : "Тут немає файлів",
     "Upload some content or sync with your devices!" : "Вивантажте щось або синхронізуйте з пристроями!",
     "No entries found in this folder" : "В цій теці нічого немає",
     "Select all" : "Вибрати всі",
+    "Delete" : "Видалити",
     "Upload too large" : "Файл занадто великий",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файли,що ви намагаєтесь вивантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
     "Files are being scanned, please wait." : "Файли перевіряються, зачекайте, будь-ласка.",
diff --git a/apps/files/l10n/ur.js b/apps/files/l10n/ur.js
deleted file mode 100644
index 87ed21fd6c..0000000000
--- a/apps/files/l10n/ur.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Error" : "خرابی"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ur.json b/apps/files/l10n/ur.json
deleted file mode 100644
index 1c1fc3d16c..0000000000
--- a/apps/files/l10n/ur.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files/l10n/ur_PK.js b/apps/files/l10n/ur_PK.js
index c9550fe93f..d5e85bfe35 100644
--- a/apps/files/l10n/ur_PK.js
+++ b/apps/files/l10n/ur_PK.js
@@ -2,12 +2,12 @@ OC.L10N.register(
     "files",
     {
     "Unknown error" : "غیر معروف خرابی",
-    "Delete" : "حذف کریں",
-    "Unshare" : "شئیرنگ ختم کریں",
+    "Close" : "بند ",
     "Download" : "ڈاؤن لوڈ،",
     "Error" : "ایرر",
     "Name" : "اسم",
     "Save" : "حفظ",
-    "Settings" : "ترتیبات"
+    "Settings" : "ترتیبات",
+    "Delete" : "حذف کریں"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ur_PK.json b/apps/files/l10n/ur_PK.json
index 3b4146d6cf..3da48310df 100644
--- a/apps/files/l10n/ur_PK.json
+++ b/apps/files/l10n/ur_PK.json
@@ -1,11 +1,11 @@
 { "translations": {
     "Unknown error" : "غیر معروف خرابی",
-    "Delete" : "حذف کریں",
-    "Unshare" : "شئیرنگ ختم کریں",
+    "Close" : "بند ",
     "Download" : "ڈاؤن لوڈ،",
     "Error" : "ایرر",
     "Name" : "اسم",
     "Save" : "حفظ",
-    "Settings" : "ترتیبات"
+    "Settings" : "ترتیبات",
+    "Delete" : "حذف کریں"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/vi.js b/apps/files/l10n/vi.js
index c724f5f73e..5e83c36abe 100644
--- a/apps/files/l10n/vi.js
+++ b/apps/files/l10n/vi.js
@@ -26,35 +26,39 @@ OC.L10N.register(
     "Files" : "Tập tin",
     "Favorites" : "Ưa thích",
     "Home" : "Nhà",
+    "Close" : "Đóng",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte",
     "Upload cancelled." : "Hủy tải lên",
     "Could not get result from server." : "Không thể nhận được kết quả từ máy chủ.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
-    "{new_name} already exists" : "{new_name} đã tồn tại",
-    "Could not create file" : "Không thể tạo file",
-    "Could not create folder" : "Không thể tạo thư mục",
-    "Rename" : "Sửa tên",
-    "Delete" : "Xóa",
-    "Unshare" : "Bỏ chia sẻ",
+    "Actions" : "Actions",
     "Download" : "Tải về",
     "Select" : "Chọn",
     "Pending" : "Đang chờ",
     "Error moving file" : "Lỗi di chuyển tập tin",
     "Error" : "Lỗi",
+    "{new_name} already exists" : "{new_name} đã tồn tại",
     "Could not rename file" : "Không thể đổi tên file",
+    "Could not create file" : "Không thể tạo file",
+    "Could not create folder" : "Không thể tạo thư mục",
     "Error deleting file." : "Lỗi xóa file,",
     "Name" : "Tên",
     "Size" : "Kích cỡ",
     "Modified" : "Thay đổi",
     "_%n folder_::_%n folders_" : ["%n thư mục"],
     "_%n file_::_%n files_" : ["%n tập tin"],
+    "{dirs} and {files}" : "{dirs} và {files}",
     "You don’t have permission to upload or create files here" : "Bạn không có quyền upload hoặc tạo files ở đây",
     "_Uploading %n file_::_Uploading %n files_" : ["Đang tải lên %n tập tin"],
+    "New" : "Tạo mới",
     "File name cannot be empty." : "Tên file không được rỗng",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Your storage is almost full ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} và {files}",
     "Favorite" : "Ưu thích",
+    "Upload" : "Tải lên",
+    "Text file" : "Tập tin văn bản",
+    "Folder" : "Thư mục",
+    "New folder" : "Tạo thư mục",
     "%s could not be renamed" : "%s không thể đổi tên",
     "File handling" : "Xử lý tập tin",
     "Maximum upload size" : "Kích thước tối đa ",
@@ -62,15 +66,10 @@ OC.L10N.register(
     "Save" : "Lưu",
     "Settings" : "Cài đặt",
     "WebDAV" : "WebDAV",
-    "New" : "Tạo mới",
-    "New text file" : "File text mới",
-    "Text file" : "Tập tin văn bản",
-    "New folder" : "Tạo thư mục",
-    "Folder" : "Thư mục",
-    "Upload" : "Tải lên",
     "Cancel upload" : "Hủy upload",
     "No entries found in this folder" : "Chưa có mục nào trong thư mục",
     "Select all" : "Chọn tất cả",
+    "Delete" : "Xóa",
     "Upload too large" : "Tập tin tải lên quá lớn",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
     "Files are being scanned, please wait." : "Tập tin đang được quét ,vui lòng chờ."
diff --git a/apps/files/l10n/vi.json b/apps/files/l10n/vi.json
index 5a4519cf84..285c0e3924 100644
--- a/apps/files/l10n/vi.json
+++ b/apps/files/l10n/vi.json
@@ -24,35 +24,39 @@
     "Files" : "Tập tin",
     "Favorites" : "Ưa thích",
     "Home" : "Nhà",
+    "Close" : "Đóng",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte",
     "Upload cancelled." : "Hủy tải lên",
     "Could not get result from server." : "Không thể nhận được kết quả từ máy chủ.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
-    "{new_name} already exists" : "{new_name} đã tồn tại",
-    "Could not create file" : "Không thể tạo file",
-    "Could not create folder" : "Không thể tạo thư mục",
-    "Rename" : "Sửa tên",
-    "Delete" : "Xóa",
-    "Unshare" : "Bỏ chia sẻ",
+    "Actions" : "Actions",
     "Download" : "Tải về",
     "Select" : "Chọn",
     "Pending" : "Đang chờ",
     "Error moving file" : "Lỗi di chuyển tập tin",
     "Error" : "Lỗi",
+    "{new_name} already exists" : "{new_name} đã tồn tại",
     "Could not rename file" : "Không thể đổi tên file",
+    "Could not create file" : "Không thể tạo file",
+    "Could not create folder" : "Không thể tạo thư mục",
     "Error deleting file." : "Lỗi xóa file,",
     "Name" : "Tên",
     "Size" : "Kích cỡ",
     "Modified" : "Thay đổi",
     "_%n folder_::_%n folders_" : ["%n thư mục"],
     "_%n file_::_%n files_" : ["%n tập tin"],
+    "{dirs} and {files}" : "{dirs} và {files}",
     "You don’t have permission to upload or create files here" : "Bạn không có quyền upload hoặc tạo files ở đây",
     "_Uploading %n file_::_Uploading %n files_" : ["Đang tải lên %n tập tin"],
+    "New" : "Tạo mới",
     "File name cannot be empty." : "Tên file không được rỗng",
     "Your storage is full, files can not be updated or synced anymore!" : "Your storage is full, files can not be updated or synced anymore!",
     "Your storage is almost full ({usedSpacePercent}%)" : "Your storage is almost full ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} và {files}",
     "Favorite" : "Ưu thích",
+    "Upload" : "Tải lên",
+    "Text file" : "Tập tin văn bản",
+    "Folder" : "Thư mục",
+    "New folder" : "Tạo thư mục",
     "%s could not be renamed" : "%s không thể đổi tên",
     "File handling" : "Xử lý tập tin",
     "Maximum upload size" : "Kích thước tối đa ",
@@ -60,15 +64,10 @@
     "Save" : "Lưu",
     "Settings" : "Cài đặt",
     "WebDAV" : "WebDAV",
-    "New" : "Tạo mới",
-    "New text file" : "File text mới",
-    "Text file" : "Tập tin văn bản",
-    "New folder" : "Tạo thư mục",
-    "Folder" : "Thư mục",
-    "Upload" : "Tải lên",
     "Cancel upload" : "Hủy upload",
     "No entries found in this folder" : "Chưa có mục nào trong thư mục",
     "Select all" : "Chọn tất cả",
+    "Delete" : "Xóa",
     "Upload too large" : "Tập tin tải lên quá lớn",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
     "Files are being scanned, please wait." : "Tập tin đang được quét ,vui lòng chờ."
diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
index 76cbe4110a..84b31368a1 100644
--- a/apps/files/l10n/zh_CN.js
+++ b/apps/files/l10n/zh_CN.js
@@ -29,20 +29,14 @@ OC.L10N.register(
     "All files" : "全部文件",
     "Favorites" : "收藏",
     "Home" : "家庭",
+    "Close" : "关闭",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "不能上传文件 {filename} ，由于它是一个目录或者为0字节",
     "Total file size {size1} exceeds upload limit {size2}" : "总文件大小 {size1} 超过上传限制 {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "没有足够的可用空间，您正在上传 {size1} 的文件但是只有 {size2} 可用。",
     "Upload cancelled." : "上传已取消",
     "Could not get result from server." : "不能从服务器得到结果",
     "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。",
-    "{new_name} already exists" : "{new_name} 已存在",
-    "Could not create file" : "不能创建文件",
-    "Could not create folder" : "不能创建文件夹",
-    "Rename" : "重命名",
-    "Delete" : "删除",
-    "Disconnect storage" : "断开储存连接",
-    "Unshare" : "取消共享",
-    "No permission to delete" : "无权删除",
+    "Actions" : "动作",
     "Download" : "下载",
     "Select" : "选择",
     "Pending" : "等待",
@@ -52,7 +46,10 @@ OC.L10N.register(
     "Error moving file." : "移动文件出错。",
     "Error moving file" : "移动文件错误",
     "Error" : "错误",
+    "{new_name} already exists" : "{new_name} 已存在",
     "Could not rename file" : "不能重命名文件",
+    "Could not create file" : "不能创建文件",
+    "Could not create folder" : "不能创建文件夹",
     "Error deleting file." : "删除文件出错。",
     "No entries in this folder match '{filter}'" : "此文件夹中无项目匹配“{filter}”",
     "Name" : "名称",
@@ -60,8 +57,10 @@ OC.L10N.register(
     "Modified" : "修改日期",
     "_%n folder_::_%n folders_" : ["%n 文件夹"],
     "_%n file_::_%n files_" : ["%n个文件"],
+    "{dirs} and {files}" : "{dirs} 和 {files}",
     "You don’t have permission to upload or create files here" : "您没有权限来上传湖州哦和创建文件",
     "_Uploading %n file_::_Uploading %n files_" : ["上传 %n 个文件"],
+    "New" : "新建",
     "\"{name}\" is an invalid file name." : "“{name}”是一个无效的文件名。",
     "File name cannot be empty." : "文件名不能为空。",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的存储空间已满，文件将无法更新或同步！",
@@ -69,9 +68,14 @@ OC.L10N.register(
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} 的存储空间即将用完 ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的存储空间即将用完 ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["匹配“{filter}”"],
-    "{dirs} and {files}" : "{dirs} 和 {files}",
+    "Path" : "路径",
+    "_%n byte_::_%n bytes_" : ["%n 字节"],
     "Favorited" : "已收藏",
     "Favorite" : "收藏",
+    "Upload" : "上传",
+    "Text file" : "文本文件",
+    "Folder" : "文件夹",
+    "New folder" : "增加文件夹",
     "An error occurred while trying to update the tags" : "更新标签时出错",
     "A new file or folder has been <strong>created</strong>" : "一个新的文件或文件夹已被<strong>创建</strong>",
     "A file or folder has been <strong>changed</strong>" : "一个文件或文件夹已被<strong>修改</strong>",
@@ -93,22 +97,18 @@ OC.L10N.register(
     "File handling" : "文件处理",
     "Maximum upload size" : "最大上传大小",
     "max. possible: " : "最大允许: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "对于 PHP-FPM 这个值保存后可能需要长达5分钟才会生效。",
     "Save" : "保存",
     "Can not be edited from here due to insufficient permissions." : "由于权限不足无法在此编辑。",
     "Settings" : "设置",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "使用这个地址 <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>",
-    "New" : "新建",
-    "New text file" : "创建文本文件",
-    "Text file" : "文本文件",
-    "New folder" : "增加文件夹",
-    "Folder" : "文件夹",
-    "Upload" : "上传",
     "Cancel upload" : "取消上传",
     "No files in here" : "无文件",
     "Upload some content or sync with your devices!" : "上传一些内容或者与设备同步!",
     "No entries found in this folder" : "此文件夹中无项目",
     "Select all" : "全部选择",
+    "Delete" : "删除",
     "Upload too large" : "上传文件过大",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
     "Files are being scanned, please wait." : "文件正在被扫描，请稍候。",
diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
index 44e763a42f..4d9a3737a9 100644
--- a/apps/files/l10n/zh_CN.json
+++ b/apps/files/l10n/zh_CN.json
@@ -27,20 +27,14 @@
     "All files" : "全部文件",
     "Favorites" : "收藏",
     "Home" : "家庭",
+    "Close" : "关闭",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "不能上传文件 {filename} ，由于它是一个目录或者为0字节",
     "Total file size {size1} exceeds upload limit {size2}" : "总文件大小 {size1} 超过上传限制 {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "没有足够的可用空间，您正在上传 {size1} 的文件但是只有 {size2} 可用。",
     "Upload cancelled." : "上传已取消",
     "Could not get result from server." : "不能从服务器得到结果",
     "File upload is in progress. Leaving the page now will cancel the upload." : "文件正在上传中。现在离开此页会导致上传动作被取消。",
-    "{new_name} already exists" : "{new_name} 已存在",
-    "Could not create file" : "不能创建文件",
-    "Could not create folder" : "不能创建文件夹",
-    "Rename" : "重命名",
-    "Delete" : "删除",
-    "Disconnect storage" : "断开储存连接",
-    "Unshare" : "取消共享",
-    "No permission to delete" : "无权删除",
+    "Actions" : "动作",
     "Download" : "下载",
     "Select" : "选择",
     "Pending" : "等待",
@@ -50,7 +44,10 @@
     "Error moving file." : "移动文件出错。",
     "Error moving file" : "移动文件错误",
     "Error" : "错误",
+    "{new_name} already exists" : "{new_name} 已存在",
     "Could not rename file" : "不能重命名文件",
+    "Could not create file" : "不能创建文件",
+    "Could not create folder" : "不能创建文件夹",
     "Error deleting file." : "删除文件出错。",
     "No entries in this folder match '{filter}'" : "此文件夹中无项目匹配“{filter}”",
     "Name" : "名称",
@@ -58,8 +55,10 @@
     "Modified" : "修改日期",
     "_%n folder_::_%n folders_" : ["%n 文件夹"],
     "_%n file_::_%n files_" : ["%n个文件"],
+    "{dirs} and {files}" : "{dirs} 和 {files}",
     "You don’t have permission to upload or create files here" : "您没有权限来上传湖州哦和创建文件",
     "_Uploading %n file_::_Uploading %n files_" : ["上传 %n 个文件"],
+    "New" : "新建",
     "\"{name}\" is an invalid file name." : "“{name}”是一个无效的文件名。",
     "File name cannot be empty." : "文件名不能为空。",
     "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的存储空间已满，文件将无法更新或同步！",
@@ -67,9 +66,14 @@
     "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} 的存储空间即将用完 ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的存储空间即将用完 ({usedSpacePercent}%)",
     "_matches '{filter}'_::_match '{filter}'_" : ["匹配“{filter}”"],
-    "{dirs} and {files}" : "{dirs} 和 {files}",
+    "Path" : "路径",
+    "_%n byte_::_%n bytes_" : ["%n 字节"],
     "Favorited" : "已收藏",
     "Favorite" : "收藏",
+    "Upload" : "上传",
+    "Text file" : "文本文件",
+    "Folder" : "文件夹",
+    "New folder" : "增加文件夹",
     "An error occurred while trying to update the tags" : "更新标签时出错",
     "A new file or folder has been <strong>created</strong>" : "一个新的文件或文件夹已被<strong>创建</strong>",
     "A file or folder has been <strong>changed</strong>" : "一个文件或文件夹已被<strong>修改</strong>",
@@ -91,22 +95,18 @@
     "File handling" : "文件处理",
     "Maximum upload size" : "最大上传大小",
     "max. possible: " : "最大允许: ",
+    "With PHP-FPM this value may take up to 5 minutes to take effect after saving." : "对于 PHP-FPM 这个值保存后可能需要长达5分钟才会生效。",
     "Save" : "保存",
     "Can not be edited from here due to insufficient permissions." : "由于权限不足无法在此编辑。",
     "Settings" : "设置",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "使用这个地址 <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>",
-    "New" : "新建",
-    "New text file" : "创建文本文件",
-    "Text file" : "文本文件",
-    "New folder" : "增加文件夹",
-    "Folder" : "文件夹",
-    "Upload" : "上传",
     "Cancel upload" : "取消上传",
     "No files in here" : "无文件",
     "Upload some content or sync with your devices!" : "上传一些内容或者与设备同步!",
     "No entries found in this folder" : "此文件夹中无项目",
     "Select all" : "全部选择",
+    "Delete" : "删除",
     "Upload too large" : "上传文件过大",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
     "Files are being scanned, please wait." : "文件正在被扫描，请稍候。",
diff --git a/apps/files/l10n/zh_HK.js b/apps/files/l10n/zh_HK.js
index 2c1f5a992e..94f4397f23 100644
--- a/apps/files/l10n/zh_HK.js
+++ b/apps/files/l10n/zh_HK.js
@@ -5,14 +5,16 @@ OC.L10N.register(
     "Files" : "文件",
     "All files" : "所有文件",
     "Home" : "主頁",
-    "Rename" : "重新命名",
-    "Delete" : "刪除",
-    "Unshare" : "取消分享",
+    "Close" : "關閉",
     "Download" : "下載",
     "Error" : "錯誤",
     "Name" : "名稱",
     "Size" : "大小",
     "{dirs} and {files}" : "{dirs} 和 {files}",
+    "New" : "新增",
+    "Upload" : "上戴",
+    "Folder" : "資料夾",
+    "New folder" : "新資料夾",
     "A new file or folder has been <strong>created</strong>" : "新檔案或資料夾已被 <strong> 新增 </strong>",
     "A file or folder has been <strong>changed</strong>" : "檔案或資料夾已被 <strong> 變成 </strong>",
     "A file or folder has been <strong>deleted</strong>" : "新檔案或資料夾已被 <strong> 刪除 </strong>",
@@ -25,10 +27,7 @@ OC.L10N.register(
     "Save" : "儲存",
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
-    "New" : "新增",
-    "New folder" : "新資料夾",
-    "Folder" : "資料夾",
-    "Upload" : "上戴",
-    "Cancel upload" : "取消上戴"
+    "Cancel upload" : "取消上戴",
+    "Delete" : "刪除"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files/l10n/zh_HK.json b/apps/files/l10n/zh_HK.json
index 6dfd9b8573..63716aca55 100644
--- a/apps/files/l10n/zh_HK.json
+++ b/apps/files/l10n/zh_HK.json
@@ -3,14 +3,16 @@
     "Files" : "文件",
     "All files" : "所有文件",
     "Home" : "主頁",
-    "Rename" : "重新命名",
-    "Delete" : "刪除",
-    "Unshare" : "取消分享",
+    "Close" : "關閉",
     "Download" : "下載",
     "Error" : "錯誤",
     "Name" : "名稱",
     "Size" : "大小",
     "{dirs} and {files}" : "{dirs} 和 {files}",
+    "New" : "新增",
+    "Upload" : "上戴",
+    "Folder" : "資料夾",
+    "New folder" : "新資料夾",
     "A new file or folder has been <strong>created</strong>" : "新檔案或資料夾已被 <strong> 新增 </strong>",
     "A file or folder has been <strong>changed</strong>" : "檔案或資料夾已被 <strong> 變成 </strong>",
     "A file or folder has been <strong>deleted</strong>" : "新檔案或資料夾已被 <strong> 刪除 </strong>",
@@ -23,10 +25,7 @@
     "Save" : "儲存",
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
-    "New" : "新增",
-    "New folder" : "新資料夾",
-    "Folder" : "資料夾",
-    "Upload" : "上戴",
-    "Cancel upload" : "取消上戴"
+    "Cancel upload" : "取消上戴",
+    "Delete" : "刪除"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js
index 194020ef9b..7c013533e2 100644
--- a/apps/files/l10n/zh_TW.js
+++ b/apps/files/l10n/zh_TW.js
@@ -29,40 +29,52 @@ OC.L10N.register(
     "All files" : "所有檔案",
     "Favorites" : "最愛",
     "Home" : "住宅",
+    "Close" : " 關閉",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "因為 {filename} 是個目錄或是大小為零，所以無法上傳",
     "Total file size {size1} exceeds upload limit {size2}" : "檔案大小總和 {size1} 超過上傳限制 {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空間不足，你正要上傳 {size1} 可是只剩下 {size2}",
     "Upload cancelled." : "上傳已取消",
     "Could not get result from server." : "無法從伺服器取回結果",
     "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳。",
-    "{new_name} already exists" : "{new_name} 已經存在",
-    "Could not create file" : "無法建立檔案",
-    "Could not create folder" : "無法建立資料夾",
-    "Rename" : "重新命名",
-    "Delete" : "刪除",
-    "Disconnect storage" : "斷開儲存空間連接",
-    "Unshare" : "取消分享",
+    "Actions" : "動作",
     "Download" : "下載",
     "Select" : "選擇",
     "Pending" : "等候中",
+    "Unable to determine date" : "無法確定日期",
+    "This operation is forbidden" : "此動作被禁止",
     "Error moving file." : "移動檔案發生錯誤",
     "Error moving file" : "移動檔案失敗",
     "Error" : "錯誤",
+    "{new_name} already exists" : "{new_name} 已經存在",
     "Could not rename file" : "無法重新命名",
+    "Could not create file" : "無法建立檔案",
+    "Could not create folder" : "無法建立資料夾",
     "Error deleting file." : "刪除檔案發生錯誤",
+    "No entries in this folder match '{filter}'" : "在此資料夾中沒有項目與 '{filter}' 相符",
     "Name" : "名稱",
     "Size" : "大小",
     "Modified" : "修改時間",
     "_%n folder_::_%n folders_" : ["%n 個資料夾"],
     "_%n file_::_%n files_" : ["%n 個檔案"],
+    "{dirs} and {files}" : "{dirs} 和 {files}",
     "You don’t have permission to upload or create files here" : "您沒有權限在這裡上傳或建立檔案",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 個檔案正在上傳"],
+    "New" : "新增",
     "\"{name}\" is an invalid file name." : "{name} 是無效的檔名",
     "File name cannot be empty." : "檔名不能為空",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的儲存空間已滿，沒有辦法再更新或是同步檔案！",
     "Your storage is full, files can not be updated or synced anymore!" : "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} 的儲存空間快要滿了 ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的儲存空間快要滿了 ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} 和 {files}",
+    "Path" : "路徑",
+    "_%n byte_::_%n bytes_" : ["%n 位元組"],
+    "Favorited" : "已加入最愛",
     "Favorite" : "我的最愛",
+    "Upload" : "上傳",
+    "Text file" : "文字檔",
+    "Folder" : "資料夾",
+    "New folder" : "新資料夾",
+    "An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
     "A new file or folder has been <strong>created</strong>" : "新的檔案或目錄已被 <strong>建立</strong>",
     "A file or folder has been <strong>changed</strong>" : "檔案或目錄已被 <strong>變更</strong>",
     "A file or folder has been <strong>deleted</strong>" : "檔案或目錄已被 <strong>刪除</strong>",
@@ -86,16 +98,17 @@ OC.L10N.register(
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "使用這個地址<a href=\"%s\" target=\"_blank\">來透過 WebDAV 存取檔案</a>",
-    "New" : "新增",
-    "New text file" : "新文字檔",
-    "Text file" : "文字檔",
-    "New folder" : "新資料夾",
-    "Folder" : "資料夾",
-    "Upload" : "上傳",
     "Cancel upload" : "取消上傳",
+    "No files in here" : "沒有任何檔案",
+    "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容",
+    "No entries found in this folder" : "在此資料夾中沒有任何項目",
+    "Select all" : "全選",
+    "Delete" : "刪除",
     "Upload too large" : "上傳過大",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您試圖上傳的檔案大小超過伺服器的限制。",
     "Files are being scanned, please wait." : "正在掃描檔案，請稍等。",
-    "Currently scanning" : "正在掃描"
+    "Currently scanning" : "正在掃描",
+    "No favorites" : "沒有最愛",
+    "Files and folders you mark as favorite will show up here" : "您標記為最愛的檔案與資料夾將會顯示在這裡"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json
index 1a0b187498..9d1aec9e4f 100644
--- a/apps/files/l10n/zh_TW.json
+++ b/apps/files/l10n/zh_TW.json
@@ -27,40 +27,52 @@
     "All files" : "所有檔案",
     "Favorites" : "最愛",
     "Home" : "住宅",
+    "Close" : " 關閉",
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "因為 {filename} 是個目錄或是大小為零，所以無法上傳",
     "Total file size {size1} exceeds upload limit {size2}" : "檔案大小總和 {size1} 超過上傳限制 {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空間不足，你正要上傳 {size1} 可是只剩下 {size2}",
     "Upload cancelled." : "上傳已取消",
     "Could not get result from server." : "無法從伺服器取回結果",
     "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳。",
-    "{new_name} already exists" : "{new_name} 已經存在",
-    "Could not create file" : "無法建立檔案",
-    "Could not create folder" : "無法建立資料夾",
-    "Rename" : "重新命名",
-    "Delete" : "刪除",
-    "Disconnect storage" : "斷開儲存空間連接",
-    "Unshare" : "取消分享",
+    "Actions" : "動作",
     "Download" : "下載",
     "Select" : "選擇",
     "Pending" : "等候中",
+    "Unable to determine date" : "無法確定日期",
+    "This operation is forbidden" : "此動作被禁止",
     "Error moving file." : "移動檔案發生錯誤",
     "Error moving file" : "移動檔案失敗",
     "Error" : "錯誤",
+    "{new_name} already exists" : "{new_name} 已經存在",
     "Could not rename file" : "無法重新命名",
+    "Could not create file" : "無法建立檔案",
+    "Could not create folder" : "無法建立資料夾",
     "Error deleting file." : "刪除檔案發生錯誤",
+    "No entries in this folder match '{filter}'" : "在此資料夾中沒有項目與 '{filter}' 相符",
     "Name" : "名稱",
     "Size" : "大小",
     "Modified" : "修改時間",
     "_%n folder_::_%n folders_" : ["%n 個資料夾"],
     "_%n file_::_%n files_" : ["%n 個檔案"],
+    "{dirs} and {files}" : "{dirs} 和 {files}",
     "You don’t have permission to upload or create files here" : "您沒有權限在這裡上傳或建立檔案",
     "_Uploading %n file_::_Uploading %n files_" : ["%n 個檔案正在上傳"],
+    "New" : "新增",
     "\"{name}\" is an invalid file name." : "{name} 是無效的檔名",
     "File name cannot be empty." : "檔名不能為空",
+    "Storage of {owner} is full, files can not be updated or synced anymore!" : "{owner} 的儲存空間已滿，沒有辦法再更新或是同步檔案！",
     "Your storage is full, files can not be updated or synced anymore!" : "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
+    "Storage of {owner} is almost full ({usedSpacePercent}%)" : "{owner} 的儲存空間快要滿了 ({usedSpacePercent}%)",
     "Your storage is almost full ({usedSpacePercent}%)" : "您的儲存空間快要滿了 ({usedSpacePercent}%)",
-    "{dirs} and {files}" : "{dirs} 和 {files}",
+    "Path" : "路徑",
+    "_%n byte_::_%n bytes_" : ["%n 位元組"],
+    "Favorited" : "已加入最愛",
     "Favorite" : "我的最愛",
+    "Upload" : "上傳",
+    "Text file" : "文字檔",
+    "Folder" : "資料夾",
+    "New folder" : "新資料夾",
+    "An error occurred while trying to update the tags" : "更新標籤時發生錯誤",
     "A new file or folder has been <strong>created</strong>" : "新的檔案或目錄已被 <strong>建立</strong>",
     "A file or folder has been <strong>changed</strong>" : "檔案或目錄已被 <strong>變更</strong>",
     "A file or folder has been <strong>deleted</strong>" : "檔案或目錄已被 <strong>刪除</strong>",
@@ -84,16 +96,17 @@
     "Settings" : "設定",
     "WebDAV" : "WebDAV",
     "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "使用這個地址<a href=\"%s\" target=\"_blank\">來透過 WebDAV 存取檔案</a>",
-    "New" : "新增",
-    "New text file" : "新文字檔",
-    "Text file" : "文字檔",
-    "New folder" : "新資料夾",
-    "Folder" : "資料夾",
-    "Upload" : "上傳",
     "Cancel upload" : "取消上傳",
+    "No files in here" : "沒有任何檔案",
+    "Upload some content or sync with your devices!" : "在您的裝置中同步或上傳一些內容",
+    "No entries found in this folder" : "在此資料夾中沒有任何項目",
+    "Select all" : "全選",
+    "Delete" : "刪除",
     "Upload too large" : "上傳過大",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您試圖上傳的檔案大小超過伺服器的限制。",
     "Files are being scanned, please wait." : "正在掃描檔案，請稍等。",
-    "Currently scanning" : "正在掃描"
+    "Currently scanning" : "正在掃描",
+    "No favorites" : "沒有最愛",
+    "Files and folders you mark as favorite will show up here" : "您標記為最愛的檔案與資料夾將會顯示在這裡"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files/templates/list.php b/apps/files/templates/list.php
index 32651b261d..15af1970dc 100644
--- a/apps/files/templates/list.php
+++ b/apps/files/templates/list.php
@@ -1,40 +1,16 @@
 <div id="controls">
 		<div class="actions creatable hidden">
-			<?php if(!isset($_['dirToken'])):?>
-			<div id="new" class="button">
-				<a><?php p($l->t('New'));?></a>
-				<ul>
-					<li class="icon-filetype-text svg"
-						data-type="file" data-newname="<?php p($l->t('New text file')) ?>.txt">
-						<p><?php p($l->t('Text file'));?></p>
-					</li>
-					<li class="icon-filetype-folder svg"
-						data-type="folder" data-newname="<?php p($l->t('New folder')) ?>">
-						<p><?php p($l->t('Folder'));?></p>
-					</li>
-				</ul>
-			</div>
-			<?php endif;?>
-			<?php /* Note: the template attributes are here only for the public page. These are normally loaded
-					 through ajax instead (updateStorageStatistics).
-			*/ ?>
-			<div id="upload" class="button"
+		<?php /*
+			Only show upload button for public page
+		*/ ?>
+		<?php if(isset($_['dirToken'])):?>
+			<div id="upload" class="button upload"
 				 title="<?php isset($_['uploadMaxHumanFilesize']) ? p($l->t('Upload (max. %s)', array($_['uploadMaxHumanFilesize']))) : '' ?>">
-					<input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php isset($_['uploadMaxFilesize']) ? p($_['uploadMaxFilesize']) : '' ?>">
-					<input type="hidden" id="upload_limit" value="<?php isset($_['uploadLimit']) ? p($_['uploadLimit']) : '' ?>">
-					<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
-					<?php if(isset($_['dirToken'])):?>
-					<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
-					<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
-					<?php endif;?>
-					<input type="hidden" class="max_human_file_size"
-						   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
-					<input type="file" id="file_upload_start" name='files[]'
-						   data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
 					<label for="file_upload_start" class="svg icon-upload">
 						<span class="hidden-visually"><?php p($l->t('Upload'))?></span>
 					</label>
 			</div>
+		<?php endif; ?>
 			<div id="uploadprogresswrapper">
 				<div id="uploadprogressbar"></div>
 				<button class="stop icon-close" style="display:none">
@@ -48,7 +24,19 @@
 		<div class="notCreatable notPublic hidden">
 			<?php p($l->t('You don’t have permission to upload or create files here'))?>
 		</div>
+	<?php /* Note: the template attributes are here only for the public page. These are normally loaded
+			 through ajax instead (updateStorageStatistics).
+	*/ ?>
 	<input type="hidden" name="permissions" value="" id="permissions">
+	<input type="hidden" id="max_upload" name="MAX_FILE_SIZE" value="<?php isset($_['uploadMaxFilesize']) ? p($_['uploadMaxFilesize']) : '' ?>">
+	<input type="hidden" id="upload_limit" value="<?php isset($_['uploadLimit']) ? p($_['uploadLimit']) : '' ?>">
+	<input type="hidden" id="free_space" value="<?php isset($_['freeSpace']) ? p($_['freeSpace']) : '' ?>">
+	<?php if(isset($_['dirToken'])):?>
+	<input type="hidden" id="publicUploadRequestToken" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
+	<input type="hidden" id="dirToken" name="dirToken" value="<?php p($_['dirToken']) ?>" />
+	<?php endif;?>
+	<input type="hidden" class="max_human_file_size"
+		   value="(max <?php isset($_['uploadMaxHumanFilesize']) ? p($_['uploadMaxHumanFilesize']) : ''; ?>)">
 </div>
 
 <div id="emptycontent" class="hidden">
@@ -101,6 +89,10 @@
 	</tfoot>
 </table>
 <input type="hidden" name="dir" id="dir" value="" />
+<div class="hiddenuploadfield">
+	<input type="file" id="file_upload_start" class="hiddenuploadfield" name="files[]"
+		data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
+</div>
 <div id="editor"></div><!-- FIXME Do not use this div in your app! It is deprecated and will be removed in the future! -->
 <div id="uploadsize-message" title="<?php p($l->t('Upload too large'))?>">
 	<p>
diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index a690c7dcb0..8abde9094d 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -116,7 +116,7 @@ class Test_OC_Files_App_Rename extends \Test\TestCase {
 		$this->assertEquals('abcdef', $result['data']['etag']);
 		$this->assertFalse(isset($result['data']['tags']));
 		$this->assertEquals('/', $result['data']['path']);
-		$icon = \OC_Helper::mimetypeIcon('dir');
+		$icon = \OC_Helper::mimetypeIcon('dir-external');
 		$icon = substr($icon, 0, -3) . 'svg';
 		$this->assertEquals($icon, $result['data']['icon']);
 	}
diff --git a/apps/files/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
index 817654c4fa..cad8468d1c 100644
--- a/apps/files/tests/js/fileUploadSpec.js
+++ b/apps/files/tests/js/fileUploadSpec.js
@@ -19,7 +19,6 @@
 *
 */
 
-/* global OC */
 describe('OC.Upload tests', function() {
 	var $dummyUploader;
 	var testFile;
@@ -118,54 +117,4 @@ describe('OC.Upload tests', function() {
 			);
 		});
 	});
-	describe('New file', function() {
-		var $input;
-		var currentDirStub;
-
-		beforeEach(function() {
-			OC.Upload.init();
-			$('#new>a').click();
-			$('#new li[data-type=file]').click();
-			$input = $('#new input[type=text]');
-
-			currentDirStub = sinon.stub(FileList, 'getCurrentDirectory');
-			currentDirStub.returns('testdir');
-		});
-		afterEach(function() {
-			currentDirStub.restore();
-		});
-		it('sets default text in field', function() {
-			expect($input.length).toEqual(1);
-			expect($input.val()).toEqual('New text file.txt');
-		});
-		it('creates file when enter is pressed', function() {
-			$input.val('somefile.txt');
-			$input.trigger(new $.Event('keyup', {keyCode: 13}));
-			$input.parent('form').submit();
-			expect(fakeServer.requests.length).toEqual(2);
-
-			var request = fakeServer.requests[1];
-			expect(request.method).toEqual('POST');
-			expect(request.url).toEqual(OC.webroot + '/index.php/apps/files/ajax/newfile.php');
-			var query = OC.parseQueryString(request.requestBody);
-			expect(query).toEqual({
-				dir: 'testdir',
-				filename: 'somefile.txt'
-			});
-		});
-		it('prevents entering invalid file names', function() {
-			$input.val('..');
-			$input.trigger(new $.Event('keyup', {keyCode: 13}));
-			$input.parent('form').submit();
-			expect(fakeServer.requests.length).toEqual(1);
-		});
-		it('prevents entering file names that already exist', function() {
-			var inListStub = sinon.stub(FileList, 'inList').returns(true);
-			$input.val('existing.txt');
-			$input.trigger(new $.Event('keyup', {keyCode: 13}));
-			$input.parent('form').submit();
-			expect(fakeServer.requests.length).toEqual(1);
-			inListStub.restore();
-		});
-	});
 });
diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 7ed60084fa..c05e7c3721 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -98,6 +98,7 @@ describe('OCA.Files.FileList tests', function() {
 			type: 'file',
 			name: 'One.txt',
 			mimetype: 'text/plain',
+			mtime: 123456789,
 			size: 12,
 			etag: 'abc',
 			permissions: OC.PERMISSION_ALL
@@ -106,6 +107,7 @@ describe('OCA.Files.FileList tests', function() {
 			type: 'file',
 			name: 'Two.jpg',
 			mimetype: 'image/jpeg',
+			mtime: 234567890,
 			size: 12049,
 			etag: 'def',
 			permissions: OC.PERMISSION_ALL
@@ -114,6 +116,7 @@ describe('OCA.Files.FileList tests', function() {
 			type: 'file',
 			name: 'Three.pdf',
 			mimetype: 'application/pdf',
+			mtime: 234560000,
 			size: 58009,
 			etag: '123',
 			permissions: OC.PERMISSION_ALL
@@ -122,6 +125,7 @@ describe('OCA.Files.FileList tests', function() {
 			type: 'dir',
 			name: 'somedir',
 			mimetype: 'httpd/unix-directory',
+			mtime: 134560000,
 			size: 250,
 			etag: '456',
 			permissions: OC.PERMISSION_ALL
@@ -1722,6 +1726,7 @@ describe('OCA.Files.FileList tests', function() {
 					id: 1,
 					name: 'One.txt',
 					mimetype: 'text/plain',
+					mtime: 123456789,
 					type: 'file',
 					size: 12,
 					etag: 'abc',
@@ -1732,6 +1737,7 @@ describe('OCA.Files.FileList tests', function() {
 					type: 'file',
 					name: 'Three.pdf',
 					mimetype: 'application/pdf',
+					mtime: 234560000,
 					size: 58009,
 					etag: '123',
 					permissions: OC.PERMISSION_ALL
@@ -1741,6 +1747,7 @@ describe('OCA.Files.FileList tests', function() {
 					type: 'dir',
 					name: 'somedir',
 					mimetype: 'httpd/unix-directory',
+					mtime: 134560000,
 					size: 250,
 					etag: '456',
 					permissions: OC.PERMISSION_ALL
@@ -1754,6 +1761,7 @@ describe('OCA.Files.FileList tests', function() {
 					id: 1,
 					name: 'One.txt',
 					mimetype: 'text/plain',
+					mtime: 123456789,
 					type: 'file',
 					size: 12,
 					etag: 'abc',
@@ -1764,6 +1772,7 @@ describe('OCA.Files.FileList tests', function() {
 					type: 'dir',
 					name: 'somedir',
 					mimetype: 'httpd/unix-directory',
+					mtime: 134560000,
 					size: 250,
 					etag: '456',
 					permissions: OC.PERMISSION_ALL
@@ -2148,6 +2157,93 @@ describe('OCA.Files.FileList tests', function() {
 			expect(fileList.$fileList.find('tr').length).toEqual(5);
 		});
 	});
+	describe('create file', function() {
+		var deferredCreate;
+
+		beforeEach(function() {
+			deferredCreate = $.Deferred();
+		});
+
+		it('creates file with given name and adds it to the list', function() {
+			var deferred = fileList.createFile('test file.txt');
+			var successStub = sinon.stub();
+			var failureStub = sinon.stub();
+
+			deferred.done(successStub);
+			deferred.fail(failureStub);
+
+			expect(fakeServer.requests.length).toEqual(1);
+			expect(fakeServer.requests[0].url).toEqual(OC.generateUrl('/apps/files/ajax/newfile.php'));
+
+			var query = fakeServer.requests[0].requestBody;
+			expect(OC.parseQueryString(query)).toEqual({
+				dir: '/subdir',
+				filename: 'test file.txt'
+			});
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					status: 'success',
+					data: {
+						path: '/subdir',
+						name: 'test file.txt',
+						mimetype: 'text/plain'
+					}
+				})
+			);
+
+			var $tr = fileList.findFileEl('test file.txt');
+			expect($tr.length).toEqual(1);
+			expect($tr.attr('data-mime')).toEqual('text/plain');
+
+			expect(successStub.calledOnce).toEqual(true);
+			expect(failureStub.notCalled).toEqual(true);
+		});
+		// TODO: error cases
+		// TODO: unique name cases
+	});
+	describe('create directory', function() {
+		it('creates directory with given name and adds it to the list', function() {
+			var deferred = fileList.createDirectory('test directory');
+			var successStub = sinon.stub();
+			var failureStub = sinon.stub();
+
+			deferred.done(successStub);
+			deferred.fail(failureStub);
+
+			expect(fakeServer.requests.length).toEqual(1);
+			expect(fakeServer.requests[0].url).toEqual(OC.generateUrl('/apps/files/ajax/newfolder.php'));
+			var query = fakeServer.requests[0].requestBody;
+			expect(OC.parseQueryString(query)).toEqual({
+				dir: '/subdir',
+				foldername: 'test directory'
+			});
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					status: 'success',
+					data: {
+						path: '/subdir',
+						name: 'test directory',
+						mimetype: 'httpd/unix-directory'
+					}
+				})
+			);
+
+			var $tr = fileList.findFileEl('test directory');
+			expect($tr.length).toEqual(1);
+			expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
+
+			expect(successStub.calledOnce).toEqual(true);
+			expect(failureStub.notCalled).toEqual(true);
+		});
+		// TODO: error cases
+		// TODO: unique name cases
+	});
 	/**
 	 * Test upload mostly by testing the code inside the event handlers
 	 * that were registered on the magic upload object
@@ -2330,4 +2426,56 @@ describe('OCA.Files.FileList tests', function() {
 			});
 		});
 	});
+	describe('elementToFile', function() {
+		var $tr;
+
+		beforeEach(function() {
+			fileList.setFiles(testFiles);
+			$tr = fileList.findFileEl('One.txt');
+		});
+
+		it('converts data attributes to file info structure', function() {
+			var fileInfo = fileList.elementToFile($tr);
+			expect(fileInfo.id).toEqual(1);
+			expect(fileInfo.name).toEqual('One.txt');
+			expect(fileInfo.mtime).toEqual(123456789);
+			expect(fileInfo.etag).toEqual('abc');
+			expect(fileInfo.permissions).toEqual(OC.PERMISSION_ALL);
+			expect(fileInfo.size).toEqual(12);
+			expect(fileInfo.mimetype).toEqual('text/plain');
+			expect(fileInfo.type).toEqual('file');
+		});
+	});
+	describe('new file menu', function() {
+		var newFileMenuStub;
+
+		beforeEach(function() {
+			newFileMenuStub = sinon.stub(OCA.Files.NewFileMenu.prototype, 'showAt');
+		});
+		afterEach(function() {
+			newFileMenuStub.restore();
+		})
+		it('renders new button when no legacy upload button exists', function() {
+			expect(fileList.$el.find('.button.upload').length).toEqual(0);
+			expect(fileList.$el.find('.button.new').length).toEqual(1);
+		});
+		it('does not render new button when no legacy upload button exists (public page)', function() {
+			fileList.destroy();
+			$('#controls').append('<input type="button" class="button upload" />');
+			fileList = new OCA.Files.FileList($('#app-content-files'));
+			expect(fileList.$el.find('.button.upload').length).toEqual(1);
+			expect(fileList.$el.find('.button.new').length).toEqual(0);
+		});
+		it('opens the new file menu when clicking on the "New" button', function() {
+			var $button = fileList.$el.find('.button.new');
+			$button.click();
+			expect(newFileMenuStub.calledOnce).toEqual(true);
+		});
+		it('does not open the new file menu when button is disabled', function() {
+			var $button = fileList.$el.find('.button.new');
+			$button.addClass('disabled');
+			$button.click();
+			expect(newFileMenuStub.notCalled).toEqual(true);
+		});
+	});
 });
diff --git a/apps/files/tests/js/mainfileinfodetailviewSpec.js b/apps/files/tests/js/mainfileinfodetailviewSpec.js
index ca7384f620..2b9e2b23f9 100644
--- a/apps/files/tests/js/mainfileinfodetailviewSpec.js
+++ b/apps/files/tests/js/mainfileinfodetailviewSpec.js
@@ -20,11 +20,10 @@
 */
 
 describe('OCA.Files.MainFileInfoDetailView tests', function() {
-	var view, tooltipStub, fileListMock, fileActions, fileList, testFileInfo;
+	var view, tooltipStub, fileActions, fileList, testFileInfo;
 
 	beforeEach(function() {
 		tooltipStub = sinon.stub($.fn, 'tooltip');
-		fileListMock = sinon.mock(OCA.Files.FileList.prototype);
 		fileActions = new OCA.Files.FileActions();
 		fileList = new OCA.Files.FileList($('<table></table>'), {
 			fileActions: fileActions
@@ -40,6 +39,7 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 			permissions: 31,
 			path: '/subdir',
 			size: 123456789,
+			etag: 'abcdefg',
 			mtime: Date.UTC(2015, 6, 17, 1, 2, 0, 0)
 		});
 	});
@@ -47,7 +47,6 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 		view.remove();
 		view = undefined;
 		tooltipStub.restore();
-		fileListMock.restore();
 
 	});
 	describe('rendering', function() {
@@ -55,8 +54,8 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 			var clock = sinon.useFakeTimers(Date.UTC(2015, 6, 17, 1, 2, 0, 3));
 			var dateExpected = OC.Util.formatDate(Date(Date.UTC(2015, 6, 17, 1, 2, 0, 0)));
 			view.setFileInfo(testFileInfo);
-			expect(view.$el.find('.fileName').text()).toEqual('One.txt');
-			expect(view.$el.find('.fileName').attr('title')).toEqual('One.txt');
+			expect(view.$el.find('.fileName h3').text()).toEqual('One.txt');
+			expect(view.$el.find('.fileName h3').attr('title')).toEqual('One.txt');
 			expect(view.$el.find('.size').text()).toEqual('117.7 MB');
 			expect(view.$el.find('.size').attr('title')).toEqual('123456789 bytes');
 			expect(view.$el.find('.date').text()).toEqual('a few seconds ago');
@@ -76,9 +75,31 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 		});
 		it('displays mime icon', function() {
 			// File
+			var lazyLoadPreviewStub = sinon.stub(fileList, 'lazyLoadPreview');
 			testFileInfo.set('mimetype', 'text/calendar');
 			view.setFileInfo(testFileInfo);
 
+			expect(lazyLoadPreviewStub.calledOnce).toEqual(true);
+			var previewArgs = lazyLoadPreviewStub.getCall(0).args;
+			expect(previewArgs[0].mime).toEqual('text/calendar');
+			expect(previewArgs[0].path).toEqual('/subdir/One.txt');
+			expect(previewArgs[0].etag).toEqual('abcdefg');
+
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(true);
+
+			// returns mime icon first without img parameter
+			previewArgs[0].callback(
+				OC.imagePath('core', 'filetypes/text-calendar.svg')
+			);
+
+			// still loading
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(true);
+
+			// preview loading failed, no prview
+			previewArgs[0].error();
+
+			// loading stopped, the mimetype icon gets displayed
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(false);
 			expect(view.$el.find('.thumbnail').css('background-image'))
 				.toContain('filetypes/text-calendar.svg');
 
@@ -88,17 +109,59 @@ describe('OCA.Files.MainFileInfoDetailView tests', function() {
 
 			expect(view.$el.find('.thumbnail').css('background-image'))
 				.toContain('filetypes/folder.svg');
+
+			lazyLoadPreviewStub.restore();
 		});
 		it('displays thumbnail', function() {
-			testFileInfo.set('mimetype', 'test/plain');
+			var lazyLoadPreviewStub = sinon.stub(fileList, 'lazyLoadPreview');
+
+			testFileInfo.set('mimetype', 'text/plain');
 			view.setFileInfo(testFileInfo);
 
-			var expectation = fileListMock.expects('lazyLoadPreview');
-			expectation.once();
+			expect(lazyLoadPreviewStub.calledOnce).toEqual(true);
+			var previewArgs = lazyLoadPreviewStub.getCall(0).args;
+			expect(previewArgs[0].mime).toEqual('text/plain');
+			expect(previewArgs[0].path).toEqual('/subdir/One.txt');
+			expect(previewArgs[0].etag).toEqual('abcdefg');
 
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(true);
+
+			// returns mime icon first without img parameter
+			previewArgs[0].callback(
+				OC.imagePath('core', 'filetypes/text-plain.svg')
+			);
+
+			// still loading
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(true);
+
+			// return an actual (simulated) image
+			previewArgs[0].callback(
+				'testimage', {
+					width: 100,
+					height: 200
+				}
+			);
+
+			// loading stopped, image got displayed
+			expect(view.$el.find('.thumbnail').css('background-image'))
+				.toContain('testimage');
+
+			expect(view.$el.find('.thumbnail').hasClass('icon-loading')).toEqual(false);
+
+			lazyLoadPreviewStub.restore();
+		});
+		it('does not show size if no size available', function() {
+			testFileInfo.unset('size');
 			view.setFileInfo(testFileInfo);
 
-			fileListMock.verify();
+			expect(view.$el.find('.size').length).toEqual(0);
+		});
+		it('renders displayName instead of name if available', function() {
+			testFileInfo.set('displayName', 'hello.txt');
+			view.setFileInfo(testFileInfo);
+
+			expect(view.$el.find('.fileName h3').text()).toEqual('hello.txt');
+			expect(view.$el.find('.fileName h3').attr('title')).toEqual('hello.txt');
 		});
 		it('rerenders when changes are made on the model', function() {
 			view.setFileInfo(testFileInfo);
diff --git a/apps/files/tests/js/newfilemenuSpec.js b/apps/files/tests/js/newfilemenuSpec.js
new file mode 100644
index 0000000000..3d89a997eb
--- /dev/null
+++ b/apps/files/tests/js/newfilemenuSpec.js
@@ -0,0 +1,119 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2015 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+describe('OCA.Files.NewFileMenu', function() {
+	var FileList = OCA.Files.FileList;
+	var menu, fileList, $uploadField, $trigger;
+
+	beforeEach(function() {
+		// dummy upload button
+		var $container = $('<div id="app-content-files"></div>');
+		$uploadField = $('<input id="file_upload_start"></input>');
+		$trigger = $('<a href="#">Menu</a>');
+		$container.append($uploadField).append($trigger);
+		$('#testArea').append($container);
+
+		fileList = new FileList($container);
+		menu = new OCA.Files.NewFileMenu({
+			fileList: fileList
+		});
+		menu.showAt($trigger);
+	});
+	afterEach(function() {
+		OC.hideMenus();
+		fileList = null;
+		menu = null;
+	});
+
+	describe('rendering', function() {
+		it('renders menu items', function() {
+			var $items = menu.$el.find('.menuitem');
+			expect($items.length).toEqual(3);
+			// label points to the file_upload_start item
+			var $item = $items.eq(0);
+			expect($item.is('label')).toEqual(true);
+			expect($item.attr('for')).toEqual('file_upload_start');
+		});
+	});
+	describe('New file/folder', function() {
+		var $input;
+		var createFileStub;
+		var createDirectoryStub;
+
+		beforeEach(function() {
+			createFileStub = sinon.stub(FileList.prototype, 'createFile');
+			createDirectoryStub = sinon.stub(FileList.prototype, 'createDirectory');
+			menu.$el.find('.menuitem').eq(1).click();
+			$input = menu.$el.find('form.filenameform input');
+		});
+		afterEach(function() {
+			createFileStub.restore();
+			createDirectoryStub.restore();
+		});
+
+		it('sets default text in field', function() {
+			expect($input.length).toEqual(1);
+			expect($input.val()).toEqual('New text file.txt');
+		});
+		it('creates file when enter is pressed', function() {
+			$input.val('somefile.txt');
+			$input.trigger(new $.Event('keyup', {keyCode: 13}));
+			$input.parent('form').submit();
+
+			expect(createFileStub.calledOnce).toEqual(true);
+			expect(createFileStub.getCall(0).args[0]).toEqual('somefile.txt');
+			expect(createDirectoryStub.notCalled).toEqual(true);
+		});
+		it('prevents entering invalid file names', function() {
+			$input.val('..');
+			$input.trigger(new $.Event('keyup', {keyCode: 13}));
+			$input.closest('form').submit();
+
+			expect(createFileStub.notCalled).toEqual(true);
+			expect(createDirectoryStub.notCalled).toEqual(true);
+		});
+		it('prevents entering file names that already exist', function() {
+			var inListStub = sinon.stub(fileList, 'inList').returns(true);
+			$input.val('existing.txt');
+			$input.trigger(new $.Event('keyup', {keyCode: 13}));
+			$input.closest('form').submit();
+
+			expect(createFileStub.notCalled).toEqual(true);
+			expect(createDirectoryStub.notCalled).toEqual(true);
+			inListStub.restore();
+		});
+		it('switching fields removes the previous form', function() {
+			menu.$el.find('.menuitem').eq(2).click();
+			expect(menu.$el.find('form').length).toEqual(1);
+		});
+		it('creates directory when clicking on create directory field', function() {
+			menu.$el.find('.menuitem').eq(2).click();
+			$input = menu.$el.find('form.filenameform input');
+			$input.val('some folder');
+			$input.trigger(new $.Event('keyup', {keyCode: 13}));
+			$input.closest('form').submit();
+
+			expect(createDirectoryStub.calledOnce).toEqual(true);
+			expect(createDirectoryStub.getCall(0).args[0]).toEqual('some folder');
+			expect(createFileStub.notCalled).toEqual(true);
+		});
+	});
+});
diff --git a/apps/files/tests/js/tagspluginspec.js b/apps/files/tests/js/tagspluginspec.js
index 5309973cf4..533aa63362 100644
--- a/apps/files/tests/js/tagspluginspec.js
+++ b/apps/files/tests/js/tagspluginspec.js
@@ -79,12 +79,12 @@ describe('OCA.Files.TagsPlugin tests', function() {
 		it('sends request to server and updates icon', function() {
 			var request;
 			fileList.setFiles(testFiles);
-			$tr = fileList.$el.find('tbody tr:first');
-			$action = $tr.find('.action-favorite');
+			var $tr = fileList.findFileEl('One.txt');
+			var $action = $tr.find('.action-favorite');
 			$action.click();
 
 			expect(fakeServer.requests.length).toEqual(1);
-			var request = fakeServer.requests[0];
+			request = fakeServer.requests[0];
 			expect(JSON.parse(request.requestBody)).toEqual({
 				tags: ['tag1', 'tag2', OC.TAG_FAVORITE]
 			});
@@ -92,12 +92,18 @@ describe('OCA.Files.TagsPlugin tests', function() {
 				tags: ['tag1', 'tag2', 'tag3', OC.TAG_FAVORITE]
 			}));
 
+			// re-read the element as it was re-inserted
+			$tr = fileList.findFileEl('One.txt');
+			$action = $tr.find('.action-favorite');
+
 			expect($tr.attr('data-favorite')).toEqual('true');
 			expect($tr.attr('data-tags').split('|')).toEqual(['tag1', 'tag2', 'tag3', OC.TAG_FAVORITE]);
 			expect(fileList.files[0].tags).toEqual(['tag1', 'tag2', 'tag3', OC.TAG_FAVORITE]);
 			expect($action.find('img').attr('src')).toEqual(OC.imagePath('core', 'actions/starred'));
 
 			$action.click();
+
+			expect(fakeServer.requests.length).toEqual(2);
 			request = fakeServer.requests[1];
 			expect(JSON.parse(request.requestBody)).toEqual({
 				tags: ['tag1', 'tag2', 'tag3']
@@ -106,10 +112,29 @@ describe('OCA.Files.TagsPlugin tests', function() {
 				tags: ['tag1', 'tag2', 'tag3']
 			}));
 
-			expect($tr.attr('data-favorite')).toEqual('false');
+			// re-read the element as it was re-inserted
+			$tr = fileList.findFileEl('One.txt');
+			$action = $tr.find('.action-favorite');
+
+			expect($tr.attr('data-favorite')).toBeFalsy();
 			expect($tr.attr('data-tags').split('|')).toEqual(['tag1', 'tag2', 'tag3']);
 			expect(fileList.files[0].tags).toEqual(['tag1', 'tag2', 'tag3']);
 			expect($action.find('img').attr('src')).toEqual(OC.imagePath('core', 'actions/star'));
 		});
 	});
+	describe('elementToFile', function() {
+		it('returns tags', function() {
+			fileList.setFiles(testFiles);
+			var $tr = fileList.findFileEl('One.txt');
+			var data = fileList.elementToFile($tr);
+			expect(data.tags).toEqual(['tag1', 'tag2']);
+		});
+		it('returns empty array when no tags present', function() {
+			delete testFiles[0].tags;
+			fileList.setFiles(testFiles);
+			var $tr = fileList.findFileEl('One.txt');
+			var data = fileList.elementToFile($tr);
+			expect(data.tags).toEqual([]);
+		});
+	});
 });
diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/oauth1.php
similarity index 89%
rename from apps/files_external/ajax/dropbox.php
rename to apps/files_external/ajax/oauth1.php
index 55dc417b73..ca339aeec5 100644
--- a/apps/files_external/ajax/dropbox.php
+++ b/apps/files_external/ajax/oauth1.php
@@ -30,6 +30,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 $l = \OC::$server->getL10N('files_external');
 
+// FIXME: currently hard-coded to Dropbox OAuth
 if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 	$oauth = new Dropbox_OAuth_Curl((string)$_POST['app_key'], (string)$_POST['app_secret']);
 	if (isset($_POST['step'])) {
@@ -47,7 +48,7 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 															'request_token_secret' => $token['token_secret'])));
 				} catch (Exception $exception) {
 					OCP\JSON::error(array('data' => array('message' =>
-						$l->t('Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.'))
+						$l->t('Fetching request tokens failed. Verify that your app key and secret are correct.'))
 						));
 				}
 				break;
@@ -60,7 +61,7 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 												'access_token_secret' => $token['token_secret']));
 					} catch (Exception $exception) {
 						OCP\JSON::error(array('data' => array('message' =>
-							$l->t('Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.'))
+							$l->t('Fetching access tokens failed. Verify that your app key and secret are correct.'))
 							));
 					}
 				}
@@ -68,5 +69,5 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 		}
 	}
 } else {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Please provide a valid Dropbox app key and secret.'))));
+	OCP\JSON::error(array('data' => array('message' => $l->t('Please provide a valid app key and secret.'))));
 }
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/oauth2.php
similarity index 98%
rename from apps/files_external/ajax/google.php
rename to apps/files_external/ajax/oauth2.php
index acaf1b0b27..0a202e3ddc 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/oauth2.php
@@ -33,6 +33,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 $l = \OC::$server->getL10N('files_external');
 
+// FIXME: currently hard-coded to Google Drive
 if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST['redirect'])) {
 	$client = new Google_Client();
 	$client->setClientId((string)$_POST['client_id']);
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 3d8e610db4..f33012b5f0 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -37,11 +37,9 @@ OC::$CLASSPATH['OC\Files\Storage\OwnCloud'] = 'files_external/lib/owncloud.php';
 OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php';
 OC::$CLASSPATH['OC\Files\Storage\Swift'] = 'files_external/lib/swift.php';
 OC::$CLASSPATH['OC\Files\Storage\SMB'] = 'files_external/lib/smb.php';
-OC::$CLASSPATH['OC\Files\Storage\SMB_OC'] = 'files_external/lib/smb_oc.php';
 OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php';
 OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php';
 OC::$CLASSPATH['OC\Files\Storage\SFTP'] = 'files_external/lib/sftp.php';
-OC::$CLASSPATH['OC\Files\Storage\SFTP_Key'] = 'files_external/lib/sftp_key.php';
 OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
 OC::$CLASSPATH['OCA\Files\External\Api'] = 'files_external/lib/api.php';
 
@@ -68,106 +66,6 @@ if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == '
 
 // connecting hooks
 OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OC_Mount_Config', 'initMountPointsHook');
-OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\SMB_OC', 'login');
 
-OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', [
-	'backend' => (string)$l->t('Amazon S3'),
-	'priority' => 100,
-	'configuration' => [
-		'key' => (string)$l->t('Key'),
-		'secret' => '*'.$l->t('Secret'),
-		'bucket' => (string)$l->t('Bucket'),
-	],
-	'has_dependencies' => true,
-]);
-
-OC_Mount_Config::registerBackend('\OC\Files\Storage\AmazonS3', [
-	'backend' => (string)$l->t('Amazon S3 and compliant'),
-	'priority' => 100,
-	'configuration' => [
-		'key' => (string)$l->t('Access Key'),
-		'secret' => '*'.$l->t('Secret Key'),
-		'bucket' => (string)$l->t('Bucket'),
-		'hostname' => '&'.$l->t('Hostname'),
-		'port' => '&'.$l->t('Port'),
-		'region' => '&'.$l->t('Region'),
-		'use_ssl' => '!'.$l->t('Enable SSL'),
-		'use_path_style' => '!'.$l->t('Enable Path Style')
-	],
-	'has_dependencies' => true,
-]);
-
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Dropbox', [
-	'backend' => 'Dropbox',
-	'priority' => 100,
-	'configuration' => [
-		'configured' => '#configured',
-		'app_key' => (string)$l->t('App key'),
-		'app_secret' => '*'.$l->t('App secret'),
-		'token' => '#token',
-		'token_secret' => '#token_secret'
-	],
-	'custom' => 'dropbox',
-	'has_dependencies' => true,
-]);
-
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Google', [
-	'backend' => 'Google Drive',
-	'priority' => 100,
-	'configuration' => [
-		'configured' => '#configured',
-		'client_id' => (string)$l->t('Client ID'),
-		'client_secret' => '*'.$l->t('Client secret'),
-		'token' => '#token',
-	],
-	'custom' => 'google',
-	'has_dependencies' => true,
-]);
-
-
-OC_Mount_Config::registerBackend('\OC\Files\Storage\Swift', [
-	'backend' => (string)$l->t('OpenStack Object Storage'),
-	'priority' => 100,
-	'configuration' => [
-		'user' => (string)$l->t('Username'),
-		'bucket' => (string)$l->t('Bucket'),
-		'region' => '&'.$l->t('Region (optional for OpenStack Object Storage)'),
-		'key' => '&*'.$l->t('API Key (required for Rackspace Cloud Files)'),
-		'tenant' => '&'.$l->t('Tenantname (required for OpenStack Object Storage)'),
-		'password' => '&*'.$l->t('Password (required for OpenStack Object Storage)'),
-		'service_name' => '&'.$l->t('Service Name (required for OpenStack Object Storage)'),
-		'url' => '&'.$l->t('URL of identity endpoint (required for OpenStack Object Storage)'),
-		'timeout' => '&'.$l->t('Timeout of HTTP requests in seconds'),
-	],
-	'has_dependencies' => true,
-]);
-
-
-if (!OC_Util::runningOnWindows()) {
-	OC_Mount_Config::registerBackend('\OC\Files\Storage\SMB_OC', [
-			'backend' => (string)$l->t('SMB / CIFS using OC login'),
-			'priority' => 90,
-			'configuration' => [
-				'host' => (string)$l->t('Host'),
-				'username_as_share' => '!'.$l->t('Username as share'),
-				'share' => '&'.$l->t('Share'),
-				'root' => '&'.$l->t('Remote subfolder'),
-			],
-		'has_dependencies' => true,
-	]);
-}
-
-OC_Mount_Config::registerBackend('\OC\Files\Storage\SFTP_Key', [
-	'backend' => (string)$l->t('SFTP with secret key login'),
-	'priority' => 100,
-	'configuration' => array(
-		'host' => (string)$l->t('Host'),
-		'user' => (string)$l->t('Username'),
-		'public_key' => (string)$l->t('Public key'),
-		'private_key' => '#private_key',
-		'root' => '&'.$l->t('Remote subfolder')),
-	'custom' => 'sftp_key',
-	]
-);
 $mountProvider = $appContainer->query('OCA\Files_External\Config\ConfigAdapter');
 \OC::$server->getMountProviderCollection()->registerProvider($mountProvider);
diff --git a/apps/files_external/appinfo/application.php b/apps/files_external/appinfo/application.php
index 4520a8737b..3a222141fb 100644
--- a/apps/files_external/appinfo/application.php
+++ b/apps/files_external/appinfo/application.php
@@ -24,7 +24,6 @@
 
 namespace OCA\Files_External\AppInfo;
 
-use \OCA\Files_External\Controller\AjaxController;
 use \OCP\AppFramework\App;
 use \OCP\IContainer;
 use \OCA\Files_External\Service\BackendService;
@@ -36,20 +35,13 @@ class Application extends App {
 	public function __construct(array $urlParams=array()) {
 		parent::__construct('files_external', $urlParams);
 
-		$container = $this->getContainer();
-
-		/**
-		 * Controllers
-		 */
-		$container->registerService('AjaxController', function (IContainer $c) {
-			return new AjaxController(
-				$c->query('AppName'),
-				$c->query('Request')
-			);
-		});
-
 		$this->loadBackends();
 		$this->loadAuthMechanisms();
+
+		// app developers: do NOT depend on this! it will disappear with oC 9.0!
+		\OC::$server->getEventDispatcher()->dispatch(
+			'OCA\\Files_External::loadAdditionalBackends'
+		);
 	}
 
 	/**
@@ -65,11 +57,17 @@ class Application extends App {
 			$container->query('OCA\Files_External\Lib\Backend\DAV'),
 			$container->query('OCA\Files_External\Lib\Backend\OwnCloud'),
 			$container->query('OCA\Files_External\Lib\Backend\SFTP'),
+			$container->query('OCA\Files_External\Lib\Backend\AmazonS3'),
+			$container->query('OCA\Files_External\Lib\Backend\Dropbox'),
+			$container->query('OCA\Files_External\Lib\Backend\Google'),
+			$container->query('OCA\Files_External\Lib\Backend\Swift'),
+			$container->query('OCA\Files_External\Lib\Backend\SFTP_Key'),
 		]);
 
 		if (!\OC_Util::runningOnWindows()) {
 			$service->registerBackends([
 				$container->query('OCA\Files_External\Lib\Backend\SMB'),
+				$container->query('OCA\Files_External\Lib\Backend\SMB_OC'),
 			]);
 		}
 	}
@@ -91,6 +89,22 @@ class Application extends App {
 			// AuthMechanism::SCHEME_PASSWORD mechanisms
 			$container->query('OCA\Files_External\Lib\Auth\Password\Password'),
 			$container->query('OCA\Files_External\Lib\Auth\Password\SessionCredentials'),
+
+			// AuthMechanism::SCHEME_OAUTH1 mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\OAuth1\OAuth1'),
+
+			// AuthMechanism::SCHEME_OAUTH2 mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\OAuth2\OAuth2'),
+
+			// AuthMechanism::SCHEME_PUBLICKEY mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\PublicKey\RSA'),
+
+			// AuthMechanism::SCHEME_OPENSTACK mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\OpenStack\OpenStack'),
+			$container->query('OCA\Files_External\Lib\Auth\OpenStack\Rackspace'),
+
+			// Specialized mechanisms
+			$container->query('OCA\Files_External\Lib\Auth\AmazonS3\AccessKey'),
 		]);
 	}
 
diff --git a/apps/files_external/appinfo/routes.php b/apps/files_external/appinfo/routes.php
index 4462ad1f27..a371273e74 100644
--- a/apps/files_external/appinfo/routes.php
+++ b/apps/files_external/appinfo/routes.php
@@ -38,7 +38,7 @@ namespace OCA\Files_External\AppInfo;
 		'routes' => array(
 			array(
 				'name' => 'Ajax#getSshKeys',
-				'url' => '/ajax/sftp_key.php',
+				'url' => '/ajax/public_key.php',
 				'verb' => 'POST',
 				'requirements' => array()
 			)
@@ -46,10 +46,10 @@ namespace OCA\Files_External\AppInfo;
 	)
 );
 
-$this->create('files_external_dropbox', 'ajax/dropbox.php')
-	->actionInclude('files_external/ajax/dropbox.php');
-$this->create('files_external_google', 'ajax/google.php')
-	->actionInclude('files_external/ajax/google.php');
+$this->create('files_external_oauth1', 'ajax/oauth1.php')
+	->actionInclude('files_external/ajax/oauth1.php');
+$this->create('files_external_oauth2', 'ajax/oauth2.php')
+	->actionInclude('files_external/ajax/oauth2.php');
 
 
 $this->create('files_external_list_applicable', '/applicable')
diff --git a/apps/files_external/controller/ajaxcontroller.php b/apps/files_external/controller/ajaxcontroller.php
index cb2de43228..c285cd34e7 100644
--- a/apps/files_external/controller/ajaxcontroller.php
+++ b/apps/files_external/controller/ajaxcontroller.php
@@ -25,19 +25,19 @@ namespace OCA\Files_External\Controller;
 use OCP\AppFramework\Controller;
 use OCP\IRequest;
 use OCP\AppFramework\Http\JSONResponse;
-use phpseclib\Crypt\RSA;
+use OCA\Files_External\Lib\Auth\PublicKey\RSA;
 
 class AjaxController extends Controller {
-	public function __construct($appName, IRequest $request) {
+	/** @var RSA */
+	private $rsaMechanism;
+
+	public function __construct($appName, IRequest $request, RSA $rsaMechanism) {
 		parent::__construct($appName, $request);
+		$this->rsaMechanism = $rsaMechanism;
 	}
 
 	private function generateSshKeys() {
-		$rsa = new RSA();
-		$rsa->setPublicKeyFormat(RSA::PUBLIC_FORMAT_OPENSSH);
-		$rsa->setPassword(\OC::$server->getConfig()->getSystemValue('secret', ''));
-
-		$key = $rsa->createKey();
+		$key = $this->rsaMechanism->createKey();
 		// Replace the placeholder label with a more meaningful one
 		$key['publicKey'] = str_replace('phpseclib-generated-key', gethostname(), $key['publickey']);
 
diff --git a/apps/files_external/controller/globalstoragescontroller.php b/apps/files_external/controller/globalstoragescontroller.php
index 756a34fc5d..7d97fdbb4f 100644
--- a/apps/files_external/controller/globalstoragescontroller.php
+++ b/apps/files_external/controller/globalstoragescontroller.php
@@ -32,6 +32,7 @@ use \OCP\AppFramework\Http;
 use \OCA\Files_external\Service\GlobalStoragesService;
 use \OCA\Files_external\NotFoundException;
 use \OCA\Files_external\Lib\StorageConfig;
+use \OCA\Files_External\Service\BackendService;
 
 /**
  * Global storages controller
@@ -97,7 +98,7 @@ class GlobalStoragesController extends StoragesController {
 			return $newStorage;
 		}
 
-		$response = $this->validate($newStorage);
+		$response = $this->validate($newStorage, BackendService::PERMISSION_CREATE);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -153,7 +154,7 @@ class GlobalStoragesController extends StoragesController {
 		}
 		$storage->setId($id);
 
-		$response = $this->validate($storage);
+		$response = $this->validate($storage, BackendService::PERMISSION_MODIFY);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -178,4 +179,14 @@ class GlobalStoragesController extends StoragesController {
 
 	}
 
+	/**
+	 * Get the user type for this controller, used in validation
+	 *
+	 * @return string BackendService::USER_* constants
+	 */
+	protected function getUserType() {
+		return BackendService::USER_ADMIN;
+	}
+
+
 }
diff --git a/apps/files_external/controller/storagescontroller.php b/apps/files_external/controller/storagescontroller.php
index 3d91af8bd8..46202c8ba4 100644
--- a/apps/files_external/controller/storagescontroller.php
+++ b/apps/files_external/controller/storagescontroller.php
@@ -36,6 +36,7 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCP\Files\StorageNotAvailableException;
 use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
+use \OCA\Files_External\Service\BackendService;
 
 /**
  * Base class for storages controllers
@@ -124,10 +125,11 @@ abstract class StoragesController extends Controller {
 	 * Validate storage config
 	 *
 	 * @param StorageConfig $storage storage config
+	 * @param int $permissionCheck permission to check
 	 *
 	 * @return DataResponse|null returns response in case of validation error
 	 */
-	protected function validate(StorageConfig $storage) {
+	protected function validate(StorageConfig $storage, $permissionCheck = BackendService::PERMISSION_CREATE) {
 		$mountPoint = $storage->getMountPoint();
 		if ($mountPoint === '' || $mountPoint === '/') {
 			return new DataResponse(
@@ -138,6 +140,16 @@ abstract class StoragesController extends Controller {
 			);
 		}
 
+		if ($storage->getBackendOption('objectstore')) {
+			// objectstore must not be sent from client side
+			return new DataResponse(
+				array(
+					'message' => (string)$this->l10n->t('Objectstore forbidden')
+				),
+				Http::STATUS_UNPROCESSABLE_ENTITY
+			);
+		}
+
 		/** @var Backend */
 		$backend = $storage->getBackend();
 		/** @var AuthMechanism */
@@ -147,12 +159,36 @@ abstract class StoragesController extends Controller {
 			return new DataResponse(
 				array(
 					'message' => (string)$this->l10n->t('Invalid storage backend "%s"', [
-						$storage->getBackend()->getIdentifier()
+						$backend->getIdentifier()
 					])
 				),
 				Http::STATUS_UNPROCESSABLE_ENTITY
 			);
 		}
+
+		if (!$backend->isPermitted($this->getUserType(), $permissionCheck)) {
+			// not permitted to use backend
+			return new DataResponse(
+				array(
+					'message' => (string)$this->l10n->t('Not permitted to use backend "%s"', [
+						$backend->getIdentifier()
+					])
+				),
+				Http::STATUS_UNPROCESSABLE_ENTITY
+			);
+		}
+		if (!$authMechanism->isPermitted($this->getUserType(), $permissionCheck)) {
+			// not permitted to use auth mechanism
+			return new DataResponse(
+				array(
+					'message' => (string)$this->l10n->t('Not permitted to use authentication mechanism "%s"', [
+						$authMechanism->getIdentifier()
+					])
+				),
+				Http::STATUS_UNPROCESSABLE_ENTITY
+			);
+		}
+
 		if (!$backend->validateStorage($storage)) {
 			// unsatisfied parameters
 			return new DataResponse(
@@ -175,6 +211,13 @@ abstract class StoragesController extends Controller {
 		return null;
 	}
 
+	/**
+	 * Get the user type for this controller, used in validation
+	 *
+	 * @return string BackendService::USER_* constants
+	 */
+	abstract protected function getUserType();
+
 	/**
 	 * Check whether the given storage is available / valid.
 	 *
diff --git a/apps/files_external/controller/userstoragescontroller.php b/apps/files_external/controller/userstoragescontroller.php
index 0d41e088a7..801c9ab0aa 100644
--- a/apps/files_external/controller/userstoragescontroller.php
+++ b/apps/files_external/controller/userstoragescontroller.php
@@ -61,38 +61,6 @@ class UserStoragesController extends StoragesController {
 		);
 	}
 
-	/**
-	 * Validate storage config
-	 *
-	 * @param StorageConfig $storage storage config
-	 *
-	 * @return DataResponse|null returns response in case of validation error
-	 */
-	protected function validate(StorageConfig $storage) {
-		$result = parent::validate($storage);
-
-		if ($result !== null) {
-			return $result;
-		}
-
-		// Verify that the mount point applies for the current user
-		// Prevent non-admin users from mounting local storage and other disabled backends
-		/** @var Backend */
-		$backend = $storage->getBackend();
-		if (!$backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) {
-			return new DataResponse(
-				array(
-					'message' => (string)$this->l10n->t('Admin-only storage backend "%s"', [
-						$storage->getBackend()->getIdentifier()
-					])
-				),
-				Http::STATUS_UNPROCESSABLE_ENTITY
-			);
-		}
-
-		return null;
-	}
-
 	/**
 	 * Return storage
 	 *
@@ -135,7 +103,7 @@ class UserStoragesController extends StoragesController {
 			return $newStorage;
 		}
 
-		$response = $this->validate($newStorage);
+		$response = $this->validate($newStorage, BackendService::PERMISSION_CREATE);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -183,7 +151,7 @@ class UserStoragesController extends StoragesController {
 		}
 		$storage->setId($id);
 
-		$response = $this->validate($storage);
+		$response = $this->validate($storage, BackendService::PERMISSION_MODIFY);
 		if (!empty($response)) {
 			return $response;
 		}
@@ -218,4 +186,14 @@ class UserStoragesController extends StoragesController {
 	public function destroy($id) {
 		return parent::destroy($id);
 	}
+
+	/**
+	 * Get the user type for this controller, used in validation
+	 *
+	 * @return string BackendService::USER_* constants
+	 */
+	protected function getUserType() {
+		return BackendService::USER_PERSONAL;
+	}
+
 }
diff --git a/apps/files_external/js/dropbox.js b/apps/files_external/js/dropbox.js
deleted file mode 100644
index 53b5d5d666..0000000000
--- a/apps/files_external/js/dropbox.js
+++ /dev/null
@@ -1,111 +0,0 @@
-$(document).ready(function() {
-
-	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox').each(function() {
-		var configured = $(this).find('[data-parameter="configured"]');
-		if ($(configured).val() == 'true') {
-			$(this).find('.configuration input').attr('disabled', 'disabled');
-			$(this).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
-		} else {
-			var app_key = $(this).find('.configuration [data-parameter="app_key"]').val();
-			var app_secret = $(this).find('.configuration [data-parameter="app_secret"]').val();
-			var config = $(this).find('.configuration');
-			if (app_key != '' && app_secret != '') {
-				var pos = window.location.search.indexOf('oauth_token') + 12;
-				var token = $(this).find('.configuration [data-parameter="token"]');
-				if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
-					var token_secret = $(this).find('.configuration [data-parameter="token_secret"]');
-					var tr = $(this);
-					var statusSpan = $(tr).find('.status span');
-					statusSpan.removeClass();
-					statusSpan.addClass('waiting');
-					$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 2, app_key: app_key, app_secret: app_secret, request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
-						if (result && result.status == 'success') {
-							$(token).val(result.access_token);
-							$(token_secret).val(result.access_token_secret);
-							$(configured).val('true');
-							OCA.External.Settings.mountConfig.saveStorageConfig(tr, function(status) {
-								if (status) {
-									$(tr).find('.configuration input').attr('disabled', 'disabled');
-									$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
-								}
-							});
-						} else {
-							OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage'));
-						}
-					});
-				}
-			} else {
-				onDropboxInputsChange($(this));
-			}
-		}
-	});
-
-	$('#externalStorage').on('paste', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox td', function() {
-		var tr = $(this).parent();
-		setTimeout(function() {
-			onDropboxInputsChange(tr);
-		}, 20);
-	});
-
-	$('#externalStorage').on('keyup', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox td', function() {
-		onDropboxInputsChange($(this).parent());
-	});
-
-	$('#externalStorage').on('change', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Dropbox .chzn-select', function() {
-		onDropboxInputsChange($(this).parent().parent());
-	});
-
-	function onDropboxInputsChange(tr) {
-		if ($(tr).find('[data-parameter="configured"]').val() != 'true') {
-			var config = $(tr).find('.configuration');
-			if ($(tr).find('.mountPoint input').val() != ''
-				&& $(config).find('[data-parameter="app_key"]').val() != ''
-				&& $(config).find('[data-parameter="app_secret"]').val() != ''
-				&& ($(tr).find('.chzn-select').length == 0
-				|| $(tr).find('.chzn-select').val() != null))
-			{
-				if ($(tr).find('.dropbox').length == 0) {
-					$(config).append($(document.createElement('input'))
-						.addClass('button dropbox')
-						.attr('type', 'button')
-						.attr('value', t('files_external', 'Grant access')));
-				} else {
-					$(tr).find('.dropbox').show();
-				}
-			} else if ($(tr).find('.dropbox').length > 0) {
-				$(tr).find('.dropbox').hide();
-			}
-		}
-	}
-
-	$('#externalStorage').on('click', '.dropbox', function(event) {
-		event.preventDefault();
-		var tr = $(this).parent().parent();
-		var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
-		var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();
-		if (app_key != '' && app_secret != '') {
-			var tr = $(this).parent().parent();
-			var configured = $(this).parent().find('[data-parameter="configured"]');
-			var token = $(this).parent().find('[data-parameter="token"]');
-			var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
-			$.post(OC.filePath('files_external', 'ajax', 'dropbox.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: location.protocol + '//' + location.host + location.pathname }, function(result) {
-				if (result && result.status == 'success') {
-					$(configured).val('false');
-					$(token).val(result.data.request_token);
-					$(token_secret).val(result.data.request_token_secret);
-					OCA.External.Settings.mountConfig.saveStorageConfig(tr, function() {
-						window.location = result.data.url;
-					});
-				} else {
-					OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring Dropbox storage'));
-				}
-			});
-		} else {
-			OC.dialogs.alert(
-				t('files_external', 'Please provide a valid Dropbox app key and secret.'),
-				t('files_external', 'Error configuring Dropbox storage')
-			);
-		}
-	});
-
-});
diff --git a/apps/files_external/js/google.js b/apps/files_external/js/google.js
deleted file mode 100644
index 648538f802..0000000000
--- a/apps/files_external/js/google.js
+++ /dev/null
@@ -1,131 +0,0 @@
-$(document).ready(function() {
-
-	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google').each(function() {
-		var configured = $(this).find('[data-parameter="configured"]');
-		if ($(configured).val() == 'true') {
-			$(this).find('.configuration input').attr('disabled', 'disabled');
-			$(this).find('.configuration').append($('<span/>').attr('id', 'access')
-				.text(t('files_external', 'Access granted')));
-		} else {
-			var client_id = $(this).find('.configuration [data-parameter="client_id"]').val();
-			var client_secret = $(this).find('.configuration [data-parameter="client_secret"]')
-				.val();
-			if (client_id != '' && client_secret != '') {
-				var params = {};
-				window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
-					params[key] = value;
-				});
-				if (params['code'] !== undefined) {
-					var tr = $(this);
-					var token = $(this).find('.configuration [data-parameter="token"]');
-					var statusSpan = $(tr).find('.status span');
-					statusSpan.removeClass();
-					statusSpan.addClass('waiting');
-					$.post(OC.filePath('files_external', 'ajax', 'google.php'),
-						{
-							step: 2,
-							client_id: client_id,
-							client_secret: client_secret,
-							redirect: location.protocol + '//' + location.host + location.pathname,
-							code: params['code'],
-						}, function(result) {
-							if (result && result.status == 'success') {
-								$(token).val(result.data.token);
-								$(configured).val('true');
-								OCA.External.Settings.mountConfig.saveStorageConfig(tr, function(status) {
-									if (status) {
-										$(tr).find('.configuration input').attr('disabled', 'disabled');
-										$(tr).find('.configuration').append($('<span/>')
-											.attr('id', 'access')
-											.text(t('files_external', 'Access granted')));
-									}
-								});
-							} else {
-								OC.dialogs.alert(result.data.message,
-									t('files_external', 'Error configuring Google Drive storage')
-								);
-							}
-						}
-					);
-				}
-			} else {
-				onGoogleInputsChange($(this));
-			}
-		}
-	});
-
-	$('#externalStorage').on('paste', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td',
-		function() {
-			var tr = $(this).parent();
-			setTimeout(function() {
-				onGoogleInputsChange(tr);
-			}, 20);
-		}
-	);
-
-	$('#externalStorage').on('keyup', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google td',
-		function() {
-			onGoogleInputsChange($(this).parent());
-		}
-	);
-
-	$('#externalStorage').on('change', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\Google .chzn-select'
-		, function() {
-			onGoogleInputsChange($(this).parent().parent());
-		}
-	);
-
-	function onGoogleInputsChange(tr) {
-		if ($(tr).find('[data-parameter="configured"]').val() != 'true') {
-			var config = $(tr).find('.configuration');
-			if ($(tr).find('.mountPoint input').val() != ''
-				&& $(config).find('[data-parameter="client_id"]').val() != ''
-				&& $(config).find('[data-parameter="client_secret"]').val() != ''
-				&& ($(tr).find('.chzn-select').length == 0
-				|| $(tr).find('.chzn-select').val() != null))
-			{
-				if ($(tr).find('.google').length == 0) {
-					$(config).append($(document.createElement('input')).addClass('button google')
-						.attr('type', 'button')
-						.attr('value', t('files_external', 'Grant access')));
-				} else {
-					$(tr).find('.google').show();
-				}
-			} else if ($(tr).find('.google').length > 0) {
-				$(tr).find('.google').hide();
-			}
-		}
-	}
-
-	$('#externalStorage').on('click', '.google', function(event) {
-		event.preventDefault();
-		var tr = $(this).parent().parent();
-		var configured = $(this).parent().find('[data-parameter="configured"]');
-		var client_id = $(this).parent().find('[data-parameter="client_id"]').val();
-		var client_secret = $(this).parent().find('[data-parameter="client_secret"]').val();
-		if (client_id != '' && client_secret != '') {
-			var token = $(this).parent().find('[data-parameter="token"]');
-			$.post(OC.filePath('files_external', 'ajax', 'google.php'),
-				{
-					step: 1,
-					client_id: client_id,
-					client_secret: client_secret,
-					redirect: location.protocol + '//' + location.host + location.pathname,
-				}, function(result) {
-					if (result && result.status == 'success') {
-						$(configured).val('false');
-						$(token).val('false');
-						OCA.External.Settings.mountConfig.saveStorageConfig(tr, function(status) {
-							window.location = result.data.url;
-						});
-					} else {
-						OC.dialogs.alert(result.data.message,
-							t('files_external', 'Error configuring Google Drive storage')
-						);
-					}
-				}
-			);
-		}
-	});
-
-});
diff --git a/apps/files_external/js/oauth1.js b/apps/files_external/js/oauth1.js
new file mode 100644
index 0000000000..47aca36871
--- /dev/null
+++ b/apps/files_external/js/oauth1.js
@@ -0,0 +1,78 @@
+$(document).ready(function() {
+
+	OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme) {
+		if (authMechanism === 'oauth1::oauth1') {
+			var config = $tr.find('.configuration');
+			config.append($(document.createElement('input'))
+				.addClass('button auth-param')
+				.attr('type', 'button')
+				.attr('value', t('files_external', 'Grant access'))
+				.attr('name', 'oauth1_grant')
+			);
+
+			var configured = $tr.find('[data-parameter="configured"]');
+			if ($(configured).val() == 'true') {
+				$tr.find('.configuration input').attr('disabled', 'disabled');
+				$tr.find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
+			} else {
+				var app_key = $tr.find('.configuration [data-parameter="app_key"]').val();
+				var app_secret = $tr.find('.configuration [data-parameter="app_secret"]').val();
+				if (app_key != '' && app_secret != '') {
+					var pos = window.location.search.indexOf('oauth_token') + 12;
+					var token = $tr.find('.configuration [data-parameter="token"]');
+					if (pos != -1 && window.location.search.substr(pos, $(token).val().length) == $(token).val()) {
+						var token_secret = $tr.find('.configuration [data-parameter="token_secret"]');
+						var statusSpan = $tr.find('.status span');
+						statusSpan.removeClass();
+						statusSpan.addClass('waiting');
+						$.post(OC.filePath('files_external', 'ajax', 'oauth1.php'), { step: 2, app_key: app_key, app_secret: app_secret, request_token: $(token).val(), request_token_secret: $(token_secret).val() }, function(result) {
+							if (result && result.status == 'success') {
+								$(token).val(result.access_token);
+								$(token_secret).val(result.access_token_secret);
+								$(configured).val('true');
+								OCA.External.Settings.mountConfig.saveStorageConfig($tr, function(status) {
+									if (status) {
+										$tr.find('.configuration input').attr('disabled', 'disabled');
+										$tr.find('.configuration').append('<span id="access" style="padding-left:0.5em;">'+t('files_external', 'Access granted')+'</span>');
+									}
+								});
+							} else {
+								OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring OAuth1'));
+							}
+						});
+					}
+				}
+			}
+		}
+	});
+
+	$('#externalStorage').on('click', '[name="oauth1_grant"]', function(event) {
+		event.preventDefault();
+		var tr = $(this).parent().parent();
+		var app_key = $(this).parent().find('[data-parameter="app_key"]').val();
+		var app_secret = $(this).parent().find('[data-parameter="app_secret"]').val();
+		if (app_key != '' && app_secret != '') {
+			var configured = $(this).parent().find('[data-parameter="configured"]');
+			var token = $(this).parent().find('[data-parameter="token"]');
+			var token_secret = $(this).parent().find('[data-parameter="token_secret"]');
+			$.post(OC.filePath('files_external', 'ajax', 'oauth1.php'), { step: 1, app_key: app_key, app_secret: app_secret, callback: location.protocol + '//' + location.host + location.pathname }, function(result) {
+				if (result && result.status == 'success') {
+					$(configured).val('false');
+					$(token).val(result.data.request_token);
+					$(token_secret).val(result.data.request_token_secret);
+					OCA.External.Settings.mountConfig.saveStorageConfig(tr, function() {
+						window.location = result.data.url;
+					});
+				} else {
+					OC.dialogs.alert(result.data.message, t('files_external', 'Error configuring OAuth1'));
+				}
+			});
+		} else {
+			OC.dialogs.alert(
+				t('files_external', 'Please provide a valid app key and secret.'),
+				t('files_external', 'Error configuring OAuth1')
+			);
+		}
+	});
+
+});
diff --git a/apps/files_external/js/oauth2.js b/apps/files_external/js/oauth2.js
new file mode 100644
index 0000000000..8494143742
--- /dev/null
+++ b/apps/files_external/js/oauth2.js
@@ -0,0 +1,95 @@
+$(document).ready(function() {
+
+	OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme) {
+		if (authMechanism === 'oauth2::oauth2') {
+			var config = $tr.find('.configuration');
+			config.append($(document.createElement('input'))
+				.addClass('button auth-param')
+				.attr('type', 'button')
+				.attr('value', t('files_external', 'Grant access'))
+				.attr('name', 'oauth2_grant')
+			);
+
+			var configured = $tr.find('[data-parameter="configured"]');
+			if ($(configured).val() == 'true') {
+				$tr.find('.configuration input').attr('disabled', 'disabled');
+				$tr.find('.configuration').append($('<span/>').attr('id', 'access')
+						.text(t('files_external', 'Access granted')));
+			} else {
+				var client_id = $tr.find('.configuration [data-parameter="client_id"]').val();
+				var client_secret = $tr.find('.configuration [data-parameter="client_secret"]')
+					.val();
+				if (client_id != '' && client_secret != '') {
+					var params = {};
+					window.location.href.replace(/[?&]+([^=&]+)=([^&]*)/gi, function(m, key, value) {
+						params[key] = value;
+					});
+					if (params['code'] !== undefined) {
+						var token = $tr.find('.configuration [data-parameter="token"]');
+						var statusSpan = $tr.find('.status span');
+						statusSpan.removeClass();
+						statusSpan.addClass('waiting');
+						$.post(OC.filePath('files_external', 'ajax', 'oauth2.php'),
+								{
+									step: 2,
+									client_id: client_id,
+									client_secret: client_secret,
+									redirect: location.protocol + '//' + location.host + location.pathname,
+									code: params['code'],
+								}, function(result) {
+									if (result && result.status == 'success') {
+										$(token).val(result.data.token);
+										$(configured).val('true');
+										OCA.External.Settings.mountConfig.saveStorageConfig($tr, function(status) {
+											if (status) {
+												$tr.find('.configuration input').attr('disabled', 'disabled');
+												$tr.find('.configuration').append($('<span/>')
+														.attr('id', 'access')
+														.text(t('files_external', 'Access granted')));
+											}
+										});
+									} else {
+										OC.dialogs.alert(result.data.message,
+												t('files_external', 'Error configuring OAuth2')
+												);
+									}
+								}
+						);
+					}
+				}
+			}
+		}
+	});
+
+	$('#externalStorage').on('click', '[name="oauth2_grant"]', function(event) {
+		event.preventDefault();
+		var tr = $(this).parent().parent();
+		var configured = $(this).parent().find('[data-parameter="configured"]');
+		var client_id = $(this).parent().find('[data-parameter="client_id"]').val();
+		var client_secret = $(this).parent().find('[data-parameter="client_secret"]').val();
+		if (client_id != '' && client_secret != '') {
+			var token = $(this).parent().find('[data-parameter="token"]');
+			$.post(OC.filePath('files_external', 'ajax', 'oauth2.php'),
+				{
+					step: 1,
+					client_id: client_id,
+					client_secret: client_secret,
+					redirect: location.protocol + '//' + location.host + location.pathname,
+				}, function(result) {
+					if (result && result.status == 'success') {
+						$(configured).val('false');
+						$(token).val('false');
+						OCA.External.Settings.mountConfig.saveStorageConfig(tr, function(status) {
+							window.location = result.data.url;
+						});
+					} else {
+						OC.dialogs.alert(result.data.message,
+							t('files_external', 'Error configuring OAuth2')
+						);
+					}
+				}
+			);
+		}
+	});
+
+});
diff --git a/apps/files_external/js/public_key.js b/apps/files_external/js/public_key.js
new file mode 100644
index 0000000000..a854606745
--- /dev/null
+++ b/apps/files_external/js/public_key.js
@@ -0,0 +1,46 @@
+$(document).ready(function() {
+
+	OCA.External.Settings.mountConfig.whenSelectAuthMechanism(function($tr, authMechanism, scheme) {
+		if (scheme === 'publickey') {
+			var config = $tr.find('.configuration');
+			if ($(config).find('[name="public_key_generate"]').length === 0) {
+				setupTableRow($tr, config);
+			}
+		}
+	});
+
+	$('#externalStorage').on('click', '[name="public_key_generate"]', function(event) {
+		event.preventDefault();
+		var tr = $(this).parent().parent();
+		generateKeys(tr);
+	});
+
+	function setupTableRow(tr, config) {
+		$(config).append($(document.createElement('input'))
+			.addClass('button auth-param')
+			.attr('type', 'button')
+			.attr('value', t('files_external', 'Generate keys'))
+			.attr('name', 'public_key_generate')
+		);
+		// If there's no private key, build one
+		if (0 === $(config).find('[data-parameter="private_key"]').val().length) {
+			generateKeys(tr);
+		}
+	}
+
+	function generateKeys(tr) {
+		var config = $(tr).find('.configuration');
+
+		$.post(OC.filePath('files_external', 'ajax', 'public_key.php'), {}, function(result) {
+			if (result && result.status === 'success') {
+				$(config).find('[data-parameter="public_key"]').val(result.data.public_key);
+				$(config).find('[data-parameter="private_key"]').val(result.data.private_key);
+				OCA.External.Settings.mountConfig.saveStorageConfig(tr, function() {
+					// Nothing to do
+				});
+			} else {
+				OC.dialogs.alert(result.data.message, t('files_external', 'Error generating key pair') );
+			}
+		});
+	}
+});
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index d3e20e3844..bf9981adab 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -550,7 +550,7 @@ var MountConfigListView = function($el, options) {
 /**
  * @memberOf OCA.External.Settings
  */
-MountConfigListView.prototype = {
+MountConfigListView.prototype = _.extend({
 
 	/**
 	 * jQuery element containing the config list
@@ -644,11 +644,31 @@ MountConfigListView.prototype = {
 
 		addSelect2(this.$el.find('tr:not(#addMountPoint) .applicableUsers'), this._userListLimit);
 
-		this.$el.find('tr:not(#addMountPoint)').each(function(i, tr) {
+		this._initEvents();
+
+		this.$el.find('tbody tr:not(#addMountPoint)').each(function(i, tr) {
 			self.recheckStorageConfig($(tr));
 		});
+	},
 
-		this._initEvents();
+	/**
+	 * Custom JS event handlers
+	 * Trigger callback for all existing configurations
+	 */
+	whenSelectBackend: function(callback) {
+		this.$el.find('tbody tr:not(#addMountPoint)').each(function(i, tr) {
+			var backend = $(tr).find('.backend').data('class');
+			callback($(tr), backend);
+		});
+		this.on('selectBackend', callback);
+	},
+	whenSelectAuthMechanism: function(callback) {
+		var self = this;
+		this.$el.find('tbody tr:not(#addMountPoint)').each(function(i, tr) {
+			var authMechanism = $(tr).find('.selectAuthMechanism').val();
+			callback($(tr), authMechanism, self._allAuthMechanisms[authMechanism]['scheme']);
+		});
+		this.on('selectAuthMechanism', callback);
 	},
 
 	/**
@@ -728,12 +748,21 @@ MountConfigListView.prototype = {
 		var $td = $tr.find('td.configuration');
 		$.each(backendConfiguration['configuration'], _.partial(this.writeParameterInput, $td));
 
+		this.trigger('selectBackend', $tr, backend);
+
 		selectAuthMechanism.trigger('change'); // generate configuration parameters for auth mechanism
 
 		var priorityEl = $('<input type="hidden" class="priority" value="' + backendConfiguration['priority'] + '" />');
 		$tr.append(priorityEl);
 		$td.children().not('[type=hidden]').first().focus();
 
+		// FIXME default backend mount options
+		$tr.find('input.mountOptions').val(JSON.stringify({
+			'encrypt': true,
+			'previews': true,
+			'filesystem_check_changes': 1
+		}));
+
 		$tr.find('td').last().attr('class', 'remove');
 		$tr.find('td.mountOptionsToggle').removeClass('hidden');
 		$tr.find('td').last().removeAttr('style');
@@ -758,6 +787,10 @@ MountConfigListView.prototype = {
 			this.writeParameterInput, $td, _, _, ['auth-param']
 		));
 
+		this.trigger('selectAuthMechanism',
+			$tr, authMechanism, authMechanismConfiguration['scheme']
+		);
+
 		if ($tr.data('constructing') !== true) {
 			// row is ready, trigger recheck
 			this.saveStorageConfig($tr);
@@ -1045,7 +1078,7 @@ MountConfigListView.prototype = {
 			self.saveStorageConfig($tr);
 		});
 	}
-};
+}, OC.Backbone.Events);
 
 $(document).ready(function() {
 	var enabled = $('#files_external').attr('data-encryption-enabled');
diff --git a/apps/files_external/js/sftp_key.js b/apps/files_external/js/sftp_key.js
deleted file mode 100644
index 55b11b1fac..0000000000
--- a/apps/files_external/js/sftp_key.js
+++ /dev/null
@@ -1,53 +0,0 @@
-$(document).ready(function() {
-
-	$('#externalStorage tbody tr.\\\\OC\\\\Files\\\\Storage\\\\SFTP_Key').each(function() {
-		var tr = $(this);
-		var config = $(tr).find('.configuration');
-		if ($(config).find('.sftp_key').length === 0) {
-			setupTableRow(tr, config);
-		}
-	});
-
-	// We can't catch the DOM elements being added, but we can pick up when
-	// they receive focus
-	$('#externalStorage').on('focus', 'tbody tr.\\\\OC\\\\Files\\\\Storage\\\\SFTP_Key', function() {
-		var tr = $(this);
-		var config = $(tr).find('.configuration');
-
-		if ($(config).find('.sftp_key').length === 0) {
-			setupTableRow(tr, config);
-		}
-	});
-
-	$('#externalStorage').on('click', '.sftp_key', function(event) {
-		event.preventDefault();
-		var tr = $(this).parent().parent();
-		generateKeys(tr);
-	});
-
-	function setupTableRow(tr, config) {
-		$(config).append($(document.createElement('input')).addClass('button sftp_key')
-			.attr('type', 'button')
-			.attr('value', t('files_external', 'Generate keys')));
-		// If there's no private key, build one
-		if (0 === $(config).find('[data-parameter="private_key"]').val().length) {
-			generateKeys(tr);
-		}
-	}
-
-	function generateKeys(tr) {
-		var config = $(tr).find('.configuration');
-
-		$.post(OC.filePath('files_external', 'ajax', 'sftp_key.php'), {}, function(result) {
-			if (result && result.status === 'success') {
-				$(config).find('[data-parameter="public_key"]').val(result.data.public_key);
-				$(config).find('[data-parameter="private_key"]').val(result.data.private_key);
-				OCA.External.mountConfig.saveStorageConfig(tr, function() {
-					// Nothing to do
-				});
-			} else {
-				OC.dialogs.alert(result.data.message, t('files_external', 'Error generating key pair') );
-			}
-		});
-	}
-});
diff --git a/apps/files_external/l10n/af_ZA.js b/apps/files_external/l10n/af_ZA.js
index 1c56071d43..d28e14d67c 100644
--- a/apps/files_external/l10n/af_ZA.js
+++ b/apps/files_external/l10n/af_ZA.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Personal" : "Persoonlik",
     "Username" : "Gebruikersnaam",
     "Password" : "Wagwoord",
-    "Share" : "Deel",
-    "Personal" : "Persoonlik"
+    "Share" : "Deel"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/af_ZA.json b/apps/files_external/l10n/af_ZA.json
index ddb1414664..53622f796f 100644
--- a/apps/files_external/l10n/af_ZA.json
+++ b/apps/files_external/l10n/af_ZA.json
@@ -1,7 +1,7 @@
 { "translations": {
+    "Personal" : "Persoonlik",
     "Username" : "Gebruikersnaam",
     "Password" : "Wagwoord",
-    "Share" : "Deel",
-    "Personal" : "Persoonlik"
+    "Share" : "Deel"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/ar.js b/apps/files_external/l10n/ar.js
index 174b0d1d54..3e7438796f 100644
--- a/apps/files_external/l10n/ar.js
+++ b/apps/files_external/l10n/ar.js
@@ -1,27 +1,26 @@
 OC.L10N.register(
     "files_external",
     {
-    "Local" : "محلي",
-    "Location" : "المكان",
-    "Key" : "المفتاح",
-    "Secret" : "سر",
-    "Bucket" : "الحزمة",
-    "Access Key" : "مفتاح الدخول",
-    "Secret Key" : "المفتاح السري",
-    "Hostname" : "إسم الإستضافة",
-    "Port" : "المنفذ",
-    "Region" : "المنطقة",
-    "App key" : "مفتاح التطبيق",
-    "App secret" : "التطبيق السري",
-    "Host" : "المضيف",
-    "Username" : "إسم المستخدم",
-    "Password" : "كلمة السر",
-    "Share" : "شارك",
-    "URL" : "عنوان الموقع",
     "Personal" : "شخصي",
     "System" : "النظام",
     "Never" : "أبدا",
     "Saved" : "حفظ",
+    "None" : "لا شيء",
+    "App key" : "مفتاح التطبيق",
+    "App secret" : "التطبيق السري",
+    "Username" : "إسم المستخدم",
+    "Password" : "كلمة السر",
+    "Bucket" : "الحزمة",
+    "Hostname" : "إسم الإستضافة",
+    "Port" : "المنفذ",
+    "Region" : "المنطقة",
+    "WebDAV" : "WebDAV",
+    "URL" : "عنوان الموقع",
+    "Host" : "المضيف",
+    "Local" : "محلي",
+    "Location" : "المكان",
+    "ownCloud" : "ownCloud",
+    "Share" : "شارك",
     "Name" : "اسم",
     "Folder name" : "اسم المجلد",
     "Configuration" : "إعداد",
diff --git a/apps/files_external/l10n/ar.json b/apps/files_external/l10n/ar.json
index 582813959d..29423a0790 100644
--- a/apps/files_external/l10n/ar.json
+++ b/apps/files_external/l10n/ar.json
@@ -1,25 +1,24 @@
 { "translations": {
-    "Local" : "محلي",
-    "Location" : "المكان",
-    "Key" : "المفتاح",
-    "Secret" : "سر",
-    "Bucket" : "الحزمة",
-    "Access Key" : "مفتاح الدخول",
-    "Secret Key" : "المفتاح السري",
-    "Hostname" : "إسم الإستضافة",
-    "Port" : "المنفذ",
-    "Region" : "المنطقة",
-    "App key" : "مفتاح التطبيق",
-    "App secret" : "التطبيق السري",
-    "Host" : "المضيف",
-    "Username" : "إسم المستخدم",
-    "Password" : "كلمة السر",
-    "Share" : "شارك",
-    "URL" : "عنوان الموقع",
     "Personal" : "شخصي",
     "System" : "النظام",
     "Never" : "أبدا",
     "Saved" : "حفظ",
+    "None" : "لا شيء",
+    "App key" : "مفتاح التطبيق",
+    "App secret" : "التطبيق السري",
+    "Username" : "إسم المستخدم",
+    "Password" : "كلمة السر",
+    "Bucket" : "الحزمة",
+    "Hostname" : "إسم الإستضافة",
+    "Port" : "المنفذ",
+    "Region" : "المنطقة",
+    "WebDAV" : "WebDAV",
+    "URL" : "عنوان الموقع",
+    "Host" : "المضيف",
+    "Local" : "محلي",
+    "Location" : "المكان",
+    "ownCloud" : "ownCloud",
+    "Share" : "شارك",
     "Name" : "اسم",
     "Folder name" : "اسم المجلد",
     "Configuration" : "إعداد",
diff --git a/apps/files_external/l10n/ast.js b/apps/files_external/l10n/ast.js
index 3b3f06a712..b6084cc154 100644
--- a/apps/files_external/l10n/ast.js
+++ b/apps/files_external/l10n/ast.js
@@ -1,58 +1,46 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.",
     "Step 1 failed. Exception: %s" : "Pasu 1 fallíu. Esceición: %s",
     "Step 2 failed. Exception: %s" : "Pasu 2 fallíu. Esceición: %s",
     "External storage" : "Almacenamientu esternu",
-    "Local" : "Llocal",
-    "Location" : "Llocalización",
+    "Personal" : "Personal",
+    "System" : "Sistema",
+    "Grant access" : "Conceder accesu",
+    "Access granted" : "Accesu concedíu",
+    "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.",
+    "(group)" : "(grupu)",
+    "Saved" : "Guardáu",
+    "None" : "Dengún",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "Client ID" : "ID de veceru",
+    "Client secret" : "Veceru secretu",
+    "Username" : "Nome d'usuariu",
+    "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secretu",
     "Bucket" : "Depósitu",
-    "Amazon S3 and compliant" : "Amazon S3 y compatibilidá",
-    "Access Key" : "Clave d'accesu",
-    "Secret Key" : "Clave Secreta",
     "Hostname" : "Nome d'agospiu",
     "Port" : "Puertu",
     "Region" : "Rexón",
     "Enable SSL" : "Habilitar SSL",
     "Enable Path Style" : "Habilitar Estilu de ruta",
-    "App key" : "App principal",
-    "App secret" : "App secreta",
-    "Host" : "Sirvidor",
-    "Username" : "Nome d'usuariu",
-    "Password" : "Contraseña",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "ID de veceru",
-    "Client secret" : "Veceru secretu",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Rexón (opcional pa OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (necesaria pa Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome d'inquilín (necesariu pa OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (necesaria pa OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempu d'espera de peticiones HTTP en segundos",
-    "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
-    "Username as share" : "Nome d'usuariu como Compartición",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
     "Secure https://" : "Secure https://",
-    "Public key" : "Clave pública",
-    "Access granted" : "Accesu concedíu",
-    "Error configuring Dropbox storage" : "Fallu configurando l'almacenamientu de Dropbox",
-    "Grant access" : "Conceder accesu",
-    "Error configuring Google Drive storage" : "Fallu configurando l'almacenamientu de Google Drive",
-    "Personal" : "Personal",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.",
-    "(group)" : "(grupu)",
-    "Saved" : "Guardáu",
+    "Dropbox" : "Dropbox",
+    "Host" : "Sirvidor",
+    "Secure ftps://" : "Secure ftps://",
+    "Local" : "Llocal",
+    "Location" : "Llocalización",
+    "ownCloud" : "ownCloud",
+    "Root" : "Raíz",
+    "Share" : "Compartir",
+    "Username as share" : "Nome d'usuariu como Compartición",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
@@ -64,8 +52,8 @@ OC.L10N.register(
     "Folder name" : "Nome de la carpeta",
     "Configuration" : "Configuración",
     "Available for" : "Disponible pa",
-    "Add storage" : "Amestar almacenamientu",
     "Delete" : "Desaniciar",
+    "Add storage" : "Amestar almacenamientu",
     "Enable User External Storage" : "Habilitar almacenamientu esterno d'usuariu",
     "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamientu esternu"
 },
diff --git a/apps/files_external/l10n/ast.json b/apps/files_external/l10n/ast.json
index c2a2d20575..ccf882952a 100644
--- a/apps/files_external/l10n/ast.json
+++ b/apps/files_external/l10n/ast.json
@@ -1,56 +1,44 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.",
     "Step 1 failed. Exception: %s" : "Pasu 1 fallíu. Esceición: %s",
     "Step 2 failed. Exception: %s" : "Pasu 2 fallíu. Esceición: %s",
     "External storage" : "Almacenamientu esternu",
-    "Local" : "Llocal",
-    "Location" : "Llocalización",
+    "Personal" : "Personal",
+    "System" : "Sistema",
+    "Grant access" : "Conceder accesu",
+    "Access granted" : "Accesu concedíu",
+    "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.",
+    "(group)" : "(grupu)",
+    "Saved" : "Guardáu",
+    "None" : "Dengún",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "Client ID" : "ID de veceru",
+    "Client secret" : "Veceru secretu",
+    "Username" : "Nome d'usuariu",
+    "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Public key" : "Clave pública",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secretu",
     "Bucket" : "Depósitu",
-    "Amazon S3 and compliant" : "Amazon S3 y compatibilidá",
-    "Access Key" : "Clave d'accesu",
-    "Secret Key" : "Clave Secreta",
     "Hostname" : "Nome d'agospiu",
     "Port" : "Puertu",
     "Region" : "Rexón",
     "Enable SSL" : "Habilitar SSL",
     "Enable Path Style" : "Habilitar Estilu de ruta",
-    "App key" : "App principal",
-    "App secret" : "App secreta",
-    "Host" : "Sirvidor",
-    "Username" : "Nome d'usuariu",
-    "Password" : "Contraseña",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "ID de veceru",
-    "Client secret" : "Veceru secretu",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Rexón (opcional pa OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (necesaria pa Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome d'inquilín (necesariu pa OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (necesaria pa OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempu d'espera de peticiones HTTP en segundos",
-    "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
-    "Username as share" : "Nome d'usuariu como Compartición",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
     "Secure https://" : "Secure https://",
-    "Public key" : "Clave pública",
-    "Access granted" : "Accesu concedíu",
-    "Error configuring Dropbox storage" : "Fallu configurando l'almacenamientu de Dropbox",
-    "Grant access" : "Conceder accesu",
-    "Error configuring Google Drive storage" : "Fallu configurando l'almacenamientu de Google Drive",
-    "Personal" : "Personal",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.",
-    "(group)" : "(grupu)",
-    "Saved" : "Guardáu",
+    "Dropbox" : "Dropbox",
+    "Host" : "Sirvidor",
+    "Secure ftps://" : "Secure ftps://",
+    "Local" : "Llocal",
+    "Location" : "Llocalización",
+    "ownCloud" : "ownCloud",
+    "Root" : "Raíz",
+    "Share" : "Compartir",
+    "Username as share" : "Nome d'usuariu como Compartición",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP nun ta activáu o instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
@@ -62,8 +50,8 @@
     "Folder name" : "Nome de la carpeta",
     "Configuration" : "Configuración",
     "Available for" : "Disponible pa",
-    "Add storage" : "Amestar almacenamientu",
     "Delete" : "Desaniciar",
+    "Add storage" : "Amestar almacenamientu",
     "Enable User External Storage" : "Habilitar almacenamientu esterno d'usuariu",
     "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamientu esternu"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/az.js b/apps/files_external/l10n/az.js
index 6e28fa378d..9c86576c7f 100644
--- a/apps/files_external/l10n/az.js
+++ b/apps/files_external/l10n/az.js
@@ -1,65 +1,49 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
-    "Please provide a valid Dropbox app key and secret." : "Xahiş olunur düzgün Dropbox proqram açarı və gizlisini təqdim edəsiniz.",
     "Step 1 failed. Exception: %s" : "1-ci addım səhv oldu. İstisna: %s",
     "Step 2 failed. Exception: %s" : "2-ci addım. İstisna: %s",
     "External storage" : "Kənar informasıya daşıyıcısı",
-    "Local" : "Yerli",
-    "Location" : "Yerləşdiyiniz ünvan",
+    "Storage with id \"%i\" not found" : "\"%i\"-li depo tapılmadı",
+    "Invalid mount point" : "Yalnış mount nöqtəsi",
+    "Invalid storage backend \"%s\"" : "Yalnış depo arxasonu \"%s\"",
+    "Personal" : "Şəxsi",
+    "System" : "Sistem",
+    "Grant access" : "Yetkinin verilməsi",
+    "Access granted" : "Yetki verildi",
+    "Generate keys" : "Açarları generasiya et",
+    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
+    "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.",
+    "(group)" : "(qrup)",
+    "Saved" : "Saxlanıldı",
+    "None" : "Heç bir",
+    "App key" : "Proqram açarı",
+    "App secret" : "Proqram sirri",
+    "Client ID" : "Müştəri İD-s",
+    "Client secret" : "Müxtəri sirri",
+    "Username" : "İstifadəçi adı",
+    "Password" : "Şifrə",
+    "Public key" : "İctimai açar",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Açar",
-    "Secret" : "Gizli",
     "Bucket" : "Vedrə",
-    "Amazon S3 and compliant" : "Amazon S3 və uyğun",
-    "Access Key" : "Yetki açarı",
-    "Secret Key" : "Gizli açar",
     "Hostname" : "Sahibadı",
     "Port" : "Port",
     "Region" : "Ərazi",
     "Enable SSL" : "SSL-i işə sal",
     "Enable Path Style" : "Ünvan stilini işə sal",
-    "App key" : "Proqram açarı",
-    "App secret" : "Proqram sirri",
-    "Host" : "Şəbəkədə ünvan",
-    "Username" : "İstifadəçi adı",
-    "Password" : "Şifrə",
-    "Remote subfolder" : "Uzaq altqovluğu",
-    "Secure ftps://" : "Təhlükəsiz ftps://",
-    "Client ID" : "Müştəri İD-s",
-    "Client secret" : "Müxtəri sirri",
-    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
-    "Region (optional for OpenStack Object Storage)" : "Ərazi(İstəkdən asılı olaraq OpenStack Obyekt Deposu üçündür)",
-    "API Key (required for Rackspace Cloud Files)" : "API açar (Rackspace Cloud Fayllar üçün tələb edilir)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kirayəçiadı (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Password (required for OpenStack Object Storage)" : "Şifrə (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Service Name (required for OpenStack Object Storage)" : "Servis adi (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Şəxsiyyətin son nöqtəsi URL-i (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Timeout of HTTP requests in seconds" : "HTTP müraciətlər üçün saniyələrlə olan vaxtın bitməsi",
-    "Share" : "Yayımla",
-    "SMB / CIFS using OC login" : "OC login istifadə edir SMB / CIFS",
-    "Username as share" : "Paylaşım üçün istifadəçi adı",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Uzaq altqovluğu",
     "Secure https://" : "Təhlükəsiz https://",
-    "Public key" : "İctimai açar",
-    "Storage with id \"%i\" not found" : "\"%i\"-li depo tapılmadı",
-    "Invalid mount point" : "Yalnış mount nöqtəsi",
-    "Invalid storage backend \"%s\"" : "Yalnış depo arxasonu \"%s\"",
-    "Access granted" : "Yetki verildi",
-    "Error configuring Dropbox storage" : "Dropbox deposunun konfiqurasiyasında səhv baş verdi",
-    "Grant access" : "Yetkinin verilməsi",
-    "Error configuring Google Drive storage" : "Google Drive deposunun konfiqində səgv baş verdi",
-    "Personal" : "Şəxsi",
-    "System" : "Sistem",
-    "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.",
-    "(group)" : "(qrup)",
-    "Saved" : "Saxlanıldı",
-    "Generate keys" : "Açarları generasiya et",
-    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
+    "Dropbox" : "Dropbox",
+    "Host" : "Şəbəkədə ünvan",
+    "Secure ftps://" : "Təhlükəsiz ftps://",
+    "Local" : "Yerli",
+    "Location" : "Yerləşdiyiniz ünvan",
+    "Share" : "Yayımla",
+    "Username as share" : "Paylaşım üçün istifadəçi adı",
+    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
     "<b>Note:</b> " : "<b>Qeyd:</b> ",
-    "and" : "və",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də cURL dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də FTP dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> \"%s\" yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
@@ -72,9 +56,9 @@ OC.L10N.register(
     "Folder name" : "Qovluq adı",
     "Configuration" : "Konfiqurasiya",
     "Available for" : "Üçün mövcuddur",
-    "Add storage" : "Deponu əlavə et",
     "Advanced settings" : "İrəliləmiş quraşdırmalar",
     "Delete" : "Sil",
+    "Add storage" : "Deponu əlavə et",
     "Enable User External Storage" : "İstifadəçi kənar deponu aktivləşdir",
     "Allow users to mount the following external storage" : "Göstərilən kənar deponun bərkidilməsi üçün istifadəçilərə izin ver"
 },
diff --git a/apps/files_external/l10n/az.json b/apps/files_external/l10n/az.json
index e0d8727cb2..fa300deea8 100644
--- a/apps/files_external/l10n/az.json
+++ b/apps/files_external/l10n/az.json
@@ -1,63 +1,47 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
-    "Please provide a valid Dropbox app key and secret." : "Xahiş olunur düzgün Dropbox proqram açarı və gizlisini təqdim edəsiniz.",
     "Step 1 failed. Exception: %s" : "1-ci addım səhv oldu. İstisna: %s",
     "Step 2 failed. Exception: %s" : "2-ci addım. İstisna: %s",
     "External storage" : "Kənar informasıya daşıyıcısı",
-    "Local" : "Yerli",
-    "Location" : "Yerləşdiyiniz ünvan",
+    "Storage with id \"%i\" not found" : "\"%i\"-li depo tapılmadı",
+    "Invalid mount point" : "Yalnış mount nöqtəsi",
+    "Invalid storage backend \"%s\"" : "Yalnış depo arxasonu \"%s\"",
+    "Personal" : "Şəxsi",
+    "System" : "Sistem",
+    "Grant access" : "Yetkinin verilməsi",
+    "Access granted" : "Yetki verildi",
+    "Generate keys" : "Açarları generasiya et",
+    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
+    "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.",
+    "(group)" : "(qrup)",
+    "Saved" : "Saxlanıldı",
+    "None" : "Heç bir",
+    "App key" : "Proqram açarı",
+    "App secret" : "Proqram sirri",
+    "Client ID" : "Müştəri İD-s",
+    "Client secret" : "Müxtəri sirri",
+    "Username" : "İstifadəçi adı",
+    "Password" : "Şifrə",
+    "Public key" : "İctimai açar",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Açar",
-    "Secret" : "Gizli",
     "Bucket" : "Vedrə",
-    "Amazon S3 and compliant" : "Amazon S3 və uyğun",
-    "Access Key" : "Yetki açarı",
-    "Secret Key" : "Gizli açar",
     "Hostname" : "Sahibadı",
     "Port" : "Port",
     "Region" : "Ərazi",
     "Enable SSL" : "SSL-i işə sal",
     "Enable Path Style" : "Ünvan stilini işə sal",
-    "App key" : "Proqram açarı",
-    "App secret" : "Proqram sirri",
-    "Host" : "Şəbəkədə ünvan",
-    "Username" : "İstifadəçi adı",
-    "Password" : "Şifrə",
-    "Remote subfolder" : "Uzaq altqovluğu",
-    "Secure ftps://" : "Təhlükəsiz ftps://",
-    "Client ID" : "Müştəri İD-s",
-    "Client secret" : "Müxtəri sirri",
-    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
-    "Region (optional for OpenStack Object Storage)" : "Ərazi(İstəkdən asılı olaraq OpenStack Obyekt Deposu üçündür)",
-    "API Key (required for Rackspace Cloud Files)" : "API açar (Rackspace Cloud Fayllar üçün tələb edilir)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kirayəçiadı (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Password (required for OpenStack Object Storage)" : "Şifrə (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Service Name (required for OpenStack Object Storage)" : "Servis adi (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Şəxsiyyətin son nöqtəsi URL-i (OpenStack Obyekt Deposu üçün tələb edilir)",
-    "Timeout of HTTP requests in seconds" : "HTTP müraciətlər üçün saniyələrlə olan vaxtın bitməsi",
-    "Share" : "Yayımla",
-    "SMB / CIFS using OC login" : "OC login istifadə edir SMB / CIFS",
-    "Username as share" : "Paylaşım üçün istifadəçi adı",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Uzaq altqovluğu",
     "Secure https://" : "Təhlükəsiz https://",
-    "Public key" : "İctimai açar",
-    "Storage with id \"%i\" not found" : "\"%i\"-li depo tapılmadı",
-    "Invalid mount point" : "Yalnış mount nöqtəsi",
-    "Invalid storage backend \"%s\"" : "Yalnış depo arxasonu \"%s\"",
-    "Access granted" : "Yetki verildi",
-    "Error configuring Dropbox storage" : "Dropbox deposunun konfiqurasiyasında səhv baş verdi",
-    "Grant access" : "Yetkinin verilməsi",
-    "Error configuring Google Drive storage" : "Google Drive deposunun konfiqində səgv baş verdi",
-    "Personal" : "Şəxsi",
-    "System" : "Sistem",
-    "All users. Type to select user or group." : "Sistem istifadəçiləri. Daxil edin ki, istifadəçi və ya qrupu seçəsiniz.",
-    "(group)" : "(qrup)",
-    "Saved" : "Saxlanıldı",
-    "Generate keys" : "Açarları generasiya et",
-    "Error generating key pair" : "Açar cütlüyünün generasiyası səhvi",
+    "Dropbox" : "Dropbox",
+    "Host" : "Şəbəkədə ünvan",
+    "Secure ftps://" : "Təhlükəsiz ftps://",
+    "Local" : "Yerli",
+    "Location" : "Yerləşdiyiniz ünvan",
+    "Share" : "Yayımla",
+    "Username as share" : "Paylaşım üçün istifadəçi adı",
+    "OpenStack Object Storage" : "OpenStack Obyekt Deposu",
     "<b>Note:</b> " : "<b>Qeyd:</b> ",
-    "and" : "və",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də cURL dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> PHP-də FTP dəstəyi aktiv deyil və ya yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Qeyd:</b> \"%s\" yüklənməyib. %s -in birləşdirilməsi mümkün deyil. Xahiş edilir onun yüklənilməsi barəsində inzibatşınıza məlumat verəsiniz.",
@@ -70,9 +54,9 @@
     "Folder name" : "Qovluq adı",
     "Configuration" : "Konfiqurasiya",
     "Available for" : "Üçün mövcuddur",
-    "Add storage" : "Deponu əlavə et",
     "Advanced settings" : "İrəliləmiş quraşdırmalar",
     "Delete" : "Sil",
+    "Add storage" : "Deponu əlavə et",
     "Enable User External Storage" : "İstifadəçi kənar deponu aktivləşdir",
     "Allow users to mount the following external storage" : "Göstərilən kənar deponun bərkidilməsi üçün istifadəçilərə izin ver"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/bg_BG.js b/apps/files_external/l10n/bg_BG.js
index 9c29080c0d..70eae9d1ab 100644
--- a/apps/files_external/l10n/bg_BG.js
+++ b/apps/files_external/l10n/bg_BG.js
@@ -1,64 +1,51 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
-    "Please provide a valid Dropbox app key and secret." : "Моля, задай валидни Dropbox app key и secret.",
     "Step 1 failed. Exception: %s" : "Стъпка 1 - неуспешна. Грешка: %s",
     "Step 2 failed. Exception: %s" : "Стъпка 2 - неуспешна. Грешка: %s",
     "External storage" : "Външно дисково пространство",
-    "Local" : "Локален",
-    "Location" : "Местоположение",
+    "Storage with id \"%i\" not found" : "Хранилище с име \"%i\" не е намерено",
+    "Invalid mount point" : "Невалиден път за мониторане на файлова система",
+    "Personal" : "Личен",
+    "System" : "Системен",
+    "Grant access" : "Разреши достъп",
+    "Access granted" : "Достъпът разрешен",
+    "Generate keys" : "Генериране на криптографски ключове",
+    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
+    "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
+    "(group)" : "(група)",
+    "Saved" : "Запазено",
+    "None" : "Няма",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Потребителско Име",
+    "Password" : "Парола",
+    "API key" : "API ключ",
+    "Public key" : "Публичен ключ",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 и съвместими",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
     "Hostname" : "Сървър",
     "Port" : "Порт",
     "Region" : "Регион",
     "Enable SSL" : "Включи SSL",
     "Enable Path Style" : "Включи Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Сървър",
-    "Username" : "Потребителско Име",
-    "Password" : "Парола",
-    "Remote subfolder" : "Външна подпапка",
-    "Secure ftps://" : "Сигурен ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Регион (незадължително за OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (задължително за Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (задължително за OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Парола (задължително за OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (задължително за OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (задължително за OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout за HTTP заявки в секунди",
-    "Share" : "Споделяне",
-    "SMB / CIFS using OC login" : "SMB / CIFS използвайки OC профил",
-    "Username as share" : "Потребителско име като споделена папка",
+    "WebDAV" : "WebDAV",
     "URL" : "Интернет Адрес",
+    "Remote subfolder" : "Външна подпапка",
     "Secure https://" : "Подсигурен https://",
-    "Public key" : "Публичен ключ",
-    "Storage with id \"%i\" not found" : "Хранилище с име \"%i\" не е намерено",
-    "Invalid mount point" : "Невалиден път за мониторане на файлова система",
-    "Access granted" : "Достъпът разрешен",
-    "Error configuring Dropbox storage" : "Грешка при настройката на Dropbox дисковото пространство.",
-    "Grant access" : "Разреши достъп",
-    "Error configuring Google Drive storage" : "Грешка при настройката на Dropbox дисковото пространство.",
-    "Personal" : "Личен",
-    "System" : "Системен",
-    "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
-    "(group)" : "(група)",
-    "Saved" : "Запазено",
-    "Generate keys" : "Генериране на криптографски ключове",
-    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
+    "Dropbox" : "Dropbox",
+    "Host" : "Сървър",
+    "Secure ftps://" : "Сигурен ftps://",
+    "Local" : "Локален",
+    "Location" : "Местоположение",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Споделяне",
+    "Username as share" : "Потребителско име като споделена папка",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Бележка:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на cURL не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на FTP не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
@@ -71,9 +58,9 @@ OC.L10N.register(
     "Folder name" : "Име на папката",
     "Configuration" : "Настройки",
     "Available for" : "Достъпно за",
-    "Add storage" : "Добави дисково пространство",
     "Advanced settings" : "Разширени настройки",
     "Delete" : "Изтрий",
+    "Add storage" : "Добави дисково пространство",
     "Enable User External Storage" : "Разреши Потребителско Външно Дисково Пространство",
     "Allow users to mount the following external storage" : "Разреши на потребителите да прикачват следното външно дисково пространство"
 },
diff --git a/apps/files_external/l10n/bg_BG.json b/apps/files_external/l10n/bg_BG.json
index 3ae1ded696..731897d4a3 100644
--- a/apps/files_external/l10n/bg_BG.json
+++ b/apps/files_external/l10n/bg_BG.json
@@ -1,62 +1,49 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
-    "Please provide a valid Dropbox app key and secret." : "Моля, задай валидни Dropbox app key и secret.",
     "Step 1 failed. Exception: %s" : "Стъпка 1 - неуспешна. Грешка: %s",
     "Step 2 failed. Exception: %s" : "Стъпка 2 - неуспешна. Грешка: %s",
     "External storage" : "Външно дисково пространство",
-    "Local" : "Локален",
-    "Location" : "Местоположение",
+    "Storage with id \"%i\" not found" : "Хранилище с име \"%i\" не е намерено",
+    "Invalid mount point" : "Невалиден път за мониторане на файлова система",
+    "Personal" : "Личен",
+    "System" : "Системен",
+    "Grant access" : "Разреши достъп",
+    "Access granted" : "Достъпът разрешен",
+    "Generate keys" : "Генериране на криптографски ключове",
+    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
+    "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
+    "(group)" : "(група)",
+    "Saved" : "Запазено",
+    "None" : "Няма",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Потребителско Име",
+    "Password" : "Парола",
+    "API key" : "API ключ",
+    "Public key" : "Публичен ключ",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 и съвместими",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
     "Hostname" : "Сървър",
     "Port" : "Порт",
     "Region" : "Регион",
     "Enable SSL" : "Включи SSL",
     "Enable Path Style" : "Включи Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Сървър",
-    "Username" : "Потребителско Име",
-    "Password" : "Парола",
-    "Remote subfolder" : "Външна подпапка",
-    "Secure ftps://" : "Сигурен ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Регион (незадължително за OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (задължително за Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (задължително за OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Парола (задължително за OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (задължително за OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (задължително за OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout за HTTP заявки в секунди",
-    "Share" : "Споделяне",
-    "SMB / CIFS using OC login" : "SMB / CIFS използвайки OC профил",
-    "Username as share" : "Потребителско име като споделена папка",
+    "WebDAV" : "WebDAV",
     "URL" : "Интернет Адрес",
+    "Remote subfolder" : "Външна подпапка",
     "Secure https://" : "Подсигурен https://",
-    "Public key" : "Публичен ключ",
-    "Storage with id \"%i\" not found" : "Хранилище с име \"%i\" не е намерено",
-    "Invalid mount point" : "Невалиден път за мониторане на файлова система",
-    "Access granted" : "Достъпът разрешен",
-    "Error configuring Dropbox storage" : "Грешка при настройката на Dropbox дисковото пространство.",
-    "Grant access" : "Разреши достъп",
-    "Error configuring Google Drive storage" : "Грешка при настройката на Dropbox дисковото пространство.",
-    "Personal" : "Личен",
-    "System" : "Системен",
-    "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
-    "(group)" : "(група)",
-    "Saved" : "Запазено",
-    "Generate keys" : "Генериране на криптографски ключове",
-    "Error generating key pair" : "Грешка при генериране на криптографски ключове",
+    "Dropbox" : "Dropbox",
+    "Host" : "Сървър",
+    "Secure ftps://" : "Сигурен ftps://",
+    "Local" : "Локален",
+    "Location" : "Местоположение",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Споделяне",
+    "Username as share" : "Потребителско име като споделена папка",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Бележка:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на cURL не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на FTP не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
@@ -69,9 +56,9 @@
     "Folder name" : "Име на папката",
     "Configuration" : "Настройки",
     "Available for" : "Достъпно за",
-    "Add storage" : "Добави дисково пространство",
     "Advanced settings" : "Разширени настройки",
     "Delete" : "Изтрий",
+    "Add storage" : "Добави дисково пространство",
     "Enable User External Storage" : "Разреши Потребителско Външно Дисково Пространство",
     "Allow users to mount the following external storage" : "Разреши на потребителите да прикачват следното външно дисково пространство"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/bn_BD.js b/apps/files_external/l10n/bn_BD.js
index 79df8f58bf..3676a1a8b5 100644
--- a/apps/files_external/l10n/bn_BD.js
+++ b/apps/files_external/l10n/bn_BD.js
@@ -1,36 +1,34 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "দয়া করে সঠিক এবং বৈধ Dropbox app key and secret প্রদান করুন।",
     "Step 1 failed. Exception: %s" : "প্রথম ধাপ ব্যার্থ। ব্যতিক্রম: %s",
     "External storage" : "বাহ্যিক সংরক্ষণাগার",
-    "Local" : "স্থানীয়",
-    "Location" : "অবস্থান",
+    "Personal" : "ব্যক্তিগত",
+    "Grant access" : "অধিগমনের  অনুমতি প্রদান কর",
+    "Access granted" : "অধিগমনের  অনুমতি প্রদান করা হলো",
+    "(group)" : "(গোষ্ঠি)",
+    "Saved" : "সংরক্ষণ করা হলো",
+    "None" : "কোনটিই নয়",
+    "App key" : "অ্যাপ কি",
+    "App secret" : "অ্যাপ সিক্রেট",
+    "Client ID" : "ক্লায়েন্ট পরিচিতি",
+    "Username" : "ব্যবহারকারী",
+    "Password" : "কূটশব্দ",
     "Amazon S3" : "আমাজন S3",
-    "Key" : "কী",
-    "Secret" : "গোপণীয়",
     "Bucket" : "বালতি",
-    "Secret Key" : "গোপণ চাবি",
     "Hostname" : "হোস্টনেম",
     "Port" : "পোর্ট",
     "Region" : "এলাকা",
     "Enable SSL" : "SSL সক্রিয় কর",
-    "App key" : "অ্যাপ কি",
-    "App secret" : "অ্যাপ সিক্রেট",
-    "Host" : "হোস্ট",
-    "Username" : "ব্যবহারকারী",
-    "Password" : "কূটশব্দ",
-    "Secure ftps://" : "ftps:// অর্জন কর",
-    "Client ID" : "ক্লায়েন্ট পরিচিতি",
-    "Share" : "ভাগাভাগি কর",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "অধিগমনের  অনুমতি প্রদান করা হলো",
-    "Error configuring Dropbox storage" : "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
-    "Grant access" : "অধিগমনের  অনুমতি প্রদান কর",
-    "Error configuring Google Drive storage" : "Google Drive সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
-    "Personal" : "ব্যক্তিগত",
-    "(group)" : "(গোষ্ঠি)",
-    "Saved" : "সংরক্ষণ করা হলো",
+    "Host" : "হোস্ট",
+    "Secure ftps://" : "ftps:// অর্জন কর",
+    "Local" : "স্থানীয়",
+    "Location" : "অবস্থান",
+    "ownCloud" : "ওউনক্লাউড",
+    "Root" : "শেকড়",
+    "Share" : "ভাগাভাগি কর",
     "<b>Note:</b> " : "<b>দ্রষ্টব্য:</b> ",
     "Name" : "রাম",
     "External Storage" : "বাহ্যিক সংরক্ষণাগার",
diff --git a/apps/files_external/l10n/bn_BD.json b/apps/files_external/l10n/bn_BD.json
index 74da3dd1af..5b7d07da5a 100644
--- a/apps/files_external/l10n/bn_BD.json
+++ b/apps/files_external/l10n/bn_BD.json
@@ -1,34 +1,32 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "দয়া করে সঠিক এবং বৈধ Dropbox app key and secret প্রদান করুন।",
     "Step 1 failed. Exception: %s" : "প্রথম ধাপ ব্যার্থ। ব্যতিক্রম: %s",
     "External storage" : "বাহ্যিক সংরক্ষণাগার",
-    "Local" : "স্থানীয়",
-    "Location" : "অবস্থান",
+    "Personal" : "ব্যক্তিগত",
+    "Grant access" : "অধিগমনের  অনুমতি প্রদান কর",
+    "Access granted" : "অধিগমনের  অনুমতি প্রদান করা হলো",
+    "(group)" : "(গোষ্ঠি)",
+    "Saved" : "সংরক্ষণ করা হলো",
+    "None" : "কোনটিই নয়",
+    "App key" : "অ্যাপ কি",
+    "App secret" : "অ্যাপ সিক্রেট",
+    "Client ID" : "ক্লায়েন্ট পরিচিতি",
+    "Username" : "ব্যবহারকারী",
+    "Password" : "কূটশব্দ",
     "Amazon S3" : "আমাজন S3",
-    "Key" : "কী",
-    "Secret" : "গোপণীয়",
     "Bucket" : "বালতি",
-    "Secret Key" : "গোপণ চাবি",
     "Hostname" : "হোস্টনেম",
     "Port" : "পোর্ট",
     "Region" : "এলাকা",
     "Enable SSL" : "SSL সক্রিয় কর",
-    "App key" : "অ্যাপ কি",
-    "App secret" : "অ্যাপ সিক্রেট",
-    "Host" : "হোস্ট",
-    "Username" : "ব্যবহারকারী",
-    "Password" : "কূটশব্দ",
-    "Secure ftps://" : "ftps:// অর্জন কর",
-    "Client ID" : "ক্লায়েন্ট পরিচিতি",
-    "Share" : "ভাগাভাগি কর",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "অধিগমনের  অনুমতি প্রদান করা হলো",
-    "Error configuring Dropbox storage" : "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
-    "Grant access" : "অধিগমনের  অনুমতি প্রদান কর",
-    "Error configuring Google Drive storage" : "Google Drive সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
-    "Personal" : "ব্যক্তিগত",
-    "(group)" : "(গোষ্ঠি)",
-    "Saved" : "সংরক্ষণ করা হলো",
+    "Host" : "হোস্ট",
+    "Secure ftps://" : "ftps:// অর্জন কর",
+    "Local" : "স্থানীয়",
+    "Location" : "অবস্থান",
+    "ownCloud" : "ওউনক্লাউড",
+    "Root" : "শেকড়",
+    "Share" : "ভাগাভাগি কর",
     "<b>Note:</b> " : "<b>দ্রষ্টব্য:</b> ",
     "Name" : "রাম",
     "External Storage" : "বাহ্যিক সংরক্ষণাগার",
diff --git a/apps/files_external/l10n/bn_IN.js b/apps/files_external/l10n/bn_IN.js
index cd66c82ab8..31f903204a 100644
--- a/apps/files_external/l10n/bn_IN.js
+++ b/apps/files_external/l10n/bn_IN.js
@@ -1,11 +1,11 @@
 OC.L10N.register(
     "files_external",
     {
-    "Host" : "হোস্ট",
-    "Username" : "ইউজারনেম",
-    "Share" : "শেয়ার",
-    "URL" : "URL",
     "Saved" : "সংরক্ষিত",
+    "Username" : "ইউজারনেম",
+    "URL" : "URL",
+    "Host" : "হোস্ট",
+    "Share" : "শেয়ার",
     "Name" : "নাম",
     "Folder name" : "ফোল্ডারের নাম",
     "Delete" : "মুছে ফেলা"
diff --git a/apps/files_external/l10n/bn_IN.json b/apps/files_external/l10n/bn_IN.json
index ca30788dbc..be89b6f43e 100644
--- a/apps/files_external/l10n/bn_IN.json
+++ b/apps/files_external/l10n/bn_IN.json
@@ -1,9 +1,9 @@
 { "translations": {
-    "Host" : "হোস্ট",
-    "Username" : "ইউজারনেম",
-    "Share" : "শেয়ার",
-    "URL" : "URL",
     "Saved" : "সংরক্ষিত",
+    "Username" : "ইউজারনেম",
+    "URL" : "URL",
+    "Host" : "হোস্ট",
+    "Share" : "শেয়ার",
     "Name" : "নাম",
     "Folder name" : "ফোল্ডারের নাম",
     "Delete" : "মুছে ফেলা"
diff --git a/apps/files_external/l10n/bs.js b/apps/files_external/l10n/bs.js
index b71d1832e5..2cd3cf4750 100644
--- a/apps/files_external/l10n/bs.js
+++ b/apps/files_external/l10n/bs.js
@@ -1,14 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
-    "Port" : "Priključak",
-    "Username" : "Korisničko ime",
-    "Password" : "Lozinka",
-    "Share" : "Podijeli",
     "Personal" : "Osobno",
     "Saved" : "Spremljeno",
+    "None" : "Ništa",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
+    "Port" : "Priključak",
+    "WebDAV" : "WebDAV",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "ownCloud" : "OwnCloud",
+    "Share" : "Podijeli",
     "Name" : "Ime",
     "Delete" : "Izbriši"
 },
diff --git a/apps/files_external/l10n/bs.json b/apps/files_external/l10n/bs.json
index 36141be81e..e2d76555f0 100644
--- a/apps/files_external/l10n/bs.json
+++ b/apps/files_external/l10n/bs.json
@@ -1,12 +1,15 @@
 { "translations": {
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
-    "Port" : "Priključak",
-    "Username" : "Korisničko ime",
-    "Password" : "Lozinka",
-    "Share" : "Podijeli",
     "Personal" : "Osobno",
     "Saved" : "Spremljeno",
+    "None" : "Ništa",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
+    "Port" : "Priključak",
+    "WebDAV" : "WebDAV",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "ownCloud" : "OwnCloud",
+    "Share" : "Podijeli",
     "Name" : "Ime",
     "Delete" : "Izbriši"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_external/l10n/ca.js b/apps/files_external/l10n/ca.js
index b3ccb76ccd..9c10f6d5c5 100644
--- a/apps/files_external/l10n/ca.js
+++ b/apps/files_external/l10n/ca.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
-    "Please provide a valid Dropbox app key and secret." : "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
     "Step 1 failed. Exception: %s" : "El pas 1 ha fallat. Excepció: %s",
     "Step 2 failed. Exception: %s" : "El pas 2 ha fallat. Excepció: %s",
     "External storage" : "Emmagatzemament extern",
-    "Local" : "Local",
-    "Location" : "Ubicació",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clau",
-    "Secret" : "Secret",
-    "Bucket" : "Cub",
-    "Amazon S3 and compliant" : "Amazon S3 i similars",
-    "Access Key" : "Clau d'accés",
-    "Secret Key" : "Clau secreta",
-    "Hostname" : "Nom del servidor",
-    "Port" : "Port",
-    "Region" : "Comarca",
-    "Enable SSL" : "Habilita SSL",
-    "Enable Path Style" : "Permet l'estil del camí",
-    "App key" : "Clau de l'aplicació",
-    "App secret" : "Secret de l'aplicació",
-    "Host" : "Equip remot",
-    "Username" : "Nom d'usuari",
-    "Password" : "Contrasenya",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Secure ftps://" : "Protocol segur ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Secret del client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regió (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requerit per fitxers al núvol Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requerit per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasenya (requerit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servei (requerit per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt identificador final (requerit per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Temps d'expera màxim de les peticions HTTP en segons",
-    "Share" : "Comparteix",
-    "SMB / CIFS using OC login" : "SMB / CIFS usant acreditació OC",
-    "Username as share" : "Nom d'usuari per compartir",
-    "URL" : "URL",
-    "Secure https://" : "Protocol segur https://",
-    "SFTP with secret key login" : "Inici de sessió SFTP amb clau secreta",
-    "Public key" : "Clau pública",
     "Storage with id \"%i\" not found" : "No s'ha trobat emmagatzematge amb id \"%i\"",
     "Invalid mount point" : "Punt de muntatge no vàlid",
     "Invalid storage backend \"%s\"" : "Motor d'emmagatzematge no vàlid \"%s\"",
-    "Access granted" : "S'ha concedit l'accés",
-    "Error configuring Dropbox storage" : "Error en configurar l'emmagatzemament Dropbox",
-    "Grant access" : "Concedeix accés",
-    "Error configuring Google Drive storage" : "Error en configurar l'emmagatzemament Google Drive",
     "Personal" : "Personal",
     "System" : "Sistema",
+    "Grant access" : "Concedeix accés",
+    "Access granted" : "S'ha concedit l'accés",
+    "Generate keys" : "Generar claus",
+    "Error generating key pair" : "Error en generar el parell de claus",
     "Enable encryption" : "Habilitar xifrat",
     "Enable previews" : "Habilitar vistes prèvies",
     "Check for changes" : "Comproveu si hi ha canvis",
@@ -63,10 +22,36 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.",
     "(group)" : "(grup)",
     "Saved" : "Desat",
-    "Generate keys" : "Generar claus",
-    "Error generating key pair" : "Error en generar el parell de claus",
+    "None" : "Cap",
+    "App key" : "Clau de l'aplicació",
+    "App secret" : "Secret de l'aplicació",
+    "Client ID" : "Client ID",
+    "Client secret" : "Secret del client",
+    "Username" : "Nom d'usuari",
+    "Password" : "Contrasenya",
+    "API key" : "codi API",
+    "Public key" : "Clau pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cub",
+    "Hostname" : "Nom del servidor",
+    "Port" : "Port",
+    "Region" : "Comarca",
+    "Enable SSL" : "Habilita SSL",
+    "Enable Path Style" : "Permet l'estil del camí",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Secure https://" : "Protocol segur https://",
+    "Host" : "Equip remot",
+    "Secure ftps://" : "Protocol segur ftps://",
+    "Local" : "Local",
+    "Location" : "Ubicació",
+    "ownCloud" : "ownCloud",
+    "Root" : "Arrel",
+    "Share" : "Comparteix",
+    "Username as share" : "Nom d'usuari per compartir",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> %s no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
@@ -79,9 +64,9 @@ OC.L10N.register(
     "Folder name" : "Nom de la carpeta",
     "Configuration" : "Configuració",
     "Available for" : "Disponible per",
-    "Add storage" : "Afegeix emmagatzemament",
     "Advanced settings" : "Configuració avançada",
     "Delete" : "Esborra",
+    "Add storage" : "Afegeix emmagatzemament",
     "Enable User External Storage" : "Habilita l'emmagatzemament extern d'usuari",
     "Allow users to mount the following external storage" : "Permet als usuaris muntar els dispositius externs següents"
 },
diff --git a/apps/files_external/l10n/ca.json b/apps/files_external/l10n/ca.json
index 6295ed8df3..123527688c 100644
--- a/apps/files_external/l10n/ca.json
+++ b/apps/files_external/l10n/ca.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
-    "Please provide a valid Dropbox app key and secret." : "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
     "Step 1 failed. Exception: %s" : "El pas 1 ha fallat. Excepció: %s",
     "Step 2 failed. Exception: %s" : "El pas 2 ha fallat. Excepció: %s",
     "External storage" : "Emmagatzemament extern",
-    "Local" : "Local",
-    "Location" : "Ubicació",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clau",
-    "Secret" : "Secret",
-    "Bucket" : "Cub",
-    "Amazon S3 and compliant" : "Amazon S3 i similars",
-    "Access Key" : "Clau d'accés",
-    "Secret Key" : "Clau secreta",
-    "Hostname" : "Nom del servidor",
-    "Port" : "Port",
-    "Region" : "Comarca",
-    "Enable SSL" : "Habilita SSL",
-    "Enable Path Style" : "Permet l'estil del camí",
-    "App key" : "Clau de l'aplicació",
-    "App secret" : "Secret de l'aplicació",
-    "Host" : "Equip remot",
-    "Username" : "Nom d'usuari",
-    "Password" : "Contrasenya",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Secure ftps://" : "Protocol segur ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Secret del client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regió (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requerit per fitxers al núvol Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requerit per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasenya (requerit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servei (requerit per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt identificador final (requerit per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Temps d'expera màxim de les peticions HTTP en segons",
-    "Share" : "Comparteix",
-    "SMB / CIFS using OC login" : "SMB / CIFS usant acreditació OC",
-    "Username as share" : "Nom d'usuari per compartir",
-    "URL" : "URL",
-    "Secure https://" : "Protocol segur https://",
-    "SFTP with secret key login" : "Inici de sessió SFTP amb clau secreta",
-    "Public key" : "Clau pública",
     "Storage with id \"%i\" not found" : "No s'ha trobat emmagatzematge amb id \"%i\"",
     "Invalid mount point" : "Punt de muntatge no vàlid",
     "Invalid storage backend \"%s\"" : "Motor d'emmagatzematge no vàlid \"%s\"",
-    "Access granted" : "S'ha concedit l'accés",
-    "Error configuring Dropbox storage" : "Error en configurar l'emmagatzemament Dropbox",
-    "Grant access" : "Concedeix accés",
-    "Error configuring Google Drive storage" : "Error en configurar l'emmagatzemament Google Drive",
     "Personal" : "Personal",
     "System" : "Sistema",
+    "Grant access" : "Concedeix accés",
+    "Access granted" : "S'ha concedit l'accés",
+    "Generate keys" : "Generar claus",
+    "Error generating key pair" : "Error en generar el parell de claus",
     "Enable encryption" : "Habilitar xifrat",
     "Enable previews" : "Habilitar vistes prèvies",
     "Check for changes" : "Comproveu si hi ha canvis",
@@ -61,10 +20,36 @@
     "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.",
     "(group)" : "(grup)",
     "Saved" : "Desat",
-    "Generate keys" : "Generar claus",
-    "Error generating key pair" : "Error en generar el parell de claus",
+    "None" : "Cap",
+    "App key" : "Clau de l'aplicació",
+    "App secret" : "Secret de l'aplicació",
+    "Client ID" : "Client ID",
+    "Client secret" : "Secret del client",
+    "Username" : "Nom d'usuari",
+    "Password" : "Contrasenya",
+    "API key" : "codi API",
+    "Public key" : "Clau pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cub",
+    "Hostname" : "Nom del servidor",
+    "Port" : "Port",
+    "Region" : "Comarca",
+    "Enable SSL" : "Habilita SSL",
+    "Enable Path Style" : "Permet l'estil del camí",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Secure https://" : "Protocol segur https://",
+    "Host" : "Equip remot",
+    "Secure ftps://" : "Protocol segur ftps://",
+    "Local" : "Local",
+    "Location" : "Ubicació",
+    "ownCloud" : "ownCloud",
+    "Root" : "Arrel",
+    "Share" : "Comparteix",
+    "Username as share" : "Nom d'usuari per compartir",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> %s no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
@@ -77,9 +62,9 @@
     "Folder name" : "Nom de la carpeta",
     "Configuration" : "Configuració",
     "Available for" : "Disponible per",
-    "Add storage" : "Afegeix emmagatzemament",
     "Advanced settings" : "Configuració avançada",
     "Delete" : "Esborra",
+    "Add storage" : "Afegeix emmagatzemament",
     "Enable User External Storage" : "Habilita l'emmagatzemament extern d'usuari",
     "Allow users to mount the following external storage" : "Permet als usuaris muntar els dispositius externs següents"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js
index 4698dd915a..503d00893e 100644
--- a/apps/files_external/l10n/cs_CZ.js
+++ b/apps/files_external/l10n/cs_CZ.js
@@ -1,59 +1,24 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
-    "Please provide a valid Dropbox app key and secret." : "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Please provide a valid app key and secret." : "Zadejte prosím platný klíč a tajné heslo aplikace.",
     "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s",
     "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s",
     "External storage" : "Externí úložiště",
-    "Local" : "Místní",
-    "Location" : "Umístění",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Klíč",
-    "Secret" : "Tajemství",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 a kompatibilní",
-    "Access Key" : "Přístupový klíč",
-    "Secret Key" : "Tajný klíč",
-    "Hostname" : "Hostname",
-    "Port" : "Port",
-    "Region" : "Kraj",
-    "Enable SSL" : "Povolit SSL",
-    "Enable Path Style" : "Povolit Path Style",
-    "App key" : "Klíč aplikace",
-    "App secret" : "Tajemství aplikace",
-    "Host" : "Počítač",
-    "Username" : "Uživatelské jméno",
-    "Password" : "Heslo",
-    "Remote subfolder" : "Vzdálený podadresář",
-    "Secure ftps://" : "Zabezpečené ftps://",
-    "Client ID" : "Klientské ID",
-    "Client secret" : "Klientské tajemství",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (nepovinný pro OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API klíč (vyžadován pro Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Jméno nájemce (vyžadováno pro OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (vyžadováno pro OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Název služby (vyžadováno pro OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL identity koncového bodu (vyžadováno pro OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadavků v sekundách",
-    "Share" : "Sdílet",
-    "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
-    "Username as share" : "Uživatelské jméno jako sdílený adresář",
-    "URL" : "URL",
-    "Secure https://" : "Zabezpečené https://",
-    "SFTP with secret key login" : "SFTP login s tajným klíčem",
-    "Public key" : "Veřejný klíč",
     "Storage with id \"%i\" not found" : "Úložiště s id \"%i\" nebylo nalezeno",
+    "Invalid backend or authentication mechanism class" : "Neplatný backend nebo třída ověřovacího mechanismu",
     "Invalid mount point" : "Neplatný přípojný bod",
     "Invalid storage backend \"%s\"" : "Neplatná služba úložiště \"%s\"",
-    "Access granted" : "Přístup povolen",
-    "Error configuring Dropbox storage" : "Chyba při nastavení úložiště Dropbox",
-    "Grant access" : "Povolit přístup",
-    "Error configuring Google Drive storage" : "Chyba při nastavení úložiště Google Drive",
     "Personal" : "Osobní",
     "System" : "Systém",
+    "Grant access" : "Povolit přístup",
+    "Access granted" : "Přístup povolen",
+    "Error configuring OAuth1" : "Chyba nastavení OAuth1",
+    "Error configuring OAuth2" : "Chyba nastavení OAuth2",
+    "Generate keys" : "Vytvořit klíče",
+    "Error generating key pair" : "Chyba při vytváření páru klíčů",
     "Enable encryption" : "Povolit šifrování",
     "Enable previews" : "Povolit náhledy",
     "Check for changes" : "Zkontrolovat změny",
@@ -63,10 +28,49 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Všichni uživatelé. Začněte psát pro výběr uživatelů a skupin.",
     "(group)" : "(skupina)",
     "Saved" : "Uloženo",
-    "Generate keys" : "Vytvořit klíče",
-    "Error generating key pair" : "Chyba při vytváření páru klíčů",
+    "Access key" : "Přístupový klíč",
+    "Secret key" : "Tajný klíč",
+    "None" : "Žádné",
+    "OAuth1" : "OAuth1",
+    "App key" : "Klíč aplikace",
+    "App secret" : "Tajemství aplikace",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Klientské ID",
+    "Client secret" : "Klientské tajemství",
+    "OpenStack" : "OpenStack",
+    "Username" : "Uživatelské jméno",
+    "Password" : "Heslo",
+    "API key" : "Klíč API",
+    "Username and password" : "Uživatelské jméno a heslo",
+    "Session credentials" : "Přihlašovací údaje sezení",
+    "RSA public key" : "RSA veřejný klíč",
+    "Public key" : "Veřejný klíč",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Kraj",
+    "Enable SSL" : "Povolit SSL",
+    "Enable Path Style" : "Povolit Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Vzdálený podadresář",
+    "Secure https://" : "Zabezpečené https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Počítač",
+    "Secure ftps://" : "Zabezpečené ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Místní",
+    "Location" : "Umístění",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Kořen",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Sdílet",
+    "Username as share" : "Uživatelské jméno jako sdílený adresář",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
-    "and" : "a",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" není instalováno. Není možné připojení %s. Prosím požádejte svého správce systému o instalaci.",
@@ -77,11 +81,12 @@ OC.L10N.register(
     "Scope" : "Rozsah",
     "External Storage" : "Externí úložiště",
     "Folder name" : "Název složky",
+    "Authentication" : "Ověření",
     "Configuration" : "Nastavení",
     "Available for" : "Dostupné pro",
-    "Add storage" : "Přidat úložiště",
     "Advanced settings" : "Pokročilá nastavení",
     "Delete" : "Smazat",
+    "Add storage" : "Přidat úložiště",
     "Enable User External Storage" : "Zapnout externí uživatelské úložiště",
     "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště"
 },
diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json
index 53b2162daf..74aa6cc82e 100644
--- a/apps/files_external/l10n/cs_CZ.json
+++ b/apps/files_external/l10n/cs_CZ.json
@@ -1,57 +1,22 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
-    "Please provide a valid Dropbox app key and secret." : "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace a tajné heslo jsou správné.",
+    "Please provide a valid app key and secret." : "Zadejte prosím platný klíč a tajné heslo aplikace.",
     "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s",
     "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s",
     "External storage" : "Externí úložiště",
-    "Local" : "Místní",
-    "Location" : "Umístění",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Klíč",
-    "Secret" : "Tajemství",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 a kompatibilní",
-    "Access Key" : "Přístupový klíč",
-    "Secret Key" : "Tajný klíč",
-    "Hostname" : "Hostname",
-    "Port" : "Port",
-    "Region" : "Kraj",
-    "Enable SSL" : "Povolit SSL",
-    "Enable Path Style" : "Povolit Path Style",
-    "App key" : "Klíč aplikace",
-    "App secret" : "Tajemství aplikace",
-    "Host" : "Počítač",
-    "Username" : "Uživatelské jméno",
-    "Password" : "Heslo",
-    "Remote subfolder" : "Vzdálený podadresář",
-    "Secure ftps://" : "Zabezpečené ftps://",
-    "Client ID" : "Klientské ID",
-    "Client secret" : "Klientské tajemství",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (nepovinný pro OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API klíč (vyžadován pro Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Jméno nájemce (vyžadováno pro OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (vyžadováno pro OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Název služby (vyžadováno pro OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL identity koncového bodu (vyžadováno pro OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadavků v sekundách",
-    "Share" : "Sdílet",
-    "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
-    "Username as share" : "Uživatelské jméno jako sdílený adresář",
-    "URL" : "URL",
-    "Secure https://" : "Zabezpečené https://",
-    "SFTP with secret key login" : "SFTP login s tajným klíčem",
-    "Public key" : "Veřejný klíč",
     "Storage with id \"%i\" not found" : "Úložiště s id \"%i\" nebylo nalezeno",
+    "Invalid backend or authentication mechanism class" : "Neplatný backend nebo třída ověřovacího mechanismu",
     "Invalid mount point" : "Neplatný přípojný bod",
     "Invalid storage backend \"%s\"" : "Neplatná služba úložiště \"%s\"",
-    "Access granted" : "Přístup povolen",
-    "Error configuring Dropbox storage" : "Chyba při nastavení úložiště Dropbox",
-    "Grant access" : "Povolit přístup",
-    "Error configuring Google Drive storage" : "Chyba při nastavení úložiště Google Drive",
     "Personal" : "Osobní",
     "System" : "Systém",
+    "Grant access" : "Povolit přístup",
+    "Access granted" : "Přístup povolen",
+    "Error configuring OAuth1" : "Chyba nastavení OAuth1",
+    "Error configuring OAuth2" : "Chyba nastavení OAuth2",
+    "Generate keys" : "Vytvořit klíče",
+    "Error generating key pair" : "Chyba při vytváření páru klíčů",
     "Enable encryption" : "Povolit šifrování",
     "Enable previews" : "Povolit náhledy",
     "Check for changes" : "Zkontrolovat změny",
@@ -61,10 +26,49 @@
     "All users. Type to select user or group." : "Všichni uživatelé. Začněte psát pro výběr uživatelů a skupin.",
     "(group)" : "(skupina)",
     "Saved" : "Uloženo",
-    "Generate keys" : "Vytvořit klíče",
-    "Error generating key pair" : "Chyba při vytváření páru klíčů",
+    "Access key" : "Přístupový klíč",
+    "Secret key" : "Tajný klíč",
+    "None" : "Žádné",
+    "OAuth1" : "OAuth1",
+    "App key" : "Klíč aplikace",
+    "App secret" : "Tajemství aplikace",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Klientské ID",
+    "Client secret" : "Klientské tajemství",
+    "OpenStack" : "OpenStack",
+    "Username" : "Uživatelské jméno",
+    "Password" : "Heslo",
+    "API key" : "Klíč API",
+    "Username and password" : "Uživatelské jméno a heslo",
+    "Session credentials" : "Přihlašovací údaje sezení",
+    "RSA public key" : "RSA veřejný klíč",
+    "Public key" : "Veřejný klíč",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Kraj",
+    "Enable SSL" : "Povolit SSL",
+    "Enable Path Style" : "Povolit Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Vzdálený podadresář",
+    "Secure https://" : "Zabezpečené https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Počítač",
+    "Secure ftps://" : "Zabezpečené ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Místní",
+    "Location" : "Umístění",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Kořen",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Sdílet",
+    "Username as share" : "Uživatelské jméno jako sdílený adresář",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b>",
-    "and" : "a",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" není instalováno. Není možné připojení %s. Prosím požádejte svého správce systému o instalaci.",
@@ -75,11 +79,12 @@
     "Scope" : "Rozsah",
     "External Storage" : "Externí úložiště",
     "Folder name" : "Název složky",
+    "Authentication" : "Ověření",
     "Configuration" : "Nastavení",
     "Available for" : "Dostupné pro",
-    "Add storage" : "Přidat úložiště",
     "Advanced settings" : "Pokročilá nastavení",
     "Delete" : "Smazat",
+    "Add storage" : "Přidat úložiště",
     "Enable User External Storage" : "Zapnout externí uživatelské úložiště",
     "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_external/l10n/cy_GB.js b/apps/files_external/l10n/cy_GB.js
index 4cd0a336e9..4364445be0 100644
--- a/apps/files_external/l10n/cy_GB.js
+++ b/apps/files_external/l10n/cy_GB.js
@@ -1,12 +1,14 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Lleoliad",
+    "Personal" : "Personol",
+    "None" : "Dim",
     "Username" : "Enw defnyddiwr",
     "Password" : "Cyfrinair",
-    "Share" : "Rhannu",
     "URL" : "URL",
-    "Personal" : "Personol",
+    "Location" : "Lleoliad",
+    "ownCloud" : "ownCloud",
+    "Share" : "Rhannu",
     "Name" : "Enw",
     "Delete" : "Dileu"
 },
diff --git a/apps/files_external/l10n/cy_GB.json b/apps/files_external/l10n/cy_GB.json
index 257039de58..4916cb270a 100644
--- a/apps/files_external/l10n/cy_GB.json
+++ b/apps/files_external/l10n/cy_GB.json
@@ -1,10 +1,12 @@
 { "translations": {
-    "Location" : "Lleoliad",
+    "Personal" : "Personol",
+    "None" : "Dim",
     "Username" : "Enw defnyddiwr",
     "Password" : "Cyfrinair",
-    "Share" : "Rhannu",
     "URL" : "URL",
-    "Personal" : "Personol",
+    "Location" : "Lleoliad",
+    "ownCloud" : "ownCloud",
+    "Share" : "Rhannu",
     "Name" : "Enw",
     "Delete" : "Dileu"
 },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
diff --git a/apps/files_external/l10n/da.js b/apps/files_external/l10n/da.js
index bafebbbf87..b1f058efbb 100644
--- a/apps/files_external/l10n/da.js
+++ b/apps/files_external/l10n/da.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for forespørgsler mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for adgang mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
-    "Please provide a valid Dropbox app key and secret." : "Angiv venligst en gyldig Dropbox app-nøgle og hemmelighed",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Tokener til anmodning om hentning mislykkedes. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Tokener for adgang til hentning fejlede. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Please provide a valid app key and secret." : "Angiv venligst gyldig app-nøgle og -hemmelighed.",
     "Step 1 failed. Exception: %s" : "Trin 1 mislykkedes. Undtagelse: %s",
     "Step 2 failed. Exception: %s" : "Trin 2 mislykkedes. Undtagelse: %s",
     "External storage" : "Eksternt lager",
-    "Local" : "Lokal",
-    "Location" : "Placering",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Nøgle",
-    "Secret" : "Hemmelighed",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 og kompatible",
-    "Access Key" : "Adgangsnøgle",
-    "Secret Key" : "Hemmelig nøgle ",
-    "Hostname" : "Værtsnavn",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Aktivér SSL",
-    "Enable Path Style" : "Aktivér stil for sti",
-    "App key" : "App-nøgle",
-    "App secret" : "App-hemmelighed",
-    "Host" : "Vært",
-    "Username" : "Brugernavn",
-    "Password" : "Kodeord",
-    "Remote subfolder" : "Fjernundermappe",
-    "Secure ftps://" : "Sikker ftps://",
-    "Client ID" : "Klient-ID",
-    "Client secret" : "Klient hemmelighed",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (valgfri for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nøgle (påkrævet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Lejers navn (påkrævet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Adgangskode (påkrævet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Navn (påkrævet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL på slutpunkt for identitet (påkrævet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsudløb for HTTP-forespørgsler i sekunder",
-    "Share" : "Del",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-login",
-    "Username as share" : "Brugernavn som deling",
-    "URL" : "URL",
-    "Secure https://" : "Sikker https://",
-    "SFTP with secret key login" : "SFTP med hemmelig nøglelogin",
-    "Public key" : "Offentlig nøgle",
     "Storage with id \"%i\" not found" : "Lager med ID'et \"%i% er ikke fundet",
+    "Invalid backend or authentication mechanism class" : "Ugyldig backend eller klasse for godkendelsesmekanisme",
     "Invalid mount point" : "Fokert monteringspunkt",
+    "Objectstore forbidden" : "Objectstore er forbudt",
     "Invalid storage backend \"%s\"" : "Forkert lager til backend \"%s\"en",
-    "Access granted" : "Adgang godkendt",
-    "Error configuring Dropbox storage" : "Fejl ved konfiguration af Dropbox plads",
-    "Grant access" : "Godkend adgang",
-    "Error configuring Google Drive storage" : "Fejl ved konfiguration af Google Drive-plads",
+    "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre",
+    "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme",
     "Personal" : "Personligt",
     "System" : "System",
+    "Grant access" : "Godkend adgang",
+    "Access granted" : "Adgang godkendt",
+    "Error configuring OAuth1" : "Fejl under konfiguration af OAuth1",
+    "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2",
+    "Generate keys" : "Opret nøgler.",
+    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
     "Enable encryption" : "Slå kryptering til",
     "Enable previews" : "Slå forhåndsvisninger til",
     "Check for changes" : "Tjek for ændringer",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Gemt",
-    "Generate keys" : "Opret nøgler.",
-    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
+    "Access key" : "Adgangsnøgle",
+    "Secret key" : "Hemmelig nøgle",
+    "Builtin" : "Indbygget",
+    "None" : "Ingen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App-nøgle",
+    "App secret" : "App-hemmelighed",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Klient-ID",
+    "Client secret" : "Klient hemmelighed",
+    "Username" : "Brugernavn",
+    "Password" : "Kodeord",
+    "API key" : "API nøgle",
+    "Username and password" : "Brugernavn og kodeord",
+    "Session credentials" : "Brugeroplysninger for session",
+    "Public key" : "Offentlig nøgle",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Værtsnavn",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Aktivér SSL",
+    "Enable Path Style" : "Aktivér stil for sti",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Fjernundermappe",
+    "Secure https://" : "Sikker https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Vært",
+    "Secure ftps://" : "Sikker ftps://",
+    "Google Drive" : "Google Drev",
+    "Local" : "Lokal",
+    "Location" : "Placering",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Del",
+    "Username as share" : "Brugernavn som deling",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
-    "and" : "og",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  \"%s\" er ikke installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Anvendelsesområde",
     "External Storage" : "Ekstern opbevaring",
     "Folder name" : "Mappenavn",
+    "Authentication" : "Godkendelse",
     "Configuration" : "Opsætning",
     "Available for" : "Tilgængelig for",
-    "Add storage" : "Tilføj lager",
     "Advanced settings" : "Avancerede indstillinger",
     "Delete" : "Slet",
+    "Add storage" : "Tilføj lager",
     "Enable User External Storage" : "Aktivér ekstern opbevaring for brugere",
     "Allow users to mount the following external storage" : "Tillad brugere at montere følgende som eksternt lager"
 },
diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json
index 663cf93b6f..811de50942 100644
--- a/apps/files_external/l10n/da.json
+++ b/apps/files_external/l10n/da.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for forespørgsler mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for adgang mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
-    "Please provide a valid Dropbox app key and secret." : "Angiv venligst en gyldig Dropbox app-nøgle og hemmelighed",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Tokener til anmodning om hentning mislykkedes. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Tokener for adgang til hentning fejlede. Verificér at dine app-nøgle og -hemmelighed er korrekte.",
+    "Please provide a valid app key and secret." : "Angiv venligst gyldig app-nøgle og -hemmelighed.",
     "Step 1 failed. Exception: %s" : "Trin 1 mislykkedes. Undtagelse: %s",
     "Step 2 failed. Exception: %s" : "Trin 2 mislykkedes. Undtagelse: %s",
     "External storage" : "Eksternt lager",
-    "Local" : "Lokal",
-    "Location" : "Placering",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Nøgle",
-    "Secret" : "Hemmelighed",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 og kompatible",
-    "Access Key" : "Adgangsnøgle",
-    "Secret Key" : "Hemmelig nøgle ",
-    "Hostname" : "Værtsnavn",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Aktivér SSL",
-    "Enable Path Style" : "Aktivér stil for sti",
-    "App key" : "App-nøgle",
-    "App secret" : "App-hemmelighed",
-    "Host" : "Vært",
-    "Username" : "Brugernavn",
-    "Password" : "Kodeord",
-    "Remote subfolder" : "Fjernundermappe",
-    "Secure ftps://" : "Sikker ftps://",
-    "Client ID" : "Klient-ID",
-    "Client secret" : "Klient hemmelighed",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (valgfri for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nøgle (påkrævet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Lejers navn (påkrævet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Adgangskode (påkrævet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Navn (påkrævet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL på slutpunkt for identitet (påkrævet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsudløb for HTTP-forespørgsler i sekunder",
-    "Share" : "Del",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-login",
-    "Username as share" : "Brugernavn som deling",
-    "URL" : "URL",
-    "Secure https://" : "Sikker https://",
-    "SFTP with secret key login" : "SFTP med hemmelig nøglelogin",
-    "Public key" : "Offentlig nøgle",
     "Storage with id \"%i\" not found" : "Lager med ID'et \"%i% er ikke fundet",
+    "Invalid backend or authentication mechanism class" : "Ugyldig backend eller klasse for godkendelsesmekanisme",
     "Invalid mount point" : "Fokert monteringspunkt",
+    "Objectstore forbidden" : "Objectstore er forbudt",
     "Invalid storage backend \"%s\"" : "Forkert lager til backend \"%s\"en",
-    "Access granted" : "Adgang godkendt",
-    "Error configuring Dropbox storage" : "Fejl ved konfiguration af Dropbox plads",
-    "Grant access" : "Godkend adgang",
-    "Error configuring Google Drive storage" : "Fejl ved konfiguration af Google Drive-plads",
+    "Unsatisfied backend parameters" : "Utilfredsstillede backend-parametre",
+    "Unsatisfied authentication mechanism parameters" : "Utilfredsstillede parametre for godkendelsesmekanisme",
     "Personal" : "Personligt",
     "System" : "System",
+    "Grant access" : "Godkend adgang",
+    "Access granted" : "Adgang godkendt",
+    "Error configuring OAuth1" : "Fejl under konfiguration af OAuth1",
+    "Error configuring OAuth2" : "Fejl under konfiguration af OAuth2",
+    "Generate keys" : "Opret nøgler.",
+    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
     "Enable encryption" : "Slå kryptering til",
     "Enable previews" : "Slå forhåndsvisninger til",
     "Check for changes" : "Tjek for ændringer",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Gemt",
-    "Generate keys" : "Opret nøgler.",
-    "Error generating key pair" : "Fejl under oprettelse af nøglepar",
+    "Access key" : "Adgangsnøgle",
+    "Secret key" : "Hemmelig nøgle",
+    "Builtin" : "Indbygget",
+    "None" : "Ingen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App-nøgle",
+    "App secret" : "App-hemmelighed",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Klient-ID",
+    "Client secret" : "Klient hemmelighed",
+    "Username" : "Brugernavn",
+    "Password" : "Kodeord",
+    "API key" : "API nøgle",
+    "Username and password" : "Brugernavn og kodeord",
+    "Session credentials" : "Brugeroplysninger for session",
+    "Public key" : "Offentlig nøgle",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Værtsnavn",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Aktivér SSL",
+    "Enable Path Style" : "Aktivér stil for sti",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Fjernundermappe",
+    "Secure https://" : "Sikker https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Vært",
+    "Secure ftps://" : "Sikker ftps://",
+    "Google Drive" : "Google Drev",
+    "Local" : "Lokal",
+    "Location" : "Placering",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Del",
+    "Username as share" : "Brugernavn som deling",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
-    "and" : "og",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  \"%s\" er ikke installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
@@ -75,11 +81,12 @@
     "Scope" : "Anvendelsesområde",
     "External Storage" : "Ekstern opbevaring",
     "Folder name" : "Mappenavn",
+    "Authentication" : "Godkendelse",
     "Configuration" : "Opsætning",
     "Available for" : "Tilgængelig for",
-    "Add storage" : "Tilføj lager",
     "Advanced settings" : "Avancerede indstillinger",
     "Delete" : "Slet",
+    "Add storage" : "Tilføj lager",
     "Enable User External Storage" : "Aktivér ekstern opbevaring for brugere",
     "Allow users to mount the following external storage" : "Tillad brugere at montere følgende som eksternt lager"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
index 31f4dc7923..fc0af67d3d 100644
--- a/apps/files_external/l10n/de.js
+++ b/apps/files_external/l10n/de.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Please provide a valid Dropbox app key and secret." : "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Schlüssel",
-    "Secret" : "Geheime Zeichenkette",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 und kompatible",
-    "Access Key" : "Zugriffsschlüssel",
-    "Secret Key" : "Sicherheitssschlüssel",
-    "Hostname" : "Host-Name",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "SSL aktivieren",
-    "Enable Path Style" : "Pfad-Stil aktivieren",
-    "App key" : "App-Schlüssel",
-    "App secret" : "Geheime Zeichenkette der App",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "Secure ftps://" : "Sicherer ftps://",
-    "Client ID" : "Client-ID",
-    "Client secret" : "Geheime Zeichenkette des Client",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Username as share" : "Benutzername als Freigabe",
-    "URL" : "URL",
-    "Secure https://" : "Sicherer HTTPS://",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
     "Personal" : "Persönlich",
     "System" : "System",
+    "Grant access" : "Zugriff gestatten",
+    "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
+    "None" : "Keine",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfad-Stil aktivieren",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Entfernter Unterordner",
+    "Secure https://" : "Sicherer HTTPS://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicherer ftps://",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
-    "and" : "und",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Ordnername",
     "Configuration" : "Konfiguration",
     "Available for" : "Verfügbar für",
-    "Add storage" : "Speicher hinzufügen",
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
+    "Add storage" : "Speicher hinzufügen",
     "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
     "Allow users to mount the following external storage" : "Erlaube es Benutzern, den folgenden externen Speicher einzubinden"
 },
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
index ef96c6e84a..4242b81707 100644
--- a/apps/files_external/l10n/de.json
+++ b/apps/files_external/l10n/de.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Please provide a valid Dropbox app key and secret." : "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Schlüssel",
-    "Secret" : "Geheime Zeichenkette",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 und kompatible",
-    "Access Key" : "Zugriffsschlüssel",
-    "Secret Key" : "Sicherheitssschlüssel",
-    "Hostname" : "Host-Name",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "SSL aktivieren",
-    "Enable Path Style" : "Pfad-Stil aktivieren",
-    "App key" : "App-Schlüssel",
-    "App secret" : "Geheime Zeichenkette der App",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "Secure ftps://" : "Sicherer ftps://",
-    "Client ID" : "Client-ID",
-    "Client secret" : "Geheime Zeichenkette des Client",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Username as share" : "Benutzername als Freigabe",
-    "URL" : "URL",
-    "Secure https://" : "Sicherer HTTPS://",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
     "Personal" : "Persönlich",
     "System" : "System",
+    "Grant access" : "Zugriff gestatten",
+    "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
+    "None" : "Keine",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfad-Stil aktivieren",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Entfernter Unterordner",
+    "Secure https://" : "Sicherer HTTPS://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicherer ftps://",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
-    "and" : "und",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
@@ -77,9 +63,9 @@
     "Folder name" : "Ordnername",
     "Configuration" : "Konfiguration",
     "Available for" : "Verfügbar für",
-    "Add storage" : "Speicher hinzufügen",
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
+    "Add storage" : "Speicher hinzufügen",
     "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
     "Allow users to mount the following external storage" : "Erlaube es Benutzern, den folgenden externen Speicher einzubinden"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/de_AT.js b/apps/files_external/l10n/de_AT.js
index 5dbc69e296..6c71c45f21 100644
--- a/apps/files_external/l10n/de_AT.js
+++ b/apps/files_external/l10n/de_AT.js
@@ -1,13 +1,13 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Ort",
-    "Port" : "Port",
-    "Host" : "Host",
+    "Personal" : "Persönlich",
     "Username" : "Benutzername",
     "Password" : "Passwort",
+    "Port" : "Port",
+    "Host" : "Host",
+    "Location" : "Ort",
     "Share" : "Freigeben",
-    "Personal" : "Persönlich",
     "Folder name" : "Ordner Name",
     "Delete" : "Löschen"
 },
diff --git a/apps/files_external/l10n/de_AT.json b/apps/files_external/l10n/de_AT.json
index 7fd1d456c5..0d956dc81c 100644
--- a/apps/files_external/l10n/de_AT.json
+++ b/apps/files_external/l10n/de_AT.json
@@ -1,11 +1,11 @@
 { "translations": {
-    "Location" : "Ort",
-    "Port" : "Port",
-    "Host" : "Host",
+    "Personal" : "Persönlich",
     "Username" : "Benutzername",
     "Password" : "Passwort",
+    "Port" : "Port",
+    "Host" : "Host",
+    "Location" : "Ort",
     "Share" : "Freigeben",
-    "Personal" : "Persönlich",
     "Folder name" : "Ordner Name",
     "Delete" : "Löschen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/de_CH.js b/apps/files_external/l10n/de_CH.js
deleted file mode 100644
index b003957309..0000000000
--- a/apps/files_external/l10n/de_CH.js
+++ /dev/null
@@ -1,28 +0,0 @@
-OC.L10N.register(
-    "files_external",
-    {
-    "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
-    "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Port" : "Port",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Share" : "Freigeben",
-    "URL" : "URL",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
-    "Personal" : "Persönlich",
-    "Saved" : "Gespeichert",
-    "Name" : "Name",
-    "External Storage" : "Externer Speicher",
-    "Folder name" : "Ordnername",
-    "Configuration" : "Konfiguration",
-    "Add storage" : "Speicher hinzufügen",
-    "Delete" : "Löschen",
-    "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/de_CH.json b/apps/files_external/l10n/de_CH.json
deleted file mode 100644
index 955fae07f5..0000000000
--- a/apps/files_external/l10n/de_CH.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{ "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
-    "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Port" : "Port",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Share" : "Freigeben",
-    "URL" : "URL",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
-    "Personal" : "Persönlich",
-    "Saved" : "Gespeichert",
-    "Name" : "Name",
-    "External Storage" : "Externer Speicher",
-    "Folder name" : "Ordnername",
-    "Configuration" : "Konfiguration",
-    "Add storage" : "Speicher hinzufügen",
-    "Delete" : "Löschen",
-    "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js
index 0f9fac2355..9d363aecbf 100644
--- a/apps/files_external/l10n/de_DE.js
+++ b/apps/files_external/l10n/de_DE.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Schlüssel",
-    "Secret" : "Geheime Zeichenkette",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 und Kompatible",
-    "Access Key" : "Zugriffsschlüssel",
-    "Secret Key" : "Sicherheitsschlüssel",
-    "Hostname" : "Host-Name",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "SSL aktivieren",
-    "Enable Path Style" : "Pfadstil aktivieren",
-    "App key" : "App-Schlüssel",
-    "App secret" : "Geheime Zeichenkette der App",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "Secure ftps://" : "Sicheres ftps://",
-    "Client ID" : "Client-ID",
-    "Client secret" : "Geheime Zeichenkette des Client",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Username as share" : "Benutzername als Freigabe",
-    "URL" : "Adresse",
-    "Secure https://" : "Sicheres https://",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
     "Personal" : "Persönlich",
     "System" : "System",
+    "Grant access" : "Zugriff gestatten",
+    "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
+    "None" : "Keine",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfadstil aktivieren",
+    "WebDAV" : "WebDAV",
+    "URL" : "Adresse",
+    "Remote subfolder" : "Entfernter Unterordner",
+    "Secure https://" : "Sicheres https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicheres ftps://",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
-    "and" : "und",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Ordnername",
     "Configuration" : "Konfiguration",
     "Available for" : "Verfügbar für",
-    "Add storage" : "Speicher hinzufügen",
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
+    "Add storage" : "Speicher hinzufügen",
     "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
     "Allow users to mount the following external storage" : "Erlauben Sie Benutzern, folgende externe Speicher einzubinden"
 },
diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json
index ad137e5675..62fe7b0803 100644
--- a/apps/files_external/l10n/de_DE.json
+++ b/apps/files_external/l10n/de_DE.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Anfrage-Tokens fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Abrufen des Zugriff-Tokens fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-    "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
     "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
     "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
     "External storage" : "Externer Speicher",
-    "Local" : "Lokal",
-    "Location" : "Ort",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Schlüssel",
-    "Secret" : "Geheime Zeichenkette",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 und Kompatible",
-    "Access Key" : "Zugriffsschlüssel",
-    "Secret Key" : "Sicherheitsschlüssel",
-    "Hostname" : "Host-Name",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "SSL aktivieren",
-    "Enable Path Style" : "Pfadstil aktivieren",
-    "App key" : "App-Schlüssel",
-    "App secret" : "Geheime Zeichenkette der App",
-    "Host" : "Host",
-    "Username" : "Benutzername",
-    "Password" : "Passwort",
-    "Remote subfolder" : "Entfernter Unterordner",
-    "Secure ftps://" : "Sicheres ftps://",
-    "Client ID" : "Client-ID",
-    "Client secret" : "Geheime Zeichenkette des Client",
-    "OpenStack Object Storage" : "Openstack-Objektspeicher",
-    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
-    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
-    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
-    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
-    "Username as share" : "Benutzername als Freigabe",
-    "URL" : "Adresse",
-    "Secure https://" : "Sicheres https://",
-    "SFTP with secret key login" : "SFTP mit dem Login über einen geheimen Schlüssel",
-    "Public key" : "Öffentlicher Schlüssel",
     "Storage with id \"%i\" not found" : "Der Speicher mit der ID „%i“ wurde nicht gefunden",
     "Invalid mount point" : "Ungültiger mount point",
     "Invalid storage backend \"%s\"" : "Ungültiges Speicher-Backend „%s“",
-    "Access granted" : "Zugriff gestattet",
-    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
-    "Grant access" : "Zugriff gestatten",
-    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
     "Personal" : "Persönlich",
     "System" : "System",
+    "Grant access" : "Zugriff gestatten",
+    "Access granted" : "Zugriff gestattet",
+    "Generate keys" : "Schlüssel erzeugen",
+    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "Enable previews" : "Vorschau aktivieren",
     "Check for changes" : "Auf Änderungen überprüfen",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Alle Benutzer. Benutzer oder Gruppe zur Auswahl eingeben.",
     "(group)" : "(group)",
     "Saved" : "Gespeichert",
-    "Generate keys" : "Schlüssel erzeugen",
-    "Error generating key pair" : "Fehler beim Erzeugen des Schlüsselpaares",
+    "None" : "Keine",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "API key" : "API-Schlüssel",
+    "Public key" : "Öffentlicher Schlüssel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfadstil aktivieren",
+    "WebDAV" : "WebDAV",
+    "URL" : "Adresse",
+    "Remote subfolder" : "Entfernter Unterordner",
+    "Secure https://" : "Sicheres https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicheres ftps://",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Benutzername als Freigabe",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
     "<b>Note:</b> " : "<b>Hinweis:</b> ",
-    "and" : "und",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
@@ -77,9 +63,9 @@
     "Folder name" : "Ordnername",
     "Configuration" : "Konfiguration",
     "Available for" : "Verfügbar für",
-    "Add storage" : "Speicher hinzufügen",
     "Advanced settings" : "Erweiterte Einstellungen",
     "Delete" : "Löschen",
+    "Add storage" : "Speicher hinzufügen",
     "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
     "Allow users to mount the following external storage" : "Erlauben Sie Benutzern, folgende externe Speicher einzubinden"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js
index e3b96e4cc4..b311d615c3 100644
--- a/apps/files_external/l10n/el.js
+++ b/apps/files_external/l10n/el.js
@@ -1,59 +1,29 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά.",
-    "Please provide a valid Dropbox app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Please provide a valid app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί εφαρμογής και μυστικό.",
     "Step 1 failed. Exception: %s" : "Το βήμα 1 απέτυχε. Εξαίρεση: %s",
     "Step 2 failed. Exception: %s" : "Το βήμα 2 απέτυχε. Εξαίρεση: %s",
     "External storage" : "Εξωτερική αποθήκευση",
-    "Local" : "Τοπικός",
-    "Location" : "Τοποθεσία",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Κλειδί",
-    "Secret" : "Μυστικό",
-    "Bucket" : "Κάδος",
-    "Amazon S3 and compliant" : "Amazon S3 και συμμορφούμενα",
-    "Access Key" : "Κλειδί πρόσβασης",
-    "Secret Key" : "Μυστικό κλειδί",
-    "Hostname" : "Όνομα Υπολογιστή",
-    "Port" : "Θύρα",
-    "Region" : "Περιοχή",
-    "Enable SSL" : "Ενεργοποίηση SSL",
-    "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
-    "App key" : "Κλειδί εφαρμογής",
-    "App secret" : "Μυστικό εφαρμογής",
-    "Host" : "Διακομιστής",
-    "Username" : "Όνομα χρήστη",
-    "Password" : "Κωδικός πρόσβασης",
-    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
-    "Secure ftps://" : "Ασφαλής ftps://",
-    "Client ID" : "ID πελάτη",
-    "Client secret" : "Μυστικό πελάτη",
-    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Όνομα ενοίκου (απαιτείται για την Αποθήκευση Αντικειμένων OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα",
-    "Share" : "Διαμοιράστε",
-    "SMB / CIFS using OC login" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
-    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
-    "URL" : "URL",
-    "Secure https://" : "Ασφαλής σύνδεση https://",
-    "SFTP with secret key login" : "SFTP με σύνδεση με κρυφό κλειδί",
-    "Public key" : "Δημόσιο κλειδί",
     "Storage with id \"%i\" not found" : "Αποθήκευση με id \"%i\" δεν βρέθηκε",
+    "Invalid backend or authentication mechanism class" : "Μη έγκυρη κλάση συστήματος ή μηχανισμού πιστοποίησης",
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
+    "Objectstore forbidden" : "Απαγορευμένο objectstore",
     "Invalid storage backend \"%s\"" : "Μή έγκυρο σύστημα υποστήριξης αποθήκευσης  \"%s\"",
-    "Access granted" : "Πρόσβαση παρασχέθηκε",
-    "Error configuring Dropbox storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
-    "Grant access" : "Παροχή πρόσβασης",
-    "Error configuring Google Drive storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
+    "Not permitted to use backend \"%s\"" : "Μη επιτρεπόμενο σύστημα υποστήριξης \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Μη επιτρεπόμενος μηχανισμός πιστοποίησης \"%s\"",
+    "Unsatisfied backend parameters" : "Ελλιπείς παράμετροι συστήματος",
+    "Unsatisfied authentication mechanism parameters" : "Ελλιπείς παράμετροι μηχανισμού πιστοποίησης",
     "Personal" : "Προσωπικά",
     "System" : "Σύστημα",
+    "Grant access" : "Παροχή πρόσβασης",
+    "Access granted" : "Πρόσβαση παρασχέθηκε",
+    "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1",
+    "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2",
+    "Generate keys" : "Δημιουργία κλειδιών",
+    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "Enable previews" : "Ενεργοποίηση προεπισκοπήσεων",
     "Check for changes" : "Έλεγχος για αλλαγές",
@@ -63,10 +33,57 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
     "(group)" : "(ομάδα)",
     "Saved" : "Αποθηκεύτηκαν",
-    "Generate keys" : "Δημιουργία κλειδιών",
-    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
+    "Access key" : "Κλειδί πρόσβασης",
+    "Secret key" : "Μυστικό κλειδί",
+    "Builtin" : "Builtin",
+    "None" : "Τίποτα",
+    "OAuth1" : "OAuth1",
+    "App key" : "Κλειδί εφαρμογής",
+    "App secret" : "Μυστικό εφαρμογής",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID πελάτη",
+    "Client secret" : "Μυστικό πελάτη",
+    "OpenStack" : "OpenStack",
+    "Username" : "Όνομα χρήστη",
+    "Password" : "Κωδικός πρόσβασης",
+    "Tenant name" : "Όνομα \"ένοικου\"",
+    "Identity endpoint URL" : "URL τελικού σημείου ταυτοποίησης",
+    "Rackspace" : "Rackspace",
+    "API key" : "Κλειδί Google API",
+    "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
+    "Session credentials" : "Διαπιστευτήρια συνεδρίας",
+    "RSA public key" : "Δημόσιο κλειδί RSA",
+    "Public key" : "Δημόσιο κλειδί",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Κάδος",
+    "Hostname" : "Όνομα Υπολογιστή",
+    "Port" : "Θύρα",
+    "Region" : "Περιοχή",
+    "Enable SSL" : "Ενεργοποίηση SSL",
+    "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
+    "Secure https://" : "Ασφαλής σύνδεση https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Διακομιστής",
+    "Secure ftps://" : "Ασφαλής ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Τοπικός",
+    "Location" : "Τοποθεσία",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP με σύνδεση με κρυφό κλειδί [ΠΑΡΩΧΗΜΕΝΟ]",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Διαμοιράστε",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC [ΠΑΡΩΧΗΜΕΝΟ]",
+    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
+    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
+    "Service name" : "Όνομα υπηρεσίας",
+    "Request timeout (seconds)" : "Χρονικό όριο αιτήματος (δευτερόλεπτα)",
     "<b>Note:</b> " : "<b>Σημείωση:</b> ",
-    "and" : "και",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
@@ -77,11 +94,12 @@ OC.L10N.register(
     "Scope" : "Εύρος",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
     "Folder name" : "Όνομα φακέλου",
+    "Authentication" : "Πιστοποίηση",
     "Configuration" : "Ρυθμίσεις",
     "Available for" : "Διαθέσιμο για",
-    "Add storage" : "Προσθηκη αποθηκευσης",
     "Advanced settings" : "Ρυθμίσεις για προχωρημένους",
     "Delete" : "Διαγραφή",
+    "Add storage" : "Προσθηκη αποθηκευσης",
     "Enable User External Storage" : "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη",
     "Allow users to mount the following external storage" : "Χορήγηση άδειας στους χρήστες να συνδέσουν τα παρακάτω εξωτερικά μέσα αποθήκευσης"
 },
diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json
index e62da96551..f42a610cc5 100644
--- a/apps/files_external/l10n/el.json
+++ b/apps/files_external/l10n/el.json
@@ -1,57 +1,27 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά.",
-    "Please provide a valid Dropbox app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό είναι ορθά.",
+    "Please provide a valid app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί εφαρμογής και μυστικό.",
     "Step 1 failed. Exception: %s" : "Το βήμα 1 απέτυχε. Εξαίρεση: %s",
     "Step 2 failed. Exception: %s" : "Το βήμα 2 απέτυχε. Εξαίρεση: %s",
     "External storage" : "Εξωτερική αποθήκευση",
-    "Local" : "Τοπικός",
-    "Location" : "Τοποθεσία",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Κλειδί",
-    "Secret" : "Μυστικό",
-    "Bucket" : "Κάδος",
-    "Amazon S3 and compliant" : "Amazon S3 και συμμορφούμενα",
-    "Access Key" : "Κλειδί πρόσβασης",
-    "Secret Key" : "Μυστικό κλειδί",
-    "Hostname" : "Όνομα Υπολογιστή",
-    "Port" : "Θύρα",
-    "Region" : "Περιοχή",
-    "Enable SSL" : "Ενεργοποίηση SSL",
-    "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
-    "App key" : "Κλειδί εφαρμογής",
-    "App secret" : "Μυστικό εφαρμογής",
-    "Host" : "Διακομιστής",
-    "Username" : "Όνομα χρήστη",
-    "Password" : "Κωδικός πρόσβασης",
-    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
-    "Secure ftps://" : "Ασφαλής ftps://",
-    "Client ID" : "ID πελάτη",
-    "Client secret" : "Μυστικό πελάτη",
-    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Όνομα ενοίκου (απαιτείται για την Αποθήκευση Αντικειμένων OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα",
-    "Share" : "Διαμοιράστε",
-    "SMB / CIFS using OC login" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
-    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
-    "URL" : "URL",
-    "Secure https://" : "Ασφαλής σύνδεση https://",
-    "SFTP with secret key login" : "SFTP με σύνδεση με κρυφό κλειδί",
-    "Public key" : "Δημόσιο κλειδί",
     "Storage with id \"%i\" not found" : "Αποθήκευση με id \"%i\" δεν βρέθηκε",
+    "Invalid backend or authentication mechanism class" : "Μη έγκυρη κλάση συστήματος ή μηχανισμού πιστοποίησης",
     "Invalid mount point" : "Μη έγκυρο σημείο ανάρτησης",
+    "Objectstore forbidden" : "Απαγορευμένο objectstore",
     "Invalid storage backend \"%s\"" : "Μή έγκυρο σύστημα υποστήριξης αποθήκευσης  \"%s\"",
-    "Access granted" : "Πρόσβαση παρασχέθηκε",
-    "Error configuring Dropbox storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
-    "Grant access" : "Παροχή πρόσβασης",
-    "Error configuring Google Drive storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
+    "Not permitted to use backend \"%s\"" : "Μη επιτρεπόμενο σύστημα υποστήριξης \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "Μη επιτρεπόμενος μηχανισμός πιστοποίησης \"%s\"",
+    "Unsatisfied backend parameters" : "Ελλιπείς παράμετροι συστήματος",
+    "Unsatisfied authentication mechanism parameters" : "Ελλιπείς παράμετροι μηχανισμού πιστοποίησης",
     "Personal" : "Προσωπικά",
     "System" : "Σύστημα",
+    "Grant access" : "Παροχή πρόσβασης",
+    "Access granted" : "Πρόσβαση παρασχέθηκε",
+    "Error configuring OAuth1" : "Σφάλμα ρύθμισης του OAuth1",
+    "Error configuring OAuth2" : "Σφάλμα ρύθμισης του OAuth2",
+    "Generate keys" : "Δημιουργία κλειδιών",
+    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "Enable previews" : "Ενεργοποίηση προεπισκοπήσεων",
     "Check for changes" : "Έλεγχος για αλλαγές",
@@ -61,10 +31,57 @@
     "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
     "(group)" : "(ομάδα)",
     "Saved" : "Αποθηκεύτηκαν",
-    "Generate keys" : "Δημιουργία κλειδιών",
-    "Error generating key pair" : "Σφάλμα κατά τη δημιουργία ζεύγους κλειδιών",
+    "Access key" : "Κλειδί πρόσβασης",
+    "Secret key" : "Μυστικό κλειδί",
+    "Builtin" : "Builtin",
+    "None" : "Τίποτα",
+    "OAuth1" : "OAuth1",
+    "App key" : "Κλειδί εφαρμογής",
+    "App secret" : "Μυστικό εφαρμογής",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID πελάτη",
+    "Client secret" : "Μυστικό πελάτη",
+    "OpenStack" : "OpenStack",
+    "Username" : "Όνομα χρήστη",
+    "Password" : "Κωδικός πρόσβασης",
+    "Tenant name" : "Όνομα \"ένοικου\"",
+    "Identity endpoint URL" : "URL τελικού σημείου ταυτοποίησης",
+    "Rackspace" : "Rackspace",
+    "API key" : "Κλειδί Google API",
+    "Username and password" : "Όνομα χρήστη και κωδικός πρόσβασης",
+    "Session credentials" : "Διαπιστευτήρια συνεδρίας",
+    "RSA public key" : "Δημόσιο κλειδί RSA",
+    "Public key" : "Δημόσιο κλειδί",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Κάδος",
+    "Hostname" : "Όνομα Υπολογιστή",
+    "Port" : "Θύρα",
+    "Region" : "Περιοχή",
+    "Enable SSL" : "Ενεργοποίηση SSL",
+    "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
+    "Secure https://" : "Ασφαλής σύνδεση https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Διακομιστής",
+    "Secure ftps://" : "Ασφαλής ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Τοπικός",
+    "Location" : "Τοποθεσία",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP με σύνδεση με κρυφό κλειδί [ΠΑΡΩΧΗΜΕΝΟ]",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Διαμοιράστε",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC [ΠΑΡΩΧΗΜΕΝΟ]",
+    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
+    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
+    "Service name" : "Όνομα υπηρεσίας",
+    "Request timeout (seconds)" : "Χρονικό όριο αιτήματος (δευτερόλεπτα)",
     "<b>Note:</b> " : "<b>Σημείωση:</b> ",
-    "and" : "και",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
@@ -75,11 +92,12 @@
     "Scope" : "Εύρος",
     "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
     "Folder name" : "Όνομα φακέλου",
+    "Authentication" : "Πιστοποίηση",
     "Configuration" : "Ρυθμίσεις",
     "Available for" : "Διαθέσιμο για",
-    "Add storage" : "Προσθηκη αποθηκευσης",
     "Advanced settings" : "Ρυθμίσεις για προχωρημένους",
     "Delete" : "Διαγραφή",
+    "Add storage" : "Προσθηκη αποθηκευσης",
     "Enable User External Storage" : "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη",
     "Allow users to mount the following external storage" : "Χορήγηση άδειας στους χρήστες να συνδέσουν τα παρακάτω εξωτερικά μέσα αποθήκευσης"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js
index 29c1eebb7e..8b1c0cdd32 100644
--- a/apps/files_external/l10n/en_GB.js
+++ b/apps/files_external/l10n/en_GB.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.",
-    "Please provide a valid Dropbox app key and secret." : "Please provide a valid Dropbox app key and secret.",
     "Step 1 failed. Exception: %s" : "Step 1 failed. Exception: %s",
     "Step 2 failed. Exception: %s" : "Step 2 failed. Exception: %s",
     "External storage" : "External storage",
-    "Local" : "Local",
-    "Location" : "Location",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 and compliant",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Hostname",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Enable SSL",
-    "Enable Path Style" : "Enable Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Host",
-    "Username" : "Username",
-    "Password" : "Password",
-    "Remote subfolder" : "Remote subfolder",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (optional for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (required for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (required for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (required for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (required for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (required for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout of HTTP requests in seconds",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS using OC login",
-    "Username as share" : "Username as share",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP with secret key login",
-    "Public key" : "Public key",
     "Storage with id \"%i\" not found" : "Storage with id \"%i\" not found",
     "Invalid mount point" : "Invalid mount point",
     "Invalid storage backend \"%s\"" : "Invalid storage backend \"%s\"",
-    "Access granted" : "Access granted",
-    "Error configuring Dropbox storage" : "Error configuring Dropbox storage",
-    "Grant access" : "Grant access",
-    "Error configuring Google Drive storage" : "Error configuring Google Drive storage",
     "Personal" : "Personal",
     "System" : "System",
+    "Grant access" : "Grant access",
+    "Access granted" : "Access granted",
+    "Generate keys" : "Generate keys",
+    "Error generating key pair" : "Error generating key pair",
     "Enable encryption" : "Enable encryption",
     "Enable previews" : "Enable previews",
     "Check for changes" : "Check for changes",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "All users. Type to select user or group.",
     "(group)" : "(group)",
     "Saved" : "Saved",
-    "Generate keys" : "Generate keys",
-    "Error generating key pair" : "Error generating key pair",
+    "None" : "None",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Username",
+    "Password" : "Password",
+    "API key" : "API key",
+    "Public key" : "Public key",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Enable SSL",
+    "Enable Path Style" : "Enable Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Remote subfolder",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Local" : "Local",
+    "Location" : "Location",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Username as share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
-    "and" : "and",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Folder name",
     "Configuration" : "Configuration",
     "Available for" : "Available for",
-    "Add storage" : "Add storage",
     "Advanced settings" : "Advanced settings",
     "Delete" : "Delete",
+    "Add storage" : "Add storage",
     "Enable User External Storage" : "Enable User External Storage",
     "Allow users to mount the following external storage" : "Allow users to mount the following external storage"
 },
diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json
index af3950f8ef..78feab7a08 100644
--- a/apps/files_external/l10n/en_GB.json
+++ b/apps/files_external/l10n/en_GB.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.",
-    "Please provide a valid Dropbox app key and secret." : "Please provide a valid Dropbox app key and secret.",
     "Step 1 failed. Exception: %s" : "Step 1 failed. Exception: %s",
     "Step 2 failed. Exception: %s" : "Step 2 failed. Exception: %s",
     "External storage" : "External storage",
-    "Local" : "Local",
-    "Location" : "Location",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 and compliant",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Hostname",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Enable SSL",
-    "Enable Path Style" : "Enable Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Host",
-    "Username" : "Username",
-    "Password" : "Password",
-    "Remote subfolder" : "Remote subfolder",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (optional for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (required for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (required for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (required for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (required for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (required for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout of HTTP requests in seconds",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS using OC login",
-    "Username as share" : "Username as share",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP with secret key login",
-    "Public key" : "Public key",
     "Storage with id \"%i\" not found" : "Storage with id \"%i\" not found",
     "Invalid mount point" : "Invalid mount point",
     "Invalid storage backend \"%s\"" : "Invalid storage backend \"%s\"",
-    "Access granted" : "Access granted",
-    "Error configuring Dropbox storage" : "Error configuring Dropbox storage",
-    "Grant access" : "Grant access",
-    "Error configuring Google Drive storage" : "Error configuring Google Drive storage",
     "Personal" : "Personal",
     "System" : "System",
+    "Grant access" : "Grant access",
+    "Access granted" : "Access granted",
+    "Generate keys" : "Generate keys",
+    "Error generating key pair" : "Error generating key pair",
     "Enable encryption" : "Enable encryption",
     "Enable previews" : "Enable previews",
     "Check for changes" : "Check for changes",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "All users. Type to select user or group.",
     "(group)" : "(group)",
     "Saved" : "Saved",
-    "Generate keys" : "Generate keys",
-    "Error generating key pair" : "Error generating key pair",
+    "None" : "None",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Username",
+    "Password" : "Password",
+    "API key" : "API key",
+    "Public key" : "Public key",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Enable SSL",
+    "Enable Path Style" : "Enable Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Remote subfolder",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Local" : "Local",
+    "Location" : "Location",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Share",
+    "Username as share" : "Username as share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Note:</b> ",
-    "and" : "and",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
@@ -77,9 +63,9 @@
     "Folder name" : "Folder name",
     "Configuration" : "Configuration",
     "Available for" : "Available for",
-    "Add storage" : "Add storage",
     "Advanced settings" : "Advanced settings",
     "Delete" : "Delete",
+    "Add storage" : "Add storage",
     "Enable User External Storage" : "Enable User External Storage",
     "Allow users to mount the following external storage" : "Allow users to mount the following external storage"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/eo.js b/apps/files_external/l10n/eo.js
index d781b947c0..8a8884777e 100644
--- a/apps/files_external/l10n/eo.js
+++ b/apps/files_external/l10n/eo.js
@@ -1,50 +1,45 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan.",
     "External storage" : "Malena memorilo",
-    "Local" : "Loka",
-    "Location" : "Loko",
+    "Personal" : "Persona",
+    "Grant access" : "Doni alirpermeson",
+    "Access granted" : "Alirpermeso donita",
+    "Saved" : "Konservita",
+    "None" : "Nenio",
+    "App key" : "Aplikaĵoklavo",
+    "App secret" : "Aplikaĵosekreto",
+    "Client ID" : "Klientidentigilo",
+    "Client secret" : "Klientosekreto",
+    "Username" : "Uzantonomo",
+    "Password" : "Pasvorto",
+    "API key" : "API-klavo",
+    "Public key" : "Publika ŝlosilo",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Klavo",
-    "Secret" : "Sekreto",
-    "Access Key" : "Aliroklavo",
-    "Secret Key" : "Sekretoklavo",
     "Port" : "Pordo",
     "Region" : "Regiono",
     "Enable SSL" : "Kapabligi SSL-on",
-    "App key" : "Aplikaĵoklavo",
-    "App secret" : "Aplikaĵosekreto",
-    "Host" : "Gastigo",
-    "Username" : "Uzantonomo",
-    "Password" : "Pasvorto",
-    "Remote subfolder" : "Malloka subdosierujo",
-    "Secure ftps://" : "Sekura ftps://",
-    "Client ID" : "Klientidentigilo",
-    "Client secret" : "Klientosekreto",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regiono (malnepra por OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-klavo (nepra por Rackspace Cloud Files)",
-    "Password (required for OpenStack Object Storage)" : "Pasvorto (nepra por OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Servonomo (nepra por OpenStack Object Storage)",
-    "Share" : "Kunhavigi",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Malloka subdosierujo",
     "Secure https://" : "Sekura https://",
-    "Public key" : "Publika ŝlosilo",
-    "Access granted" : "Alirpermeso donita",
-    "Error configuring Dropbox storage" : "Eraro dum agordado de la memorservo Dropbox",
-    "Grant access" : "Doni alirpermeson",
-    "Error configuring Google Drive storage" : "Eraro dum agordado de la memorservo Google Drive",
-    "Personal" : "Persona",
-    "Saved" : "Konservita",
+    "Dropbox" : "Dropbox",
+    "Host" : "Gastigo",
+    "Secure ftps://" : "Sekura ftps://",
+    "Local" : "Loka",
+    "Location" : "Loko",
+    "ownCloud" : "ownCloud",
+    "Root" : "Radiko",
+    "Share" : "Kunhavigi",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Noto:</b>",
     "Name" : "Nomo",
     "External Storage" : "Malena memorilo",
     "Folder name" : "Dosierujnomo",
     "Configuration" : "Agordo",
     "Available for" : "Disponebla por",
-    "Add storage" : "Aldoni memorilon",
     "Delete" : "Forigi",
+    "Add storage" : "Aldoni memorilon",
     "Enable User External Storage" : "Kapabligi malenan memorilon de uzanto",
     "Allow users to mount the following external storage" : "Permesi uzantojn munti la jenajn malenajn memorilojn"
 },
diff --git a/apps/files_external/l10n/eo.json b/apps/files_external/l10n/eo.json
index 795be07ce2..6741a31e72 100644
--- a/apps/files_external/l10n/eo.json
+++ b/apps/files_external/l10n/eo.json
@@ -1,48 +1,43 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan.",
     "External storage" : "Malena memorilo",
-    "Local" : "Loka",
-    "Location" : "Loko",
+    "Personal" : "Persona",
+    "Grant access" : "Doni alirpermeson",
+    "Access granted" : "Alirpermeso donita",
+    "Saved" : "Konservita",
+    "None" : "Nenio",
+    "App key" : "Aplikaĵoklavo",
+    "App secret" : "Aplikaĵosekreto",
+    "Client ID" : "Klientidentigilo",
+    "Client secret" : "Klientosekreto",
+    "Username" : "Uzantonomo",
+    "Password" : "Pasvorto",
+    "API key" : "API-klavo",
+    "Public key" : "Publika ŝlosilo",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Klavo",
-    "Secret" : "Sekreto",
-    "Access Key" : "Aliroklavo",
-    "Secret Key" : "Sekretoklavo",
     "Port" : "Pordo",
     "Region" : "Regiono",
     "Enable SSL" : "Kapabligi SSL-on",
-    "App key" : "Aplikaĵoklavo",
-    "App secret" : "Aplikaĵosekreto",
-    "Host" : "Gastigo",
-    "Username" : "Uzantonomo",
-    "Password" : "Pasvorto",
-    "Remote subfolder" : "Malloka subdosierujo",
-    "Secure ftps://" : "Sekura ftps://",
-    "Client ID" : "Klientidentigilo",
-    "Client secret" : "Klientosekreto",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regiono (malnepra por OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-klavo (nepra por Rackspace Cloud Files)",
-    "Password (required for OpenStack Object Storage)" : "Pasvorto (nepra por OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Servonomo (nepra por OpenStack Object Storage)",
-    "Share" : "Kunhavigi",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Malloka subdosierujo",
     "Secure https://" : "Sekura https://",
-    "Public key" : "Publika ŝlosilo",
-    "Access granted" : "Alirpermeso donita",
-    "Error configuring Dropbox storage" : "Eraro dum agordado de la memorservo Dropbox",
-    "Grant access" : "Doni alirpermeson",
-    "Error configuring Google Drive storage" : "Eraro dum agordado de la memorservo Google Drive",
-    "Personal" : "Persona",
-    "Saved" : "Konservita",
+    "Dropbox" : "Dropbox",
+    "Host" : "Gastigo",
+    "Secure ftps://" : "Sekura ftps://",
+    "Local" : "Loka",
+    "Location" : "Loko",
+    "ownCloud" : "ownCloud",
+    "Root" : "Radiko",
+    "Share" : "Kunhavigi",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Noto:</b>",
     "Name" : "Nomo",
     "External Storage" : "Malena memorilo",
     "Folder name" : "Dosierujnomo",
     "Configuration" : "Agordo",
     "Available for" : "Disponebla por",
-    "Add storage" : "Aldoni memorilon",
     "Delete" : "Forigi",
+    "Add storage" : "Aldoni memorilon",
     "Enable User External Storage" : "Kapabligi malenan memorilon de uzanto",
     "Allow users to mount the following external storage" : "Permesi uzantojn munti la jenajn malenajn memorilojn"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js
index dbe7923d1f..62d09425f7 100644
--- a/apps/files_external/l10n/es.js
+++ b/apps/files_external/l10n/es.js
@@ -1,59 +1,20 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens solicitados ha fallado. Verifique que la clave y el secreto de su app Dropbox sean correctos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens de acceso ha fallado. Verifique que la clave y el secreto de su app Dropbox es correcta.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
     "Step 1 failed. Exception: %s" : "El paso 1 falló. Excepción: %s",
     "Step 2 failed. Exception: %s" : "El paso 2 falló. Excepción: %s",
     "External storage" : "Almacenamiento externo",
-    "Local" : "Local",
-    "Location" : "Ubicación",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secreto",
-    "Bucket" : "Depósito",
-    "Amazon S3 and compliant" : "Amazon S3 y compatibilidad",
-    "Access Key" : "Clave de Acceso",
-    "Secret Key" : "Clave secreta",
-    "Hostname" : "Nombre de equipo",
-    "Port" : "Puerto",
-    "Region" : "Región",
-    "Enable SSL" : "Habilitar SSL",
-    "Enable Path Style" : "Habilitar Estilo de Ruta",
-    "App key" : "App principal",
-    "App secret" : "App secreta",
-    "Host" : "Servidor",
-    "Username" : "Nombre de usuario",
-    "Password" : "Contraseña",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Secure ftps://" : "—Seguro— ftps://",
-    "Client ID" : "ID de Cliente",
-    "Client secret" : "Cliente secreto",
-    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Región (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (requerida para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nombre de Inquilino (requerido para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (requerida para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nombre de Servicio (requerido para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos",
-    "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC",
-    "Username as share" : "Nombre de usuario como compartir",
-    "URL" : "URL",
-    "Secure https://" : "—Seguro— https://",
-    "SFTP with secret key login" : "Inicio de sesión SFTP con clave secreta",
-    "Public key" : "Clave pública",
     "Storage with id \"%i\" not found" : "No se ha encontrado almacenamiento con id \"%i\"",
     "Invalid mount point" : "Punto de montaje no válido",
     "Invalid storage backend \"%s\"" : "Motor de almacenamiento no válido «%s»",
-    "Access granted" : "Acceso concedido",
-    "Error configuring Dropbox storage" : "Error al configurar el almacenamiento de Dropbox",
-    "Grant access" : "Conceder acceso",
-    "Error configuring Google Drive storage" : "Error al configurar el almacenamiento de Google Drive",
     "Personal" : "Personal",
     "System" : "Sistema",
+    "Grant access" : "Conceder acceso",
+    "Access granted" : "Acceso concedido",
+    "Error configuring OAuth1" : "Error al configurar OAuth1",
+    "Error configuring OAuth2" : "Error al configurar OAuth2",
+    "Generate keys" : "Generar claves",
+    "Error generating key pair" : "Error al generar el par de claves",
     "Enable encryption" : "Habilitar cifrado",
     "Enable previews" : "Habilitar previsualizaciones",
     "Check for changes" : "Comprobar si hay cambios",
@@ -63,10 +24,47 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Guardado",
-    "Generate keys" : "Generar claves",
-    "Error generating key pair" : "Error al generar el par de claves",
+    "Access key" : "Clave de acceso",
+    "Secret key" : "Clave secreta",
+    "None" : "Ninguno",
+    "OAuth1" : "OAuth1",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID de Cliente",
+    "Client secret" : "Cliente secreto",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Username and password" : "Nombre de usuario y contraseña",
+    "Session credentials" : "Credenciales de la sesión",
+    "Public key" : "Clave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Depósito",
+    "Hostname" : "Nombre de equipo",
+    "Port" : "Puerto",
+    "Region" : "Región",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo de Ruta",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Secure https://" : "—Seguro— https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Servidor",
+    "Secure ftps://" : "—Seguro— ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Ubicación",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Raíz",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartir",
+    "Username as share" : "Nombre de usuario como compartir",
+    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "y",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" no está instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
@@ -77,11 +75,12 @@ OC.L10N.register(
     "Scope" : "Ámbito",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
+    "Authentication" : "Autenticación",
     "Configuration" : "Configuración",
     "Available for" : "Disponible para",
-    "Add storage" : "Añadir almacenamiento",
     "Advanced settings" : "Configuración avanzada",
     "Delete" : "Eliminar",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento externo de usuario",
     "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamiento externo"
 },
diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json
index f243928793..6bcfca820f 100644
--- a/apps/files_external/l10n/es.json
+++ b/apps/files_external/l10n/es.json
@@ -1,57 +1,18 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens solicitados ha fallado. Verifique que la clave y el secreto de su app Dropbox sean correctos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens de acceso ha fallado. Verifique que la clave y el secreto de su app Dropbox es correcta.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
     "Step 1 failed. Exception: %s" : "El paso 1 falló. Excepción: %s",
     "Step 2 failed. Exception: %s" : "El paso 2 falló. Excepción: %s",
     "External storage" : "Almacenamiento externo",
-    "Local" : "Local",
-    "Location" : "Ubicación",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secreto",
-    "Bucket" : "Depósito",
-    "Amazon S3 and compliant" : "Amazon S3 y compatibilidad",
-    "Access Key" : "Clave de Acceso",
-    "Secret Key" : "Clave secreta",
-    "Hostname" : "Nombre de equipo",
-    "Port" : "Puerto",
-    "Region" : "Región",
-    "Enable SSL" : "Habilitar SSL",
-    "Enable Path Style" : "Habilitar Estilo de Ruta",
-    "App key" : "App principal",
-    "App secret" : "App secreta",
-    "Host" : "Servidor",
-    "Username" : "Nombre de usuario",
-    "Password" : "Contraseña",
-    "Remote subfolder" : "Subcarpeta remota",
-    "Secure ftps://" : "—Seguro— ftps://",
-    "Client ID" : "ID de Cliente",
-    "Client secret" : "Cliente secreto",
-    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Región (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave API (requerida para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nombre de Inquilino (requerido para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contraseña (requerida para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nombre de Servicio (requerido para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos",
-    "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS que usan acceso OC",
-    "Username as share" : "Nombre de usuario como compartir",
-    "URL" : "URL",
-    "Secure https://" : "—Seguro— https://",
-    "SFTP with secret key login" : "Inicio de sesión SFTP con clave secreta",
-    "Public key" : "Clave pública",
     "Storage with id \"%i\" not found" : "No se ha encontrado almacenamiento con id \"%i\"",
     "Invalid mount point" : "Punto de montaje no válido",
     "Invalid storage backend \"%s\"" : "Motor de almacenamiento no válido «%s»",
-    "Access granted" : "Acceso concedido",
-    "Error configuring Dropbox storage" : "Error al configurar el almacenamiento de Dropbox",
-    "Grant access" : "Conceder acceso",
-    "Error configuring Google Drive storage" : "Error al configurar el almacenamiento de Google Drive",
     "Personal" : "Personal",
     "System" : "Sistema",
+    "Grant access" : "Conceder acceso",
+    "Access granted" : "Acceso concedido",
+    "Error configuring OAuth1" : "Error al configurar OAuth1",
+    "Error configuring OAuth2" : "Error al configurar OAuth2",
+    "Generate keys" : "Generar claves",
+    "Error generating key pair" : "Error al generar el par de claves",
     "Enable encryption" : "Habilitar cifrado",
     "Enable previews" : "Habilitar previsualizaciones",
     "Check for changes" : "Comprobar si hay cambios",
@@ -61,10 +22,47 @@
     "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Guardado",
-    "Generate keys" : "Generar claves",
-    "Error generating key pair" : "Error al generar el par de claves",
+    "Access key" : "Clave de acceso",
+    "Secret key" : "Clave secreta",
+    "None" : "Ninguno",
+    "OAuth1" : "OAuth1",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID de Cliente",
+    "Client secret" : "Cliente secreto",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "API key" : "clave API",
+    "Username and password" : "Nombre de usuario y contraseña",
+    "Session credentials" : "Credenciales de la sesión",
+    "Public key" : "Clave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Depósito",
+    "Hostname" : "Nombre de equipo",
+    "Port" : "Puerto",
+    "Region" : "Región",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo de Ruta",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Secure https://" : "—Seguro— https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Servidor",
+    "Secure ftps://" : "—Seguro— ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Ubicación",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Raíz",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartir",
+    "Username as share" : "Nombre de usuario como compartir",
+    "OpenStack Object Storage" : "Almacenamiento de objeto OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "y",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de FTP en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" no está instalado. No se puede montar %s. Pídale al administrador del sistema que lo instale.",
@@ -75,11 +73,12 @@
     "Scope" : "Ámbito",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
+    "Authentication" : "Autenticación",
     "Configuration" : "Configuración",
     "Available for" : "Disponible para",
-    "Add storage" : "Añadir almacenamiento",
     "Advanced settings" : "Configuración avanzada",
     "Delete" : "Eliminar",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento externo de usuario",
     "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamiento externo"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/es_AR.js b/apps/files_external/l10n/es_AR.js
index 0936079fbc..383b511a75 100644
--- a/apps/files_external/l10n/es_AR.js
+++ b/apps/files_external/l10n/es_AR.js
@@ -1,28 +1,29 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox.",
     "External storage" : "Almacenamiento externo",
-    "Location" : "Ubicación",
-    "Port" : "Puerto",
-    "Region" : "Provincia",
-    "Host" : "Servidor",
+    "Personal" : "Personal",
+    "Grant access" : "Permitir acceso",
+    "Access granted" : "Acceso permitido",
+    "Saved" : "Guardado",
+    "None" : "Ninguno",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
-    "Share" : "Compartir",
+    "API key" : "clave API",
+    "Port" : "Puerto",
+    "Region" : "Provincia",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Acceso permitido",
-    "Error configuring Dropbox storage" : "Error al configurar el almacenamiento de Dropbox",
-    "Grant access" : "Permitir acceso",
-    "Error configuring Google Drive storage" : "Error al configurar el almacenamiento de Google Drive",
-    "Personal" : "Personal",
-    "Saved" : "Guardado",
+    "Host" : "Servidor",
+    "Location" : "Ubicación",
+    "ownCloud" : "ownCloud",
+    "Share" : "Compartir",
     "Name" : "Nombre",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
     "Configuration" : "Configuración",
-    "Add storage" : "Añadir almacenamiento",
     "Delete" : "Borrar",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento de usuario externo"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/es_AR.json b/apps/files_external/l10n/es_AR.json
index 3b971a1883..0389f98e64 100644
--- a/apps/files_external/l10n/es_AR.json
+++ b/apps/files_external/l10n/es_AR.json
@@ -1,26 +1,27 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox.",
     "External storage" : "Almacenamiento externo",
-    "Location" : "Ubicación",
-    "Port" : "Puerto",
-    "Region" : "Provincia",
-    "Host" : "Servidor",
+    "Personal" : "Personal",
+    "Grant access" : "Permitir acceso",
+    "Access granted" : "Acceso permitido",
+    "Saved" : "Guardado",
+    "None" : "Ninguno",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
-    "Share" : "Compartir",
+    "API key" : "clave API",
+    "Port" : "Puerto",
+    "Region" : "Provincia",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Acceso permitido",
-    "Error configuring Dropbox storage" : "Error al configurar el almacenamiento de Dropbox",
-    "Grant access" : "Permitir acceso",
-    "Error configuring Google Drive storage" : "Error al configurar el almacenamiento de Google Drive",
-    "Personal" : "Personal",
-    "Saved" : "Guardado",
+    "Host" : "Servidor",
+    "Location" : "Ubicación",
+    "ownCloud" : "ownCloud",
+    "Share" : "Compartir",
     "Name" : "Nombre",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
     "Configuration" : "Configuración",
-    "Add storage" : "Añadir almacenamiento",
     "Delete" : "Borrar",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento de usuario externo"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/es_CL.js b/apps/files_external/l10n/es_CL.js
index e2936ebb41..6ab87d23bc 100644
--- a/apps/files_external/l10n/es_CL.js
+++ b/apps/files_external/l10n/es_CL.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "files_external",
     {
+    "Personal" : "Personal",
     "Username" : "Usuario",
     "Password" : "Clave",
     "Share" : "Compartir",
-    "Personal" : "Personal",
     "Folder name" : "Nombre del directorio"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/es_CL.json b/apps/files_external/l10n/es_CL.json
index 3c16c6b512..e2aa9b9add 100644
--- a/apps/files_external/l10n/es_CL.json
+++ b/apps/files_external/l10n/es_CL.json
@@ -1,8 +1,8 @@
 { "translations": {
+    "Personal" : "Personal",
     "Username" : "Usuario",
     "Password" : "Clave",
     "Share" : "Compartir",
-    "Personal" : "Personal",
     "Folder name" : "Nombre del directorio"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/es_MX.js b/apps/files_external/l10n/es_MX.js
index a51d157cd8..a8d1dea1a0 100644
--- a/apps/files_external/l10n/es_MX.js
+++ b/apps/files_external/l10n/es_MX.js
@@ -1,26 +1,25 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
     "External storage" : "Almacenamiento externo",
-    "Location" : "Ubicación",
-    "Port" : "Puerto",
-    "Host" : "Servidor",
+    "Personal" : "Personal",
+    "Grant access" : "Conceder acceso",
+    "Access granted" : "Acceso concedido",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
-    "Share" : "Compartir",
+    "API key" : "clave API",
+    "Port" : "Puerto",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Acceso concedido",
-    "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox",
-    "Grant access" : "Conceder acceso",
-    "Error configuring Google Drive storage" : "Error configurando el almacenamiento de Google Drive",
-    "Personal" : "Personal",
+    "Host" : "Servidor",
+    "Location" : "Ubicación",
+    "Share" : "Compartir",
     "Name" : "Nombre",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
     "Configuration" : "Configuración",
-    "Add storage" : "Añadir almacenamiento",
     "Delete" : "Eliminar",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento externo de usuario"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/es_MX.json b/apps/files_external/l10n/es_MX.json
index 4a4bccdefe..3fdea60b77 100644
--- a/apps/files_external/l10n/es_MX.json
+++ b/apps/files_external/l10n/es_MX.json
@@ -1,24 +1,23 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
     "External storage" : "Almacenamiento externo",
-    "Location" : "Ubicación",
-    "Port" : "Puerto",
-    "Host" : "Servidor",
+    "Personal" : "Personal",
+    "Grant access" : "Conceder acceso",
+    "Access granted" : "Acceso concedido",
     "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
-    "Share" : "Compartir",
+    "API key" : "clave API",
+    "Port" : "Puerto",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Acceso concedido",
-    "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox",
-    "Grant access" : "Conceder acceso",
-    "Error configuring Google Drive storage" : "Error configurando el almacenamiento de Google Drive",
-    "Personal" : "Personal",
+    "Host" : "Servidor",
+    "Location" : "Ubicación",
+    "Share" : "Compartir",
     "Name" : "Nombre",
     "External Storage" : "Almacenamiento externo",
     "Folder name" : "Nombre de la carpeta",
     "Configuration" : "Configuración",
-    "Add storage" : "Añadir almacenamiento",
     "Delete" : "Eliminar",
+    "Add storage" : "Añadir almacenamiento",
     "Enable User External Storage" : "Habilitar almacenamiento externo de usuario"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/et_EE.js b/apps/files_external/l10n/et_EE.js
index bc43609aca..50102a5d2e 100644
--- a/apps/files_external/l10n/et_EE.js
+++ b/apps/files_external/l10n/et_EE.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Tellimustõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ligipääsutõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
-    "Please provide a valid Dropbox app key and secret." : "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
     "Step 1 failed. Exception: %s" : "Samm 1 ebaõnnestus. Erind: %s",
     "Step 2 failed. Exception: %s" : "Samm 2 ebaõnnestus. Erind: %s",
     "External storage" : "Väline andmehoidla",
-    "Local" : "Kohalik",
-    "Location" : "Asukoht",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Võti",
-    "Secret" : "Salasõna",
-    "Bucket" : "Korv",
-    "Amazon S3 and compliant" : "Amazon S3 ja ühilduv",
-    "Access Key" : "Ligipääsu võti",
-    "Secret Key" : "Salavõti",
-    "Hostname" : "Hostinimi",
-    "Port" : "Port",
-    "Region" : "Piirkond",
-    "Enable SSL" : "SSL-i kasutamine",
-    "Enable Path Style" : "Luba otsingtee stiilis",
-    "App key" : "Rakenduse võti",
-    "App secret" : "Rakenduse salasõna",
-    "Host" : "Host",
-    "Username" : "Kasutajanimi",
-    "Password" : "Parool",
-    "Remote subfolder" : "Mujahl olev alamkaust",
-    "Secure ftps://" : "Turvaline ftps://",
-    "Client ID" : "Kliendi ID",
-    "Client secret" : "Kliendi salasõna",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regioon (valikuline OpenStack Object Storage puhul)",
-    "API Key (required for Rackspace Cloud Files)" : "API võti (vajalik Rackspace Cloud Files puhul)",
-    "Tenantname (required for OpenStack Object Storage)" : "Rendinimi (tenantname , vajalik OpenStack Object Storage puhul)",
-    "Password (required for OpenStack Object Storage)" : "Parool (vajalik OpenStack Object Storage puhul)",
-    "Service Name (required for OpenStack Object Storage)" : "Teenuse nimi (vajalik OpenStack Object Storage puhul)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Tuvastuse URL lõpp-punkt (vajalik OpenStack Object Storage puhul)",
-    "Timeout of HTTP requests in seconds" : "HTTP päringute aegumine sekundites",
-    "Share" : "Jaga",
-    "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
-    "Username as share" : "Kasutajanimi kui jagamine",
-    "URL" : "URL",
-    "Secure https://" : "Turvaline https://",
-    "SFTP with secret key login" : "SFTP koos salajase võtmega logimisega",
-    "Public key" : "Avalik võti",
     "Storage with id \"%i\" not found" : "Salvestuskohta ID-ga \"%i\" ei leitud",
     "Invalid mount point" : "Vigane ühenduspunkt",
     "Invalid storage backend \"%s\"" : "Vigane salvestuskoha taustsüsteem \"%s\"",
-    "Access granted" : "Ligipääs on antud",
-    "Error configuring Dropbox storage" : "Viga Dropboxi salvestusruumi seadistamisel",
-    "Grant access" : "Anna ligipääs",
-    "Error configuring Google Drive storage" : "Viga Google Drive'i salvestusruumi seadistamisel",
     "Personal" : "Isiklik",
     "System" : "Süsteem",
+    "Grant access" : "Anna ligipääs",
+    "Access granted" : "Ligipääs on antud",
+    "Generate keys" : "Loo võtmed",
+    "Error generating key pair" : "Viga võtmepaari loomisel",
     "Enable encryption" : "Luba krüpteerimine",
     "Enable previews" : "Luba eelvaated",
     "Check for changes" : "Otsi uuendusi",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.",
     "(group)" : "(grupp)",
     "Saved" : "Salvestatud",
-    "Generate keys" : "Loo võtmed",
-    "Error generating key pair" : "Viga võtmepaari loomisel",
+    "None" : "Pole",
+    "App key" : "Rakenduse võti",
+    "App secret" : "Rakenduse salasõna",
+    "Client ID" : "Kliendi ID",
+    "Client secret" : "Kliendi salasõna",
+    "Username" : "Kasutajanimi",
+    "Password" : "Parool",
+    "API key" : "API võti",
+    "Public key" : "Avalik võti",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Korv",
+    "Hostname" : "Hostinimi",
+    "Port" : "Port",
+    "Region" : "Piirkond",
+    "Enable SSL" : "SSL-i kasutamine",
+    "Enable Path Style" : "Luba otsingtee stiilis",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Mujahl olev alamkaust",
+    "Secure https://" : "Turvaline https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Turvaline ftps://",
+    "Local" : "Kohalik",
+    "Location" : "Asukoht",
+    "ownCloud" : "ownCloud",
+    "Root" : "Juur",
+    "Share" : "Jaga",
+    "Username as share" : "Kasutajanimi kui jagamine",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Märkus:</b>",
-    "and" : "ja",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> \"%s\" pole paigaldatud. Hoidla %s ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata vajalik tugi.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Kausta nimi",
     "Configuration" : "Seadistamine",
     "Available for" : "Saadaval",
-    "Add storage" : "Lisa andmehoidla",
     "Advanced settings" : "Lisavalikud",
     "Delete" : "Kustuta",
+    "Add storage" : "Lisa andmehoidla",
     "Enable User External Storage" : "Luba kasutajatele väline salvestamine",
     "Allow users to mount the following external storage" : "Võimalda kasutajatel ühendada järgmist välist andmehoidlat"
 },
diff --git a/apps/files_external/l10n/et_EE.json b/apps/files_external/l10n/et_EE.json
index 4870b55afb..d307bc9c21 100644
--- a/apps/files_external/l10n/et_EE.json
+++ b/apps/files_external/l10n/et_EE.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Tellimustõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ligipääsutõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
-    "Please provide a valid Dropbox app key and secret." : "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
     "Step 1 failed. Exception: %s" : "Samm 1 ebaõnnestus. Erind: %s",
     "Step 2 failed. Exception: %s" : "Samm 2 ebaõnnestus. Erind: %s",
     "External storage" : "Väline andmehoidla",
-    "Local" : "Kohalik",
-    "Location" : "Asukoht",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Võti",
-    "Secret" : "Salasõna",
-    "Bucket" : "Korv",
-    "Amazon S3 and compliant" : "Amazon S3 ja ühilduv",
-    "Access Key" : "Ligipääsu võti",
-    "Secret Key" : "Salavõti",
-    "Hostname" : "Hostinimi",
-    "Port" : "Port",
-    "Region" : "Piirkond",
-    "Enable SSL" : "SSL-i kasutamine",
-    "Enable Path Style" : "Luba otsingtee stiilis",
-    "App key" : "Rakenduse võti",
-    "App secret" : "Rakenduse salasõna",
-    "Host" : "Host",
-    "Username" : "Kasutajanimi",
-    "Password" : "Parool",
-    "Remote subfolder" : "Mujahl olev alamkaust",
-    "Secure ftps://" : "Turvaline ftps://",
-    "Client ID" : "Kliendi ID",
-    "Client secret" : "Kliendi salasõna",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regioon (valikuline OpenStack Object Storage puhul)",
-    "API Key (required for Rackspace Cloud Files)" : "API võti (vajalik Rackspace Cloud Files puhul)",
-    "Tenantname (required for OpenStack Object Storage)" : "Rendinimi (tenantname , vajalik OpenStack Object Storage puhul)",
-    "Password (required for OpenStack Object Storage)" : "Parool (vajalik OpenStack Object Storage puhul)",
-    "Service Name (required for OpenStack Object Storage)" : "Teenuse nimi (vajalik OpenStack Object Storage puhul)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Tuvastuse URL lõpp-punkt (vajalik OpenStack Object Storage puhul)",
-    "Timeout of HTTP requests in seconds" : "HTTP päringute aegumine sekundites",
-    "Share" : "Jaga",
-    "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
-    "Username as share" : "Kasutajanimi kui jagamine",
-    "URL" : "URL",
-    "Secure https://" : "Turvaline https://",
-    "SFTP with secret key login" : "SFTP koos salajase võtmega logimisega",
-    "Public key" : "Avalik võti",
     "Storage with id \"%i\" not found" : "Salvestuskohta ID-ga \"%i\" ei leitud",
     "Invalid mount point" : "Vigane ühenduspunkt",
     "Invalid storage backend \"%s\"" : "Vigane salvestuskoha taustsüsteem \"%s\"",
-    "Access granted" : "Ligipääs on antud",
-    "Error configuring Dropbox storage" : "Viga Dropboxi salvestusruumi seadistamisel",
-    "Grant access" : "Anna ligipääs",
-    "Error configuring Google Drive storage" : "Viga Google Drive'i salvestusruumi seadistamisel",
     "Personal" : "Isiklik",
     "System" : "Süsteem",
+    "Grant access" : "Anna ligipääs",
+    "Access granted" : "Ligipääs on antud",
+    "Generate keys" : "Loo võtmed",
+    "Error generating key pair" : "Viga võtmepaari loomisel",
     "Enable encryption" : "Luba krüpteerimine",
     "Enable previews" : "Luba eelvaated",
     "Check for changes" : "Otsi uuendusi",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.",
     "(group)" : "(grupp)",
     "Saved" : "Salvestatud",
-    "Generate keys" : "Loo võtmed",
-    "Error generating key pair" : "Viga võtmepaari loomisel",
+    "None" : "Pole",
+    "App key" : "Rakenduse võti",
+    "App secret" : "Rakenduse salasõna",
+    "Client ID" : "Kliendi ID",
+    "Client secret" : "Kliendi salasõna",
+    "Username" : "Kasutajanimi",
+    "Password" : "Parool",
+    "API key" : "API võti",
+    "Public key" : "Avalik võti",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Korv",
+    "Hostname" : "Hostinimi",
+    "Port" : "Port",
+    "Region" : "Piirkond",
+    "Enable SSL" : "SSL-i kasutamine",
+    "Enable Path Style" : "Luba otsingtee stiilis",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Mujahl olev alamkaust",
+    "Secure https://" : "Turvaline https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Turvaline ftps://",
+    "Local" : "Kohalik",
+    "Location" : "Asukoht",
+    "ownCloud" : "ownCloud",
+    "Root" : "Juur",
+    "Share" : "Jaga",
+    "Username as share" : "Kasutajanimi kui jagamine",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Märkus:</b>",
-    "and" : "ja",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> \"%s\" pole paigaldatud. Hoidla %s ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata vajalik tugi.",
@@ -77,9 +63,9 @@
     "Folder name" : "Kausta nimi",
     "Configuration" : "Seadistamine",
     "Available for" : "Saadaval",
-    "Add storage" : "Lisa andmehoidla",
     "Advanced settings" : "Lisavalikud",
     "Delete" : "Kustuta",
+    "Add storage" : "Lisa andmehoidla",
     "Enable User External Storage" : "Luba kasutajatele väline salvestamine",
     "Allow users to mount the following external storage" : "Võimalda kasutajatel ühendada järgmist välist andmehoidlat"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js
index b22205abdb..199676d726 100644
--- a/apps/files_external/l10n/eu.js
+++ b/apps/files_external/l10n/eu.js
@@ -1,59 +1,46 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Eskaera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Sarrera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
-    "Please provide a valid Dropbox app key and secret." : "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
     "Step 1 failed. Exception: %s" : "1 Urratsak huts egin du. Salbuespena: %s",
     "Step 2 failed. Exception: %s" : "2 Urratsak huts egin du. Salbuespena: %s",
     "External storage" : "Kanpoko biltegiratzea",
-    "Local" : "Bertakoa",
-    "Location" : "Kokapena",
+    "Personal" : "Pertsonala",
+    "System" : "Sistema",
+    "Grant access" : "Baimendu sarrera",
+    "Access granted" : "Sarrera baimendua",
+    "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
+    "(group)" : "(taldea)",
+    "Saved" : "Gordeta",
+    "None" : "Ezer",
+    "App key" : "Aplikazio gakoa",
+    "App secret" : "App sekretua",
+    "Client ID" : "Bezero ID",
+    "Client secret" : "Bezeroaren Sekretua",
+    "Username" : "Erabiltzaile izena",
+    "Password" : "Pasahitza",
+    "API key" : "APIaren gakoa",
+    "Public key" : "Gako publikoa",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Gakoa",
-    "Secret" : "Sekretua",
-    "Amazon S3 and compliant" : "Amazon S3 eta baliokideak",
-    "Access Key" : "Sarbide gakoa",
-    "Secret Key" : "Giltza Sekretua",
     "Hostname" : "Ostalari izena",
     "Port" : "Portua",
     "Region" : "Eskualdea",
     "Enable SSL" : "Gaitu SSL",
     "Enable Path Style" : "Gaitu Bide Estiloa",
-    "App key" : "Aplikazio gakoa",
-    "App secret" : "App sekretua",
-    "Host" : "Ostalaria",
-    "Username" : "Erabiltzaile izena",
-    "Password" : "Pasahitza",
-    "Remote subfolder" : "Urruneko azpikarpeta",
-    "Secure ftps://" : "ftps:// segurua",
-    "Client ID" : "Bezero ID",
-    "Client secret" : "Bezeroaren Sekretua",
-    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
-    "Region (optional for OpenStack Object Storage)" : "Eskualdea (hautazkoa OpenStack Objektu Biltegiratzerako)",
-    "API Key (required for Rackspace Cloud Files)" : "API Giltza (beharrezkoa Rackspace Cloud Filesentzako)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (beharrezkoa OpenStack Objektu Biltegiratzerko)",
-    "Password (required for OpenStack Object Storage)" : "Pasahitza (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "Service Name (required for OpenStack Object Storage)" : "Zerbitzuaren Izena (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nortasun amaierako puntuaren URLa (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "Timeout of HTTP requests in seconds" : "HTTP eskarien gehienezko denbora segundutan",
-    "Share" : "Partekatu",
-    "SMB / CIFS using OC login" : "SMB / CIFS saioa hasteko OC erabiliz",
-    "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Urruneko azpikarpeta",
     "Secure https://" : "https:// segurua",
-    "Public key" : "Gako publikoa",
-    "Access granted" : "Sarrera baimendua",
-    "Error configuring Dropbox storage" : "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
-    "Grant access" : "Baimendu sarrera",
-    "Error configuring Google Drive storage" : "Errore bat egon da Google Drive konfiguratzean",
-    "Personal" : "Pertsonala",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
-    "(group)" : "(taldea)",
-    "Saved" : "Gordeta",
+    "Dropbox" : "Dropbox",
+    "Host" : "Ostalaria",
+    "Secure ftps://" : "ftps:// segurua",
+    "Local" : "Bertakoa",
+    "Location" : "Kokapena",
+    "ownCloud" : "ownCloud",
+    "Root" : "Erroa",
+    "Share" : "Partekatu",
+    "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
+    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
     "<b>Note:</b> " : "<b>Oharra:</b>",
-    "and" : "eta",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
@@ -64,8 +51,8 @@ OC.L10N.register(
     "Folder name" : "Karpetaren izena",
     "Configuration" : "Konfigurazioa",
     "Available for" : "Hauentzat eskuragarri",
-    "Add storage" : "Gehitu biltegiratzea",
     "Delete" : "Ezabatu",
+    "Add storage" : "Gehitu biltegiratzea",
     "Enable User External Storage" : "Gaitu erabiltzaileentzako kanpo biltegiratzea",
     "Allow users to mount the following external storage" : "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen"
 },
diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json
index 6f46c8004b..f13311954f 100644
--- a/apps/files_external/l10n/eu.json
+++ b/apps/files_external/l10n/eu.json
@@ -1,57 +1,44 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Eskaera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Sarrera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
-    "Please provide a valid Dropbox app key and secret." : "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
     "Step 1 failed. Exception: %s" : "1 Urratsak huts egin du. Salbuespena: %s",
     "Step 2 failed. Exception: %s" : "2 Urratsak huts egin du. Salbuespena: %s",
     "External storage" : "Kanpoko biltegiratzea",
-    "Local" : "Bertakoa",
-    "Location" : "Kokapena",
+    "Personal" : "Pertsonala",
+    "System" : "Sistema",
+    "Grant access" : "Baimendu sarrera",
+    "Access granted" : "Sarrera baimendua",
+    "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
+    "(group)" : "(taldea)",
+    "Saved" : "Gordeta",
+    "None" : "Ezer",
+    "App key" : "Aplikazio gakoa",
+    "App secret" : "App sekretua",
+    "Client ID" : "Bezero ID",
+    "Client secret" : "Bezeroaren Sekretua",
+    "Username" : "Erabiltzaile izena",
+    "Password" : "Pasahitza",
+    "API key" : "APIaren gakoa",
+    "Public key" : "Gako publikoa",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Gakoa",
-    "Secret" : "Sekretua",
-    "Amazon S3 and compliant" : "Amazon S3 eta baliokideak",
-    "Access Key" : "Sarbide gakoa",
-    "Secret Key" : "Giltza Sekretua",
     "Hostname" : "Ostalari izena",
     "Port" : "Portua",
     "Region" : "Eskualdea",
     "Enable SSL" : "Gaitu SSL",
     "Enable Path Style" : "Gaitu Bide Estiloa",
-    "App key" : "Aplikazio gakoa",
-    "App secret" : "App sekretua",
-    "Host" : "Ostalaria",
-    "Username" : "Erabiltzaile izena",
-    "Password" : "Pasahitza",
-    "Remote subfolder" : "Urruneko azpikarpeta",
-    "Secure ftps://" : "ftps:// segurua",
-    "Client ID" : "Bezero ID",
-    "Client secret" : "Bezeroaren Sekretua",
-    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
-    "Region (optional for OpenStack Object Storage)" : "Eskualdea (hautazkoa OpenStack Objektu Biltegiratzerako)",
-    "API Key (required for Rackspace Cloud Files)" : "API Giltza (beharrezkoa Rackspace Cloud Filesentzako)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (beharrezkoa OpenStack Objektu Biltegiratzerko)",
-    "Password (required for OpenStack Object Storage)" : "Pasahitza (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "Service Name (required for OpenStack Object Storage)" : "Zerbitzuaren Izena (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nortasun amaierako puntuaren URLa (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-    "Timeout of HTTP requests in seconds" : "HTTP eskarien gehienezko denbora segundutan",
-    "Share" : "Partekatu",
-    "SMB / CIFS using OC login" : "SMB / CIFS saioa hasteko OC erabiliz",
-    "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Urruneko azpikarpeta",
     "Secure https://" : "https:// segurua",
-    "Public key" : "Gako publikoa",
-    "Access granted" : "Sarrera baimendua",
-    "Error configuring Dropbox storage" : "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
-    "Grant access" : "Baimendu sarrera",
-    "Error configuring Google Drive storage" : "Errore bat egon da Google Drive konfiguratzean",
-    "Personal" : "Pertsonala",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
-    "(group)" : "(taldea)",
-    "Saved" : "Gordeta",
+    "Dropbox" : "Dropbox",
+    "Host" : "Ostalaria",
+    "Secure ftps://" : "ftps:// segurua",
+    "Local" : "Bertakoa",
+    "Location" : "Kokapena",
+    "ownCloud" : "ownCloud",
+    "Root" : "Erroa",
+    "Share" : "Partekatu",
+    "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
+    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
     "<b>Note:</b> " : "<b>Oharra:</b>",
-    "and" : "eta",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
@@ -62,8 +49,8 @@
     "Folder name" : "Karpetaren izena",
     "Configuration" : "Konfigurazioa",
     "Available for" : "Hauentzat eskuragarri",
-    "Add storage" : "Gehitu biltegiratzea",
     "Delete" : "Ezabatu",
+    "Add storage" : "Gehitu biltegiratzea",
     "Enable User External Storage" : "Gaitu erabiltzaileentzako kanpo biltegiratzea",
     "Allow users to mount the following external storage" : "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/eu_ES.js b/apps/files_external/l10n/eu_ES.js
deleted file mode 100644
index 513edcb534..0000000000
--- a/apps/files_external/l10n/eu_ES.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "files_external",
-    {
-    "Location" : "kokapena",
-    "Personal" : "Pertsonala",
-    "Delete" : "Ezabatu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/eu_ES.json b/apps/files_external/l10n/eu_ES.json
deleted file mode 100644
index 149a30d1a7..0000000000
--- a/apps/files_external/l10n/eu_ES.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Location" : "kokapena",
-    "Personal" : "Pertsonala",
-    "Delete" : "Ezabatu"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_external/l10n/fa.js b/apps/files_external/l10n/fa.js
index 066684383e..1a3a06ba39 100644
--- a/apps/files_external/l10n/fa.js
+++ b/apps/files_external/l10n/fa.js
@@ -1,28 +1,29 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "لطفا یک کلید و کد امنیتی صحیح دراپ باکس وارد کنید.",
     "External storage" : "حافظه خارجی",
-    "Location" : "محل",
-    "Port" : "درگاه",
-    "Region" : "ناحیه",
-    "Host" : "میزبانی",
+    "Personal" : "شخصی",
+    "Grant access" : " مجوز اعطا دسترسی",
+    "Access granted" : "مجوز دسترسی صادر شد",
+    "Saved" : "ذخیره شد",
+    "None" : "هیچ‌کدام",
     "Username" : "نام کاربری",
     "Password" : "گذرواژه",
-    "Share" : "اشتراک‌گذاری",
+    "API key" : "کلید API ",
+    "Port" : "درگاه",
+    "Region" : "ناحیه",
+    "WebDAV" : "WebDAV",
     "URL" : "آدرس",
-    "Access granted" : "مجوز دسترسی صادر شد",
-    "Error configuring Dropbox storage" : "خطا به هنگام تنظیم فضای دراپ باکس",
-    "Grant access" : " مجوز اعطا دسترسی",
-    "Error configuring Google Drive storage" : "خطا به هنگام تنظیم فضای Google Drive",
-    "Personal" : "شخصی",
-    "Saved" : "ذخیره شد",
+    "Host" : "میزبانی",
+    "Location" : "محل",
+    "ownCloud" : "ownCloud",
+    "Share" : "اشتراک‌گذاری",
     "Name" : "نام",
     "External Storage" : "حافظه خارجی",
     "Folder name" : "نام پوشه",
     "Configuration" : "پیکربندی",
-    "Add storage" : "اضافه کردن حافظه",
     "Delete" : "حذف",
+    "Add storage" : "اضافه کردن حافظه",
     "Enable User External Storage" : "فعال سازی حافظه خارجی کاربر"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/fa.json b/apps/files_external/l10n/fa.json
index 21bd2c63b5..79a599d739 100644
--- a/apps/files_external/l10n/fa.json
+++ b/apps/files_external/l10n/fa.json
@@ -1,26 +1,27 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "لطفا یک کلید و کد امنیتی صحیح دراپ باکس وارد کنید.",
     "External storage" : "حافظه خارجی",
-    "Location" : "محل",
-    "Port" : "درگاه",
-    "Region" : "ناحیه",
-    "Host" : "میزبانی",
+    "Personal" : "شخصی",
+    "Grant access" : " مجوز اعطا دسترسی",
+    "Access granted" : "مجوز دسترسی صادر شد",
+    "Saved" : "ذخیره شد",
+    "None" : "هیچ‌کدام",
     "Username" : "نام کاربری",
     "Password" : "گذرواژه",
-    "Share" : "اشتراک‌گذاری",
+    "API key" : "کلید API ",
+    "Port" : "درگاه",
+    "Region" : "ناحیه",
+    "WebDAV" : "WebDAV",
     "URL" : "آدرس",
-    "Access granted" : "مجوز دسترسی صادر شد",
-    "Error configuring Dropbox storage" : "خطا به هنگام تنظیم فضای دراپ باکس",
-    "Grant access" : " مجوز اعطا دسترسی",
-    "Error configuring Google Drive storage" : "خطا به هنگام تنظیم فضای Google Drive",
-    "Personal" : "شخصی",
-    "Saved" : "ذخیره شد",
+    "Host" : "میزبانی",
+    "Location" : "محل",
+    "ownCloud" : "ownCloud",
+    "Share" : "اشتراک‌گذاری",
     "Name" : "نام",
     "External Storage" : "حافظه خارجی",
     "Folder name" : "نام پوشه",
     "Configuration" : "پیکربندی",
-    "Add storage" : "اضافه کردن حافظه",
     "Delete" : "حذف",
+    "Add storage" : "اضافه کردن حافظه",
     "Enable User External Storage" : "فعال سازی حافظه خارجی کاربر"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/fi.js b/apps/files_external/l10n/fi.js
deleted file mode 100644
index eaa9b89fc0..0000000000
--- a/apps/files_external/l10n/fi.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_external",
-    {
-    "Username" : "Käyttäjätunnus",
-    "Password" : "Salasana",
-    "URL" : "URL",
-    "Delete" : "Poista"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/fi.json b/apps/files_external/l10n/fi.json
deleted file mode 100644
index 8a702552ca..0000000000
--- a/apps/files_external/l10n/fi.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Username" : "Käyttäjätunnus",
-    "Password" : "Salasana",
-    "URL" : "URL",
-    "Delete" : "Poista"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js
index 430702d686..2243f5f552 100644
--- a/apps/files_external/l10n/fi_FI.js
+++ b/apps/files_external/l10n/fi_FI.js
@@ -1,51 +1,21 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus.",
     "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s",
     "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s",
     "External storage" : "Ulkoinen tallennustila",
-    "Local" : "Paikallinen",
-    "Location" : "Sijainti",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Avain",
-    "Secret" : "Salaisuus",
-    "Amazon S3 and compliant" : "Amazon S3 ja yhteensopivat",
-    "Access Key" : "Käyttöavain",
-    "Secret Key" : "Sala-avain",
-    "Port" : "Portti",
-    "Region" : "Alue",
-    "Enable SSL" : "Käytä SSL:ää",
-    "App key" : "Sovellusavain",
-    "App secret" : "Sovellussalaisuus",
-    "Host" : "Isäntä",
-    "Username" : "Käyttäjätunnus",
-    "Password" : "Salasana",
-    "Remote subfolder" : "Etäalikansio",
-    "Secure ftps://" : "Salattu ftps://",
-    "Client ID" : "Asiakkaan tunniste",
-    "Client secret" : "Asiakassalaisuus",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Alue (valinnainen OpenStack Object Storagen käyttöön)",
-    "API Key (required for Rackspace Cloud Files)" : "API-avain (vaaditaan Rackspace Cloud Filesin käyttöön)",
-    "Tenantname (required for OpenStack Object Storage)" : "Vuokralaisnimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Password (required for OpenStack Object Storage)" : "Salasana (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Service Name (required for OpenStack Object Storage)" : "Palvelun nimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Timeout of HTTP requests in seconds" : "HTTP-pyyntöjen aikakatkaisu sekunneissa",
-    "Share" : "Jaa",
-    "SMB / CIFS using OC login" : "SMB / CIFS käyttäen OC-kirjautumista",
-    "Username as share" : "Käyttäjänimi jakona",
-    "URL" : "Verkko-osoite",
-    "Secure https://" : "Salattu https://",
-    "Public key" : "Julkinen avain",
+    "Storage with id \"%i\" not found" : "Tallennustilaa tunnisteella \"%i\" ei löytynyt",
     "Invalid mount point" : "Virheellinen liitoskohta",
-    "Access granted" : "Pääsy sallittu",
-    "Error configuring Dropbox storage" : "Virhe Dropbox levyn asetuksia tehtäessä",
-    "Grant access" : "Salli pääsy",
-    "Error configuring Google Drive storage" : "Virhe Google Drive levyn asetuksia tehtäessä",
     "Personal" : "Henkilökohtainen",
     "System" : "Järjestelmä",
+    "Grant access" : "Salli pääsy",
+    "Access granted" : "Pääsy sallittu",
+    "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä",
+    "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä",
+    "Generate keys" : "Luo avaimet",
+    "Error generating key pair" : "Virhe luotaessa avainparia",
     "Enable encryption" : "Käytä salausta",
+    "Enable previews" : "Käytä esikatseluja",
     "Check for changes" : "Tarkista muutokset",
     "Never" : "Ei koskaan",
     "Once every direct access" : "Kerran aina suoran käytön yhteydessä",
@@ -53,10 +23,43 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.",
     "(group)" : "(ryhmä)",
     "Saved" : "Tallennettu",
-    "Generate keys" : "Luo avaimet",
-    "Error generating key pair" : "Virhe luotaessa avainparia",
+    "None" : "Ei mitään",
+    "OAuth1" : "OAuth1",
+    "App key" : "Sovellusavain",
+    "App secret" : "Sovellussalaisuus",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Asiakkaan tunniste",
+    "Client secret" : "Asiakassalaisuus",
+    "OpenStack" : "OpenStack",
+    "Username" : "Käyttäjätunnus",
+    "Password" : "Salasana",
+    "API key" : "API-avain",
+    "Username and password" : "Käyttäjätunnus ja salasana",
+    "RSA public key" : "Julkinen RSA-avain",
+    "Public key" : "Julkinen avain",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "Portti",
+    "Region" : "Alue",
+    "Enable SSL" : "Käytä SSL:ää",
+    "WebDAV" : "WebDAV",
+    "URL" : "Verkko-osoite",
+    "Remote subfolder" : "Etäalikansio",
+    "Secure https://" : "Salattu https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Isäntä",
+    "Secure ftps://" : "Salattu ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Paikallinen",
+    "Location" : "Sijainti",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Jaa",
+    "Username as share" : "Käyttäjänimi jakona",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Palvelun nimi",
     "<b>Note:</b> " : "<b>Huomio:</b> ",
-    "and" : "ja",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.",
@@ -66,11 +69,12 @@ OC.L10N.register(
     "Storage type" : "Tallennustilan tyyppi",
     "External Storage" : "Erillinen tallennusväline",
     "Folder name" : "Kansion nimi",
+    "Authentication" : "Tunnistautuminen",
     "Configuration" : "Asetukset",
     "Available for" : "Saatavuus",
-    "Add storage" : "Lisää tallennustila",
     "Advanced settings" : "Lisäasetukset",
     "Delete" : "Poista",
+    "Add storage" : "Lisää tallennustila",
     "Enable User External Storage" : "Ota käyttöön ulkopuoliset tallennuspaikat",
     "Allow users to mount the following external storage" : "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet"
 },
diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json
index 1f3bf46423..b629fad87c 100644
--- a/apps/files_external/l10n/fi_FI.json
+++ b/apps/files_external/l10n/fi_FI.json
@@ -1,49 +1,19 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus.",
     "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s",
     "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s",
     "External storage" : "Ulkoinen tallennustila",
-    "Local" : "Paikallinen",
-    "Location" : "Sijainti",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Avain",
-    "Secret" : "Salaisuus",
-    "Amazon S3 and compliant" : "Amazon S3 ja yhteensopivat",
-    "Access Key" : "Käyttöavain",
-    "Secret Key" : "Sala-avain",
-    "Port" : "Portti",
-    "Region" : "Alue",
-    "Enable SSL" : "Käytä SSL:ää",
-    "App key" : "Sovellusavain",
-    "App secret" : "Sovellussalaisuus",
-    "Host" : "Isäntä",
-    "Username" : "Käyttäjätunnus",
-    "Password" : "Salasana",
-    "Remote subfolder" : "Etäalikansio",
-    "Secure ftps://" : "Salattu ftps://",
-    "Client ID" : "Asiakkaan tunniste",
-    "Client secret" : "Asiakassalaisuus",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Alue (valinnainen OpenStack Object Storagen käyttöön)",
-    "API Key (required for Rackspace Cloud Files)" : "API-avain (vaaditaan Rackspace Cloud Filesin käyttöön)",
-    "Tenantname (required for OpenStack Object Storage)" : "Vuokralaisnimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Password (required for OpenStack Object Storage)" : "Salasana (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Service Name (required for OpenStack Object Storage)" : "Palvelun nimi (vaaditaan OpenStack Object Storagen käyttöön)",
-    "Timeout of HTTP requests in seconds" : "HTTP-pyyntöjen aikakatkaisu sekunneissa",
-    "Share" : "Jaa",
-    "SMB / CIFS using OC login" : "SMB / CIFS käyttäen OC-kirjautumista",
-    "Username as share" : "Käyttäjänimi jakona",
-    "URL" : "Verkko-osoite",
-    "Secure https://" : "Salattu https://",
-    "Public key" : "Julkinen avain",
+    "Storage with id \"%i\" not found" : "Tallennustilaa tunnisteella \"%i\" ei löytynyt",
     "Invalid mount point" : "Virheellinen liitoskohta",
-    "Access granted" : "Pääsy sallittu",
-    "Error configuring Dropbox storage" : "Virhe Dropbox levyn asetuksia tehtäessä",
-    "Grant access" : "Salli pääsy",
-    "Error configuring Google Drive storage" : "Virhe Google Drive levyn asetuksia tehtäessä",
     "Personal" : "Henkilökohtainen",
     "System" : "Järjestelmä",
+    "Grant access" : "Salli pääsy",
+    "Access granted" : "Pääsy sallittu",
+    "Error configuring OAuth1" : "Virhe OAuth1:n asetuksia tehdessä",
+    "Error configuring OAuth2" : "Virhe OAuth2:n asetuksia tehdessä",
+    "Generate keys" : "Luo avaimet",
+    "Error generating key pair" : "Virhe luotaessa avainparia",
     "Enable encryption" : "Käytä salausta",
+    "Enable previews" : "Käytä esikatseluja",
     "Check for changes" : "Tarkista muutokset",
     "Never" : "Ei koskaan",
     "Once every direct access" : "Kerran aina suoran käytön yhteydessä",
@@ -51,10 +21,43 @@
     "All users. Type to select user or group." : "Kaikki käyttäjät. Kirjoita valitaksesi käyttäjän tai ryhmän.",
     "(group)" : "(ryhmä)",
     "Saved" : "Tallennettu",
-    "Generate keys" : "Luo avaimet",
-    "Error generating key pair" : "Virhe luotaessa avainparia",
+    "None" : "Ei mitään",
+    "OAuth1" : "OAuth1",
+    "App key" : "Sovellusavain",
+    "App secret" : "Sovellussalaisuus",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Asiakkaan tunniste",
+    "Client secret" : "Asiakassalaisuus",
+    "OpenStack" : "OpenStack",
+    "Username" : "Käyttäjätunnus",
+    "Password" : "Salasana",
+    "API key" : "API-avain",
+    "Username and password" : "Käyttäjätunnus ja salasana",
+    "RSA public key" : "Julkinen RSA-avain",
+    "Public key" : "Julkinen avain",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "Portti",
+    "Region" : "Alue",
+    "Enable SSL" : "Käytä SSL:ää",
+    "WebDAV" : "WebDAV",
+    "URL" : "Verkko-osoite",
+    "Remote subfolder" : "Etäalikansio",
+    "Secure https://" : "Salattu https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Isäntä",
+    "Secure ftps://" : "Salattu ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Paikallinen",
+    "Location" : "Sijainti",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Jaa",
+    "Username as share" : "Käyttäjänimi jakona",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Palvelun nimi",
     "<b>Note:</b> " : "<b>Huomio:</b> ",
-    "and" : "ja",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.",
@@ -64,11 +67,12 @@
     "Storage type" : "Tallennustilan tyyppi",
     "External Storage" : "Erillinen tallennusväline",
     "Folder name" : "Kansion nimi",
+    "Authentication" : "Tunnistautuminen",
     "Configuration" : "Asetukset",
     "Available for" : "Saatavuus",
-    "Add storage" : "Lisää tallennustila",
     "Advanced settings" : "Lisäasetukset",
     "Delete" : "Poista",
+    "Add storage" : "Lisää tallennustila",
     "Enable User External Storage" : "Ota käyttöön ulkopuoliset tallennuspaikat",
     "Allow users to mount the following external storage" : "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 9877d2b240..87c7f63bfb 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
-    "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons de requête a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons d'accès a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Please provide a valid app key and secret." : "Veuillez fournir une clé d'application et un mot de passe valides.",
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s",
     "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
-    "Local" : "Local",
-    "Location" : "Emplacement",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clé",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 et compatibles",
-    "Access Key" : "Clé d'accès",
-    "Secret Key" : "Clé secrète",
-    "Hostname" : "Nom de l'hôte",
-    "Port" : "Port",
-    "Region" : "Région",
-    "Enable SSL" : "Activer SSL",
-    "Enable Path Style" : "Accès par path",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Hôte",
-    "Username" : "Nom d'utilisateur",
-    "Password" : "Mot de passe",
-    "Remote subfolder" : "Sous-dossier distant",
-    "Secure ftps://" : "Sécurisation ftps://",
-    "Client ID" : "ID Client",
-    "Client secret" : "Secret client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Région (optionnel pour OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clé API (requis pour Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requis pour le stockage OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Mot de passe (requis pour OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom du service (requis pour le stockage OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Délai d'attente maximal des requêtes HTTP en secondes",
-    "Share" : "Partage",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
-    "Username as share" : "Nom d'utilisateur comme nom de partage",
-    "URL" : "URL",
-    "Secure https://" : "Sécurisation https://",
-    "SFTP with secret key login" : "SFTP avec identification par clé",
-    "Public key" : "Clef publique",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
+    "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
+    "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
-    "Access granted" : "Accès autorisé",
-    "Error configuring Dropbox storage" : "Erreur lors de la configuration du stockage Dropbox",
-    "Grant access" : "Autoriser l'accès",
-    "Error configuring Google Drive storage" : "Erreur lors de la configuration du stockage Google Drive",
+    "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
+    "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
     "Personal" : "Personnel",
     "System" : "Système",
+    "Grant access" : "Autoriser l'accès",
+    "Access granted" : "Accès autorisé",
+    "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1",
+    "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2",
+    "Generate keys" : "Générer des clés",
+    "Error generating key pair" : "Erreur lors de la génération des clés",
     "Enable encryption" : "Activer le chiffrement",
     "Enable previews" : "Activer les prévisualisations",
     "Check for changes" : "Rechercher les modifications",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.",
     "(group)" : "(groupe)",
     "Saved" : "Sauvegardé",
-    "Generate keys" : "Générer des clés",
-    "Error generating key pair" : "Erreur lors de la génération des clés",
+    "Access key" : "Clé d'accès",
+    "Secret key" : "Clé secrète",
+    "Builtin" : "inclus",
+    "None" : "Aucun",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID Client",
+    "Client secret" : "Secret client",
+    "Username" : "Nom d'utilisateur",
+    "Password" : "Mot de passe",
+    "API key" : "Clé API",
+    "Username and password" : "Nom d'utilisateur et mot de passe",
+    "Session credentials" : "Informations d'identification de session",
+    "Public key" : "Clef publique",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nom de l'hôte",
+    "Port" : "Port",
+    "Region" : "Région",
+    "Enable SSL" : "Activer SSL",
+    "Enable Path Style" : "Accès par path",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Sous-dossier distant",
+    "Secure https://" : "Sécurisation https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Hôte",
+    "Secure ftps://" : "Sécurisation ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Emplacement",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Partage",
+    "Username as share" : "Nom d'utilisateur comme nom de partage",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Attention :</b>",
-    "and" : " et ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Portée",
     "External Storage" : "Stockage externe",
     "Folder name" : "Nom du dossier",
+    "Authentication" : "Authentification",
     "Configuration" : "Configuration",
     "Available for" : "Disponible pour",
-    "Add storage" : "Ajouter un support de stockage",
     "Advanced settings" : "Paramètres avancés",
     "Delete" : "Supprimer",
+    "Add storage" : "Ajouter un support de stockage",
     "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes",
     "Allow users to mount the following external storage" : "Autoriser les utilisateurs à monter les stockages externes suivants"
 },
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index 22c5106b44..dee041e354 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
-    "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons de requête a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "L'obtention des jetons d'accès a échoué. Vérifiez que votre clé d'application et votre mot de passe sont corrects.",
+    "Please provide a valid app key and secret." : "Veuillez fournir une clé d'application et un mot de passe valides.",
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s",
     "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
-    "Local" : "Local",
-    "Location" : "Emplacement",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clé",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 et compatibles",
-    "Access Key" : "Clé d'accès",
-    "Secret Key" : "Clé secrète",
-    "Hostname" : "Nom de l'hôte",
-    "Port" : "Port",
-    "Region" : "Région",
-    "Enable SSL" : "Activer SSL",
-    "Enable Path Style" : "Accès par path",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Hôte",
-    "Username" : "Nom d'utilisateur",
-    "Password" : "Mot de passe",
-    "Remote subfolder" : "Sous-dossier distant",
-    "Secure ftps://" : "Sécurisation ftps://",
-    "Client ID" : "ID Client",
-    "Client secret" : "Secret client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Région (optionnel pour OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clé API (requis pour Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requis pour le stockage OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Mot de passe (requis pour OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom du service (requis pour le stockage OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL du point d'accès d'identité (requis pour le stockage OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Délai d'attente maximal des requêtes HTTP en secondes",
-    "Share" : "Partage",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
-    "Username as share" : "Nom d'utilisateur comme nom de partage",
-    "URL" : "URL",
-    "Secure https://" : "Sécurisation https://",
-    "SFTP with secret key login" : "SFTP avec identification par clé",
-    "Public key" : "Clef publique",
     "Storage with id \"%i\" not found" : "Stockage avec l'id \"%i\" non trouvé",
+    "Invalid backend or authentication mechanism class" : "Système de stockage ou méthode d'authentification non valable",
     "Invalid mount point" : "Point de montage non valide",
+    "Objectstore forbidden" : "\"Objectstore\" interdit",
     "Invalid storage backend \"%s\"" : "Service de stockage non valide : \"%s\"",
-    "Access granted" : "Accès autorisé",
-    "Error configuring Dropbox storage" : "Erreur lors de la configuration du stockage Dropbox",
-    "Grant access" : "Autoriser l'accès",
-    "Error configuring Google Drive storage" : "Erreur lors de la configuration du stockage Google Drive",
+    "Unsatisfied backend parameters" : "Paramètres manquants pour le service",
+    "Unsatisfied authentication mechanism parameters" : "Paramètres manquants pour la méthode d'authentification",
     "Personal" : "Personnel",
     "System" : "Système",
+    "Grant access" : "Autoriser l'accès",
+    "Access granted" : "Accès autorisé",
+    "Error configuring OAuth1" : "Erreur lors de la configuration de OAuth1",
+    "Error configuring OAuth2" : "Erreur lors de la configuration de OAuth2",
+    "Generate keys" : "Générer des clés",
+    "Error generating key pair" : "Erreur lors de la génération des clés",
     "Enable encryption" : "Activer le chiffrement",
     "Enable previews" : "Activer les prévisualisations",
     "Check for changes" : "Rechercher les modifications",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.",
     "(group)" : "(groupe)",
     "Saved" : "Sauvegardé",
-    "Generate keys" : "Générer des clés",
-    "Error generating key pair" : "Erreur lors de la génération des clés",
+    "Access key" : "Clé d'accès",
+    "Secret key" : "Clé secrète",
+    "Builtin" : "inclus",
+    "None" : "Aucun",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID Client",
+    "Client secret" : "Secret client",
+    "Username" : "Nom d'utilisateur",
+    "Password" : "Mot de passe",
+    "API key" : "Clé API",
+    "Username and password" : "Nom d'utilisateur et mot de passe",
+    "Session credentials" : "Informations d'identification de session",
+    "Public key" : "Clef publique",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nom de l'hôte",
+    "Port" : "Port",
+    "Region" : "Région",
+    "Enable SSL" : "Activer SSL",
+    "Enable Path Style" : "Accès par path",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Sous-dossier distant",
+    "Secure https://" : "Sécurisation https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Hôte",
+    "Secure ftps://" : "Sécurisation ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Emplacement",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Partage",
+    "Username as share" : "Nom d'utilisateur comme nom de partage",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Attention :</b>",
-    "and" : " et ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
@@ -75,11 +81,12 @@
     "Scope" : "Portée",
     "External Storage" : "Stockage externe",
     "Folder name" : "Nom du dossier",
+    "Authentication" : "Authentification",
     "Configuration" : "Configuration",
     "Available for" : "Disponible pour",
-    "Add storage" : "Ajouter un support de stockage",
     "Advanced settings" : "Paramètres avancés",
     "Delete" : "Supprimer",
+    "Add storage" : "Ajouter un support de stockage",
     "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes",
     "Allow users to mount the following external storage" : "Autoriser les utilisateurs à monter les stockages externes suivants"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js
index 9c46aa40b2..fc4d4ea493 100644
--- a/apps/files_external/l10n/gl.js
+++ b/apps/files_external/l10n/gl.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de petición. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de acceso. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
-    "Please provide a valid Dropbox app key and secret." : "Forneza unha chave correcta e secreta do Dropbox.",
     "Step 1 failed. Exception: %s" : "Fallou o paso 1. Excepción: %s",
     "Step 2 failed. Exception: %s" : "Fallou o paso 2. Excepción: %s",
     "External storage" : "Almacenamento externo",
-    "Local" : "Local",
-    "Location" : "Localización",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secreto",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatíbeis",
-    "Access Key" : "Clave de acceso",
-    "Secret Key" : "Chave secreta",
-    "Hostname" : "Nome de máquina",
-    "Port" : "Porto",
-    "Region" : "Rexión",
-    "Enable SSL" : "Activar SSL",
-    "Enable Path Style" : "Activar o estilo de ruta",
-    "App key" : "Clave da API",
-    "App secret" : "Secreto da aplicación",
-    "Host" : "Servidor",
-    "Username" : "Nome de usuario",
-    "Password" : "Contrasinal",
-    "Remote subfolder" : "Subcartafol remoto",
-    "Secure ftps://" : "ftps:// seguro",
-    "Client ID" : "ID do cliente",
-    "Client secret" : "Secreto do cliente",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Rexión (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave da API (obrigatoria para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do inquilino (obrigatorio para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Caducidade, en segundos, das peticións HTTP",
-    "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
-    "Username as share" : "Nome de usuario como compartición",
-    "URL" : "URL",
-    "Secure https://" : "https:// seguro",
-    "SFTP with secret key login" : "SFTP con chave secreta de acceso",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Non se atopa o almacenamento co ID «%i» ",
     "Invalid mount point" : "Punto de montaxe incorrecto",
     "Invalid storage backend \"%s\"" : "Infraestrutura de almacenamento «%s» incorrecta",
-    "Access granted" : "Concedeuse acceso",
-    "Error configuring Dropbox storage" : "Produciuse un erro ao configurar o almacenamento en Dropbox",
-    "Grant access" : "Permitir o acceso",
-    "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive",
     "Personal" : "Persoal",
     "System" : "Sistema",
+    "Grant access" : "Permitir o acceso",
+    "Access granted" : "Concedeuse acceso",
+    "Generate keys" : "Xerar chaves",
+    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
     "Enable encryption" : "Activar o cifrado",
     "Enable previews" : "Activar as vistas previas",
     "Check for changes" : "Comprobar se hai cambios",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Gardado",
-    "Generate keys" : "Xerar chaves",
-    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
+    "None" : "Ningún",
+    "App key" : "Clave da API",
+    "App secret" : "Secreto da aplicación",
+    "Client ID" : "ID do cliente",
+    "Client secret" : "Secreto do cliente",
+    "Username" : "Nome de usuario",
+    "Password" : "Contrasinal",
+    "API key" : "Chave da API",
+    "Public key" : "Chave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nome de máquina",
+    "Port" : "Porto",
+    "Region" : "Rexión",
+    "Enable SSL" : "Activar SSL",
+    "Enable Path Style" : "Activar o estilo de ruta",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcartafol remoto",
+    "Secure https://" : "https:// seguro",
+    "Dropbox" : "Dropbox",
+    "Host" : "Servidor",
+    "Secure ftps://" : "ftps:// seguro",
+    "Local" : "Local",
+    "Location" : "Localización",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root (raíz)",
+    "Share" : "Compartir",
+    "Username as share" : "Nome de usuario como compartición",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> «%s»  non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Nome do cartafol",
     "Configuration" : "Configuración",
     "Available for" : "Dispoñíbel para",
-    "Add storage" : "Engadir almacenamento",
     "Advanced settings" : "Axustes avanzados",
     "Delete" : "Eliminar",
+    "Add storage" : "Engadir almacenamento",
     "Enable User External Storage" : "Activar o almacenamento externo do usuario",
     "Allow users to mount the following external storage" : "Permitirlle aos usuarios montar o seguinte almacenamento externo"
 },
diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json
index 18069fcd2b..48bd2c62e9 100644
--- a/apps/files_external/l10n/gl.json
+++ b/apps/files_external/l10n/gl.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de petición. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de acceso. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
-    "Please provide a valid Dropbox app key and secret." : "Forneza unha chave correcta e secreta do Dropbox.",
     "Step 1 failed. Exception: %s" : "Fallou o paso 1. Excepción: %s",
     "Step 2 failed. Exception: %s" : "Fallou o paso 2. Excepción: %s",
     "External storage" : "Almacenamento externo",
-    "Local" : "Local",
-    "Location" : "Localización",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Clave",
-    "Secret" : "Secreto",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatíbeis",
-    "Access Key" : "Clave de acceso",
-    "Secret Key" : "Chave secreta",
-    "Hostname" : "Nome de máquina",
-    "Port" : "Porto",
-    "Region" : "Rexión",
-    "Enable SSL" : "Activar SSL",
-    "Enable Path Style" : "Activar o estilo de ruta",
-    "App key" : "Clave da API",
-    "App secret" : "Secreto da aplicación",
-    "Host" : "Servidor",
-    "Username" : "Nome de usuario",
-    "Password" : "Contrasinal",
-    "Remote subfolder" : "Subcartafol remoto",
-    "Secure ftps://" : "ftps:// seguro",
-    "Client ID" : "ID do cliente",
-    "Client secret" : "Secreto do cliente",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Rexión (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clave da API (obrigatoria para Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do inquilino (obrigatorio para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Caducidade, en segundos, das peticións HTTP",
-    "Share" : "Compartir",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
-    "Username as share" : "Nome de usuario como compartición",
-    "URL" : "URL",
-    "Secure https://" : "https:// seguro",
-    "SFTP with secret key login" : "SFTP con chave secreta de acceso",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Non se atopa o almacenamento co ID «%i» ",
     "Invalid mount point" : "Punto de montaxe incorrecto",
     "Invalid storage backend \"%s\"" : "Infraestrutura de almacenamento «%s» incorrecta",
-    "Access granted" : "Concedeuse acceso",
-    "Error configuring Dropbox storage" : "Produciuse un erro ao configurar o almacenamento en Dropbox",
-    "Grant access" : "Permitir o acceso",
-    "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive",
     "Personal" : "Persoal",
     "System" : "Sistema",
+    "Grant access" : "Permitir o acceso",
+    "Access granted" : "Concedeuse acceso",
+    "Generate keys" : "Xerar chaves",
+    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
     "Enable encryption" : "Activar o cifrado",
     "Enable previews" : "Activar as vistas previas",
     "Check for changes" : "Comprobar se hai cambios",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Todos os usuarios. Escriba para seleccionar usuario ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Gardado",
-    "Generate keys" : "Xerar chaves",
-    "Error generating key pair" : "Produciuse un erro ao xerar o par de chaves",
+    "None" : "Ningún",
+    "App key" : "Clave da API",
+    "App secret" : "Secreto da aplicación",
+    "Client ID" : "ID do cliente",
+    "Client secret" : "Secreto do cliente",
+    "Username" : "Nome de usuario",
+    "Password" : "Contrasinal",
+    "API key" : "Chave da API",
+    "Public key" : "Chave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nome de máquina",
+    "Port" : "Porto",
+    "Region" : "Rexión",
+    "Enable SSL" : "Activar SSL",
+    "Enable Path Style" : "Activar o estilo de ruta",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subcartafol remoto",
+    "Secure https://" : "https:// seguro",
+    "Dropbox" : "Dropbox",
+    "Host" : "Servidor",
+    "Secure ftps://" : "ftps:// seguro",
+    "Local" : "Local",
+    "Location" : "Localización",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root (raíz)",
+    "Share" : "Compartir",
+    "Username as share" : "Nome de usuario como compartición",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> «%s»  non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
@@ -77,9 +63,9 @@
     "Folder name" : "Nome do cartafol",
     "Configuration" : "Configuración",
     "Available for" : "Dispoñíbel para",
-    "Add storage" : "Engadir almacenamento",
     "Advanced settings" : "Axustes avanzados",
     "Delete" : "Eliminar",
+    "Add storage" : "Engadir almacenamento",
     "Enable User External Storage" : "Activar o almacenamento externo do usuario",
     "Allow users to mount the following external storage" : "Permitirlle aos usuarios montar o seguinte almacenamento externo"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/he.js b/apps/files_external/l10n/he.js
index d9e903ff3e..2de5539e7d 100644
--- a/apps/files_external/l10n/he.js
+++ b/apps/files_external/l10n/he.js
@@ -1,22 +1,22 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "נא לספק קוד יישום וסוד תקניים של Dropbox.",
-    "Local" : "מקומי",
-    "Location" : "מיקום",
-    "Port" : "פורט",
-    "Region" : "אזור",
-    "Host" : "מארח",
+    "Personal" : "אישי",
+    "Grant access" : "הענקת גישה",
+    "Access granted" : "הוענקה גישה",
+    "Saved" : "נשמר",
+    "None" : "כלום",
     "Username" : "שם משתמש",
     "Password" : "סיסמא",
-    "Share" : "שיתוף",
+    "Port" : "פורט",
+    "Region" : "אזור",
+    "WebDAV" : "WebDAV",
     "URL" : "כתובת",
-    "Access granted" : "הוענקה גישה",
-    "Error configuring Dropbox storage" : "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox",
-    "Grant access" : "הענקת גישה",
-    "Error configuring Google Drive storage" : "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive",
-    "Personal" : "אישי",
-    "Saved" : "נשמר",
+    "Host" : "מארח",
+    "Local" : "מקומי",
+    "Location" : "מיקום",
+    "ownCloud" : "ownCloud",
+    "Share" : "שיתוף",
     "Name" : "שם",
     "External Storage" : "אחסון חיצוני",
     "Folder name" : "שם התיקייה",
diff --git a/apps/files_external/l10n/he.json b/apps/files_external/l10n/he.json
index fb81293834..4b4e289c53 100644
--- a/apps/files_external/l10n/he.json
+++ b/apps/files_external/l10n/he.json
@@ -1,20 +1,20 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "נא לספק קוד יישום וסוד תקניים של Dropbox.",
-    "Local" : "מקומי",
-    "Location" : "מיקום",
-    "Port" : "פורט",
-    "Region" : "אזור",
-    "Host" : "מארח",
+    "Personal" : "אישי",
+    "Grant access" : "הענקת גישה",
+    "Access granted" : "הוענקה גישה",
+    "Saved" : "נשמר",
+    "None" : "כלום",
     "Username" : "שם משתמש",
     "Password" : "סיסמא",
-    "Share" : "שיתוף",
+    "Port" : "פורט",
+    "Region" : "אזור",
+    "WebDAV" : "WebDAV",
     "URL" : "כתובת",
-    "Access granted" : "הוענקה גישה",
-    "Error configuring Dropbox storage" : "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox",
-    "Grant access" : "הענקת גישה",
-    "Error configuring Google Drive storage" : "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive",
-    "Personal" : "אישי",
-    "Saved" : "נשמר",
+    "Host" : "מארח",
+    "Local" : "מקומי",
+    "Location" : "מיקום",
+    "ownCloud" : "ownCloud",
+    "Share" : "שיתוף",
     "Name" : "שם",
     "External Storage" : "אחסון חיצוני",
     "Folder name" : "שם התיקייה",
diff --git a/apps/files_external/l10n/hi.js b/apps/files_external/l10n/hi.js
index 97fcc0d135..3d3b750ebd 100644
--- a/apps/files_external/l10n/hi.js
+++ b/apps/files_external/l10n/hi.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Personal" : "यक्तिगत",
     "Username" : "प्रयोक्ता का नाम",
     "Password" : "पासवर्ड",
-    "Share" : "साझा करें",
-    "Personal" : "यक्तिगत"
+    "Share" : "साझा करें"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/hi.json b/apps/files_external/l10n/hi.json
index cee1bf9c5c..6e1117f610 100644
--- a/apps/files_external/l10n/hi.json
+++ b/apps/files_external/l10n/hi.json
@@ -1,7 +1,7 @@
 { "translations": {
+    "Personal" : "यक्तिगत",
     "Username" : "प्रयोक्ता का नाम",
     "Password" : "पासवर्ड",
-    "Share" : "साझा करें",
-    "Personal" : "यक्तिगत"
+    "Share" : "साझा करें"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/hr.js b/apps/files_external/l10n/hr.js
index 37193bceeb..7ab1752158 100644
--- a/apps/files_external/l10n/hr.js
+++ b/apps/files_external/l10n/hr.js
@@ -1,57 +1,43 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje tokena zahtjeva nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje pristupnog tokena nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
-    "Please provide a valid Dropbox app key and secret." : "Molimo navedite ispravan ključ za aplikacije iz zajedničke mrežne mape i tajni kluč.",
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspio. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspio. Izuzetak: %s",
     "External storage" : "Vanjsko spremište za pohranu",
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
+    "Personal" : "Osobno",
+    "System" : "Sustav",
+    "Grant access" : "Dodijeli pristup",
+    "Access granted" : "Pristup odobren",
+    "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.",
+    "(group)" : "(grupa)",
+    "Saved" : "Spremljeno",
+    "None" : "Ništa",
+    "App key" : "Ključ za aplikacije",
+    "App secret" : "Tajna aplikacije",
+    "Client ID" : "ID klijenta",
+    "Client secret" : "Klijentski tajni ključ",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Tajna",
     "Bucket" : "Kantica",
-    "Amazon S3 and compliant" : "Amazon S3 i kompatibilno",
-    "Access Key" : "Pristupni ključ",
-    "Secret Key" : "Ključ za tajnu",
     "Hostname" : "Naziv poslužitelja",
     "Port" : "Port",
     "Region" : "Regija",
     "Enable SSL" : "Omogućite SSL",
     "Enable Path Style" : "Omogućite Path Style",
-    "App key" : "Ključ za aplikacije",
-    "App secret" : "Tajna aplikacije",
-    "Host" : "Glavno računalo",
-    "Username" : "Korisničko ime",
-    "Password" : "Lozinka",
-    "Remote subfolder" : "Udaljena podmapa",
-    "Secure ftps://" : "Sigurni ftps://",
-    "Client ID" : "ID klijenta",
-    "Client secret" : "Klijentski tajni ključ",
-    "OpenStack Object Storage" : "Prostor za pohranu.....",
-    "Region (optional for OpenStack Object Storage)" : "Regija (neobavezno za OpenStack object storage",
-    "API Key (required for Rackspace Cloud Files)" : "API ključ (obavezno za Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Naziv korisnika (obavezno za OpenStack Object storage)",
-    "Password (required for OpenStack Object Storage)" : "Lozinka (obavezno za OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Naziv usluge (Obavezno za OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje točke identiteta (obavezno za OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Vrijeme isteka HTTP zahtjeva u sekundama",
-    "Share" : "Dijeljenje zhajedničkih resursa",
-    "SMB / CIFS using OC login" : "SMB / CIFS uz prijavu putem programa OC",
-    "Username as share" : "Korisničko ime kao dijeljeni resurs",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Udaljena podmapa",
     "Secure https://" : "Siguran https://",
-    "Access granted" : "Pristup odobren",
-    "Error configuring Dropbox storage" : "Pogreška pri konfiguriranju spremišta u zajedničkoj mrežnoj mapi",
-    "Grant access" : "Dodijeli pristup",
-    "Error configuring Google Drive storage" : "Pogreška pri konfiguriranju spremišta u Google Drive-u",
-    "Personal" : "Osobno",
-    "System" : "Sustav",
-    "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.",
-    "(group)" : "(grupa)",
-    "Saved" : "Spremljeno",
+    "Host" : "Glavno računalo",
+    "Secure ftps://" : "Sigurni ftps://",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "ownCloud" : "OwnCloud",
+    "Root" : "Korijen",
+    "Share" : "Dijeljenje zhajedničkih resursa",
+    "Username as share" : "Korisničko ime kao dijeljeni resurs",
+    "OpenStack Object Storage" : "Prostor za pohranu.....",
     "<b>Note:</b> " : "<b>Bilješka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška cURL u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svog administratora sustava da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška FTP u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svotg administratora sustava da je instalira.",
@@ -63,8 +49,8 @@ OC.L10N.register(
     "Folder name" : "Naziv mape",
     "Configuration" : "Konfiguracija",
     "Available for" : "Dostupno za",
-    "Add storage" : "Dodajte spremište",
     "Delete" : "Izbrišite",
+    "Add storage" : "Dodajte spremište",
     "Enable User External Storage" : "Omogućite korisničko vanjsko spremište",
     "Allow users to mount the following external storage" : "Dopustite korisnicima postavljanje sljedećeg vanjskog spremišta"
 },
diff --git a/apps/files_external/l10n/hr.json b/apps/files_external/l10n/hr.json
index 04e6c77853..23188c55fe 100644
--- a/apps/files_external/l10n/hr.json
+++ b/apps/files_external/l10n/hr.json
@@ -1,55 +1,41 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje tokena zahtjeva nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje pristupnog tokena nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
-    "Please provide a valid Dropbox app key and secret." : "Molimo navedite ispravan ključ za aplikacije iz zajedničke mrežne mape i tajni kluč.",
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspio. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspio. Izuzetak: %s",
     "External storage" : "Vanjsko spremište za pohranu",
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
+    "Personal" : "Osobno",
+    "System" : "Sustav",
+    "Grant access" : "Dodijeli pristup",
+    "Access granted" : "Pristup odobren",
+    "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.",
+    "(group)" : "(grupa)",
+    "Saved" : "Spremljeno",
+    "None" : "Ništa",
+    "App key" : "Ključ za aplikacije",
+    "App secret" : "Tajna aplikacije",
+    "Client ID" : "ID klijenta",
+    "Client secret" : "Klijentski tajni ključ",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Tajna",
     "Bucket" : "Kantica",
-    "Amazon S3 and compliant" : "Amazon S3 i kompatibilno",
-    "Access Key" : "Pristupni ključ",
-    "Secret Key" : "Ključ za tajnu",
     "Hostname" : "Naziv poslužitelja",
     "Port" : "Port",
     "Region" : "Regija",
     "Enable SSL" : "Omogućite SSL",
     "Enable Path Style" : "Omogućite Path Style",
-    "App key" : "Ključ za aplikacije",
-    "App secret" : "Tajna aplikacije",
-    "Host" : "Glavno računalo",
-    "Username" : "Korisničko ime",
-    "Password" : "Lozinka",
-    "Remote subfolder" : "Udaljena podmapa",
-    "Secure ftps://" : "Sigurni ftps://",
-    "Client ID" : "ID klijenta",
-    "Client secret" : "Klijentski tajni ključ",
-    "OpenStack Object Storage" : "Prostor za pohranu.....",
-    "Region (optional for OpenStack Object Storage)" : "Regija (neobavezno za OpenStack object storage",
-    "API Key (required for Rackspace Cloud Files)" : "API ključ (obavezno za Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Naziv korisnika (obavezno za OpenStack Object storage)",
-    "Password (required for OpenStack Object Storage)" : "Lozinka (obavezno za OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Naziv usluge (Obavezno za OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje točke identiteta (obavezno za OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Vrijeme isteka HTTP zahtjeva u sekundama",
-    "Share" : "Dijeljenje zhajedničkih resursa",
-    "SMB / CIFS using OC login" : "SMB / CIFS uz prijavu putem programa OC",
-    "Username as share" : "Korisničko ime kao dijeljeni resurs",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Udaljena podmapa",
     "Secure https://" : "Siguran https://",
-    "Access granted" : "Pristup odobren",
-    "Error configuring Dropbox storage" : "Pogreška pri konfiguriranju spremišta u zajedničkoj mrežnoj mapi",
-    "Grant access" : "Dodijeli pristup",
-    "Error configuring Google Drive storage" : "Pogreška pri konfiguriranju spremišta u Google Drive-u",
-    "Personal" : "Osobno",
-    "System" : "Sustav",
-    "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.",
-    "(group)" : "(grupa)",
-    "Saved" : "Spremljeno",
+    "Host" : "Glavno računalo",
+    "Secure ftps://" : "Sigurni ftps://",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "ownCloud" : "OwnCloud",
+    "Root" : "Korijen",
+    "Share" : "Dijeljenje zhajedničkih resursa",
+    "Username as share" : "Korisničko ime kao dijeljeni resurs",
+    "OpenStack Object Storage" : "Prostor za pohranu.....",
     "<b>Note:</b> " : "<b>Bilješka:</b>",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška cURL u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svog administratora sustava da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> Podrška FTP u PHP nije omogućena ili nije instalirana. Postavljanje%s nije moguće. Molimo zamolite svotg administratora sustava da je instalira.",
@@ -61,8 +47,8 @@
     "Folder name" : "Naziv mape",
     "Configuration" : "Konfiguracija",
     "Available for" : "Dostupno za",
-    "Add storage" : "Dodajte spremište",
     "Delete" : "Izbrišite",
+    "Add storage" : "Dodajte spremište",
     "Enable User External Storage" : "Omogućite korisničko vanjsko spremište",
     "Allow users to mount the following external storage" : "Dopustite korisnicima postavljanje sljedećeg vanjskog spremišta"
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
diff --git a/apps/files_external/l10n/hu_HU.js b/apps/files_external/l10n/hu_HU.js
index 7ec61b9194..563267f66f 100644
--- a/apps/files_external/l10n/hu_HU.js
+++ b/apps/files_external/l10n/hu_HU.js
@@ -1,51 +1,46 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Adjon meg egy érvényes Dropbox app key-t és secretet!",
     "External storage" : "Külső tárolók",
-    "Local" : "Helyi",
-    "Location" : "Hely",
+    "Personal" : "Személyes",
+    "System" : "Rendszer",
+    "Grant access" : "Megadom a hozzáférést",
+    "Access granted" : "Érvényes hozzáférés",
+    "Enable encryption" : "Titkosítás engedélyezése",
+    "(group)" : "(csoport)",
+    "Saved" : "Elmentve",
+    "None" : "Egyik sem",
+    "App key" : "App kulcs",
+    "App secret" : "App titkos kulcs",
+    "Username" : "Felhasználónév",
+    "Password" : "Jelszó",
+    "API key" : "API kulcs",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Kulcs",
-    "Secret" : "Titkos",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3-mal kompatibilisek",
-    "Access Key" : "Hozzáférési kulcs",
-    "Secret Key" : "Titkos kulcs",
     "Hostname" : "Hosztnév",
     "Port" : "Port",
     "Region" : "Megye",
     "Enable SSL" : "SSL engedélyezése",
-    "App key" : "App kulcs",
-    "App secret" : "App titkos kulcs",
-    "Host" : "Kiszolgáló",
-    "Username" : "Felhasználónév",
-    "Password" : "Jelszó",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Távoli alkönyvtár",
+    "Secure https://" : "Biztonságos https://",
+    "Host" : "Kiszolgáló",
     "Secure ftps://" : "Biztonságos ftps://",
-    "Timeout of HTTP requests in seconds" : "A HTTP-kérés időkorlátja másodpercben",
+    "Local" : "Helyi",
+    "Location" : "Hely",
+    "ownCloud" : "ownCloud",
     "Share" : "Megosztás",
     "Username as share" : "Felhasználónév és megosztás",
-    "URL" : "URL",
-    "Secure https://" : "Biztonságos https://",
-    "Access granted" : "Érvényes hozzáférés",
-    "Error configuring Dropbox storage" : "A Dropbox tárolót nem sikerült beállítani",
-    "Grant access" : "Megadom a hozzáférést",
-    "Error configuring Google Drive storage" : "A Google Drive tárolót nem sikerült beállítani",
-    "Personal" : "Személyes",
-    "System" : "Rendszer",
-    "(group)" : "(csoport)",
-    "Saved" : "Elmentve",
     "<b>Note:</b> " : "<b>Megjegyzés:</b>",
-    "and" : "és",
     "Name" : "Név",
     "Storage type" : "Tároló típusa",
     "External Storage" : "Külső tárolási szolgáltatások becsatolása",
     "Folder name" : "Mappanév",
     "Configuration" : "Beállítások",
     "Available for" : "Elérhető számukra",
-    "Add storage" : "Tároló becsatolása",
     "Delete" : "Törlés",
+    "Add storage" : "Tároló becsatolása",
     "Enable User External Storage" : "Külső tárolók engedélyezése a felhasználók részére"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/hu_HU.json b/apps/files_external/l10n/hu_HU.json
index f8160e2eeb..a3608dba7b 100644
--- a/apps/files_external/l10n/hu_HU.json
+++ b/apps/files_external/l10n/hu_HU.json
@@ -1,49 +1,44 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Adjon meg egy érvényes Dropbox app key-t és secretet!",
     "External storage" : "Külső tárolók",
-    "Local" : "Helyi",
-    "Location" : "Hely",
+    "Personal" : "Személyes",
+    "System" : "Rendszer",
+    "Grant access" : "Megadom a hozzáférést",
+    "Access granted" : "Érvényes hozzáférés",
+    "Enable encryption" : "Titkosítás engedélyezése",
+    "(group)" : "(csoport)",
+    "Saved" : "Elmentve",
+    "None" : "Egyik sem",
+    "App key" : "App kulcs",
+    "App secret" : "App titkos kulcs",
+    "Username" : "Felhasználónév",
+    "Password" : "Jelszó",
+    "API key" : "API kulcs",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Kulcs",
-    "Secret" : "Titkos",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3-mal kompatibilisek",
-    "Access Key" : "Hozzáférési kulcs",
-    "Secret Key" : "Titkos kulcs",
     "Hostname" : "Hosztnév",
     "Port" : "Port",
     "Region" : "Megye",
     "Enable SSL" : "SSL engedélyezése",
-    "App key" : "App kulcs",
-    "App secret" : "App titkos kulcs",
-    "Host" : "Kiszolgáló",
-    "Username" : "Felhasználónév",
-    "Password" : "Jelszó",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
     "Remote subfolder" : "Távoli alkönyvtár",
+    "Secure https://" : "Biztonságos https://",
+    "Host" : "Kiszolgáló",
     "Secure ftps://" : "Biztonságos ftps://",
-    "Timeout of HTTP requests in seconds" : "A HTTP-kérés időkorlátja másodpercben",
+    "Local" : "Helyi",
+    "Location" : "Hely",
+    "ownCloud" : "ownCloud",
     "Share" : "Megosztás",
     "Username as share" : "Felhasználónév és megosztás",
-    "URL" : "URL",
-    "Secure https://" : "Biztonságos https://",
-    "Access granted" : "Érvényes hozzáférés",
-    "Error configuring Dropbox storage" : "A Dropbox tárolót nem sikerült beállítani",
-    "Grant access" : "Megadom a hozzáférést",
-    "Error configuring Google Drive storage" : "A Google Drive tárolót nem sikerült beállítani",
-    "Personal" : "Személyes",
-    "System" : "Rendszer",
-    "(group)" : "(csoport)",
-    "Saved" : "Elmentve",
     "<b>Note:</b> " : "<b>Megjegyzés:</b>",
-    "and" : "és",
     "Name" : "Név",
     "Storage type" : "Tároló típusa",
     "External Storage" : "Külső tárolási szolgáltatások becsatolása",
     "Folder name" : "Mappanév",
     "Configuration" : "Beállítások",
     "Available for" : "Elérhető számukra",
-    "Add storage" : "Tároló becsatolása",
     "Delete" : "Törlés",
+    "Add storage" : "Tároló becsatolása",
     "Enable User External Storage" : "Külső tárolók engedélyezése a felhasználók részére"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/ia.js b/apps/files_external/l10n/ia.js
index f6dfe61009..d13ee4ac10 100644
--- a/apps/files_external/l10n/ia.js
+++ b/apps/files_external/l10n/ia.js
@@ -1,14 +1,14 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Loco",
-    "Region" : "Region",
-    "Username" : "Nomine de usator",
-    "Password" : "Contrasigno",
-    "Share" : "Compartir",
-    "URL" : "URL",
     "Personal" : "Personal",
     "Saved" : "Salveguardate",
+    "Username" : "Nomine de usator",
+    "Password" : "Contrasigno",
+    "Region" : "Region",
+    "URL" : "URL",
+    "Location" : "Loco",
+    "Share" : "Compartir",
     "Name" : "Nomine",
     "Folder name" : "Nomine de dossier",
     "Delete" : "Deler"
diff --git a/apps/files_external/l10n/ia.json b/apps/files_external/l10n/ia.json
index 64eefa5dff..43562ce9e5 100644
--- a/apps/files_external/l10n/ia.json
+++ b/apps/files_external/l10n/ia.json
@@ -1,12 +1,12 @@
 { "translations": {
-    "Location" : "Loco",
-    "Region" : "Region",
-    "Username" : "Nomine de usator",
-    "Password" : "Contrasigno",
-    "Share" : "Compartir",
-    "URL" : "URL",
     "Personal" : "Personal",
     "Saved" : "Salveguardate",
+    "Username" : "Nomine de usator",
+    "Password" : "Contrasigno",
+    "Region" : "Region",
+    "URL" : "URL",
+    "Location" : "Loco",
+    "Share" : "Compartir",
     "Name" : "Nomine",
     "Folder name" : "Nomine de dossier",
     "Delete" : "Deler"
diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js
index 7f153b9f49..be0abf0bba 100644
--- a/apps/files_external/l10n/id.js
+++ b/apps/files_external/l10n/id.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Permintaan untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Akses untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
-    "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan rahasia aplikasi Dropbox yang benar.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Permintaan pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Akses pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Please provide a valid app key and secret." : "Silakan berikan kunci dan kerahasiaan aplikasi yang benar.",
     "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s",
     "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s",
     "External storage" : "Penyimpanan eksternal",
-    "Local" : "Lokal",
-    "Location" : "lokasi",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Kunci",
-    "Secret" : "Rahasia",
-    "Bucket" : "Keranjang",
-    "Amazon S3 and compliant" : "Amazon S3 dan yang sesuai",
-    "Access Key" : "Kunci Akses",
-    "Secret Key" : "Kunci Rahasia",
-    "Hostname" : "Nama Host",
-    "Port" : "Port",
-    "Region" : "Daerah",
-    "Enable SSL" : "Aktifkan SSL",
-    "Enable Path Style" : "Aktifkan Gaya Path",
-    "App key" : "Kunci Apl",
-    "App secret" : "Rahasia Apl",
-    "Host" : "Host",
-    "Username" : "Nama Pengguna",
-    "Password" : "Sandi",
-    "Remote subfolder" : "Subfolder remote",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "ID Klien",
-    "Client secret" : "Rahasia klien",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Daerah (tambahan untuk OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Kunci API (diperlukan untuk Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (diperlukan untuk OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Sandi (diperlukan untuk OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nama Layanan (diperlukan untuk OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (diperlukan untuk OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Batas waktu permintaan HTTP dalam detik",
-    "Share" : "Bagikan",
-    "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login",
-    "Username as share" : "Nama pengguna berbagi",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP dengan kunci rahasia masuk",
-    "Public key" : "Kunci Public",
     "Storage with id \"%i\" not found" : "Penyimpanan dengan id \"%i\" tidak ditemukan",
+    "Invalid backend or authentication mechanism class" : "Beckend atau kelas mekanisme otentikasi salah.",
     "Invalid mount point" : "Mount point salah",
+    "Objectstore forbidden" : "Objectstore terlarang",
     "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
-    "Access granted" : "Akses diberikan",
-    "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
-    "Grant access" : "Berikan hak akses",
-    "Error configuring Google Drive storage" : "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
+    "Unsatisfied backend parameters" : "Parameter backend tidak lengkap",
+    "Unsatisfied authentication mechanism parameters" : "Parameter mekanisme otentikasi tidak lengkap",
     "Personal" : "Pribadi",
     "System" : "Sistem",
+    "Grant access" : "Berikan hak akses",
+    "Access granted" : "Akses diberikan",
+    "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1",
+    "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2",
+    "Generate keys" : "Hasilkan kunci",
+    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
     "Enable encryption" : "Aktifkan enkripsi",
     "Enable previews" : "Aktifkan pratinjau",
     "Check for changes" : "Periksa perubahan",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
     "(group)" : "(grup)",
     "Saved" : "Disimpan",
-    "Generate keys" : "Hasilkan kunci",
-    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
+    "Access key" : "Kunci akses",
+    "Secret key" : "Kunci rahasia",
+    "Builtin" : "Internal",
+    "None" : "Tidak ada",
+    "OAuth1" : "OAuth1",
+    "App key" : "Kunci Apl",
+    "App secret" : "Rahasia Apl",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID Klien",
+    "Client secret" : "Rahasia klien",
+    "Username" : "Nama Pengguna",
+    "Password" : "Sandi",
+    "API key" : "Kunci API",
+    "Username and password" : "Nama pengguna dan sandi",
+    "Session credentials" : "Kredensial sesi",
+    "Public key" : "Kunci Public",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Keranjang",
+    "Hostname" : "Nama Host",
+    "Port" : "Port",
+    "Region" : "Daerah",
+    "Enable SSL" : "Aktifkan SSL",
+    "Enable Path Style" : "Aktifkan Gaya Path",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subfolder remote",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Lokal",
+    "Location" : "lokasi",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Bagikan",
+    "Username as share" : "Nama pengguna berbagi",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
-    "and" : "dan",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Skop",
     "External Storage" : "Penyimpanan Eksternal",
     "Folder name" : "Nama folder",
+    "Authentication" : "Otentikasi",
     "Configuration" : "Konfigurasi",
     "Available for" : "Tersedia untuk",
-    "Add storage" : "Tambahkan penyimpanan",
     "Advanced settings" : "Pengaturan Lanjutan",
     "Delete" : "Hapus",
+    "Add storage" : "Tambahkan penyimpanan",
     "Enable User External Storage" : "Aktifkan Penyimpanan Eksternal Pengguna",
     "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
 },
diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json
index 205ac8b210..6c80a01b97 100644
--- a/apps/files_external/l10n/id.json
+++ b/apps/files_external/l10n/id.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Permintaan untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Akses untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
-    "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan rahasia aplikasi Dropbox yang benar.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Permintaan pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Akses pengambilan token gagal. Pastikan kunci dan kerahasiaan aplikasi Anda sudah benar.",
+    "Please provide a valid app key and secret." : "Silakan berikan kunci dan kerahasiaan aplikasi yang benar.",
     "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s",
     "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s",
     "External storage" : "Penyimpanan eksternal",
-    "Local" : "Lokal",
-    "Location" : "lokasi",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Kunci",
-    "Secret" : "Rahasia",
-    "Bucket" : "Keranjang",
-    "Amazon S3 and compliant" : "Amazon S3 dan yang sesuai",
-    "Access Key" : "Kunci Akses",
-    "Secret Key" : "Kunci Rahasia",
-    "Hostname" : "Nama Host",
-    "Port" : "Port",
-    "Region" : "Daerah",
-    "Enable SSL" : "Aktifkan SSL",
-    "Enable Path Style" : "Aktifkan Gaya Path",
-    "App key" : "Kunci Apl",
-    "App secret" : "Rahasia Apl",
-    "Host" : "Host",
-    "Username" : "Nama Pengguna",
-    "Password" : "Sandi",
-    "Remote subfolder" : "Subfolder remote",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "ID Klien",
-    "Client secret" : "Rahasia klien",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Daerah (tambahan untuk OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Kunci API (diperlukan untuk Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (diperlukan untuk OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Sandi (diperlukan untuk OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nama Layanan (diperlukan untuk OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (diperlukan untuk OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Batas waktu permintaan HTTP dalam detik",
-    "Share" : "Bagikan",
-    "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login",
-    "Username as share" : "Nama pengguna berbagi",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP dengan kunci rahasia masuk",
-    "Public key" : "Kunci Public",
     "Storage with id \"%i\" not found" : "Penyimpanan dengan id \"%i\" tidak ditemukan",
+    "Invalid backend or authentication mechanism class" : "Beckend atau kelas mekanisme otentikasi salah.",
     "Invalid mount point" : "Mount point salah",
+    "Objectstore forbidden" : "Objectstore terlarang",
     "Invalid storage backend \"%s\"" : "Backend penyimpanan \"%s\" salah",
-    "Access granted" : "Akses diberikan",
-    "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
-    "Grant access" : "Berikan hak akses",
-    "Error configuring Google Drive storage" : "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
+    "Unsatisfied backend parameters" : "Parameter backend tidak lengkap",
+    "Unsatisfied authentication mechanism parameters" : "Parameter mekanisme otentikasi tidak lengkap",
     "Personal" : "Pribadi",
     "System" : "Sistem",
+    "Grant access" : "Berikan hak akses",
+    "Access granted" : "Akses diberikan",
+    "Error configuring OAuth1" : "Kesalahan mengkonfigurasi OAuth1",
+    "Error configuring OAuth2" : "Kesalahan mengkonfigurasi OAuth2",
+    "Generate keys" : "Hasilkan kunci",
+    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
     "Enable encryption" : "Aktifkan enkripsi",
     "Enable previews" : "Aktifkan pratinjau",
     "Check for changes" : "Periksa perubahan",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
     "(group)" : "(grup)",
     "Saved" : "Disimpan",
-    "Generate keys" : "Hasilkan kunci",
-    "Error generating key pair" : "Kesalahan saat menghasilkan pasangan kunci",
+    "Access key" : "Kunci akses",
+    "Secret key" : "Kunci rahasia",
+    "Builtin" : "Internal",
+    "None" : "Tidak ada",
+    "OAuth1" : "OAuth1",
+    "App key" : "Kunci Apl",
+    "App secret" : "Rahasia Apl",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID Klien",
+    "Client secret" : "Rahasia klien",
+    "Username" : "Nama Pengguna",
+    "Password" : "Sandi",
+    "API key" : "Kunci API",
+    "Username and password" : "Nama pengguna dan sandi",
+    "Session credentials" : "Kredensial sesi",
+    "Public key" : "Kunci Public",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Keranjang",
+    "Hostname" : "Nama Host",
+    "Port" : "Port",
+    "Region" : "Daerah",
+    "Enable SSL" : "Aktifkan SSL",
+    "Enable Path Style" : "Aktifkan Gaya Path",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subfolder remote",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Lokal",
+    "Location" : "lokasi",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Bagikan",
+    "Username as share" : "Nama pengguna berbagi",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
-    "and" : "dan",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
@@ -75,11 +81,12 @@
     "Scope" : "Skop",
     "External Storage" : "Penyimpanan Eksternal",
     "Folder name" : "Nama folder",
+    "Authentication" : "Otentikasi",
     "Configuration" : "Konfigurasi",
     "Available for" : "Tersedia untuk",
-    "Add storage" : "Tambahkan penyimpanan",
     "Advanced settings" : "Pengaturan Lanjutan",
     "Delete" : "Hapus",
+    "Add storage" : "Tambahkan penyimpanan",
     "Enable User External Storage" : "Aktifkan Penyimpanan Eksternal Pengguna",
     "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js
index 644c4a0654..8af1f2ac0c 100644
--- a/apps/files_external/l10n/is.js
+++ b/apps/files_external/l10n/is.js
@@ -1,18 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Gefðu upp virkan Dropbox lykil og leynikóða",
-    "Location" : "Staðsetning",
-    "Host" : "Netþjónn",
+    "Personal" : "Um mig",
+    "Grant access" : "Veita aðgengi",
+    "Access granted" : "Aðgengi veitt",
+    "Saved" : "Vistað",
+    "None" : "Ekkert",
     "Username" : "Notendanafn",
     "Password" : "Lykilorð",
-    "Share" : "Deila",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Aðgengi veitt",
-    "Error configuring Dropbox storage" : "Villa við að setja upp Dropbox gagnasvæði",
-    "Grant access" : "Veita aðgengi",
-    "Error configuring Google Drive storage" : "Villa kom upp við að setja upp Google Drive gagnasvæði",
-    "Personal" : "Um mig",
+    "Host" : "Netþjónn",
+    "Location" : "Staðsetning",
+    "Share" : "Deila",
     "Name" : "Nafn",
     "External Storage" : "Ytri gagnageymsla",
     "Folder name" : "Nafn möppu",
@@ -20,4 +20,4 @@ OC.L10N.register(
     "Delete" : "Eyða",
     "Enable User External Storage" : "Virkja ytra gagnasvæði notenda"
 },
-"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);");
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json
index 512f0ed76b..8abd02bdf0 100644
--- a/apps/files_external/l10n/is.json
+++ b/apps/files_external/l10n/is.json
@@ -1,21 +1,21 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Gefðu upp virkan Dropbox lykil og leynikóða",
-    "Location" : "Staðsetning",
-    "Host" : "Netþjónn",
+    "Personal" : "Um mig",
+    "Grant access" : "Veita aðgengi",
+    "Access granted" : "Aðgengi veitt",
+    "Saved" : "Vistað",
+    "None" : "Ekkert",
     "Username" : "Notendanafn",
     "Password" : "Lykilorð",
-    "Share" : "Deila",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Aðgengi veitt",
-    "Error configuring Dropbox storage" : "Villa við að setja upp Dropbox gagnasvæði",
-    "Grant access" : "Veita aðgengi",
-    "Error configuring Google Drive storage" : "Villa kom upp við að setja upp Google Drive gagnasvæði",
-    "Personal" : "Um mig",
+    "Host" : "Netþjónn",
+    "Location" : "Staðsetning",
+    "Share" : "Deila",
     "Name" : "Nafn",
     "External Storage" : "Ytri gagnageymsla",
     "Folder name" : "Nafn möppu",
     "Configuration" : "Uppsetning",
     "Delete" : "Eyða",
     "Enable User External Storage" : "Virkja ytra gagnasvæði notenda"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
index c5d46777cf..9c49d95fc3 100644
--- a/apps/files_external/l10n/it.js
+++ b/apps/files_external/l10n/it.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di richiesta non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di accesso non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
-    "Please provide a valid Dropbox app key and secret." : "Fornisci chiave di applicazione e segreto di Dropbox validi.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Il recupero dei token di richiesta non è riuscito. Verifica che la chiave e il segreto dell'applicazione siano corretti.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Il recupero dei token di accesso non è riuscito. Verifica che la chiave e il segreto dell'applicazione siano corretti.",
+    "Please provide a valid app key and secret." : "Fornisci chiave e segreto dell'applicazione validi.",
     "Step 1 failed. Exception: %s" : "Fase 1 non riuscita. Eccezione: %s",
     "Step 2 failed. Exception: %s" : "Fase 2 non riuscita. Eccezione: %s",
     "External storage" : "Archiviazione esterna",
-    "Local" : "Locale",
-    "Location" : "Posizione",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Chiave",
-    "Secret" : "Segreto",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e conformi",
-    "Access Key" : "Chiave di accesso",
-    "Secret Key" : "Chiave segreta",
-    "Hostname" : "Nome host",
-    "Port" : "Porta",
-    "Region" : "Regione",
-    "Enable SSL" : "Abilita SSL",
-    "Enable Path Style" : "Abilita stile percorsi",
-    "App key" : "Chiave applicazione",
-    "App secret" : "Segreto applicazione",
-    "Host" : "Host",
-    "Username" : "Nome utente",
-    "Password" : "Password",
-    "Remote subfolder" : "Sottocartella remota",
-    "Secure ftps://" : "Sicuro ftps://",
-    "Client ID" : "ID client",
-    "Client secret" : "Segreto del client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regione (facoltativa per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chiave API (richiesta per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome tenant (richiesto per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (richiesta per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome servizio (richiesta per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del servizio di identità (richiesto per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tempo massimo in secondi delle richieste HTTP",
-    "Share" : "Condividi",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizzando le credenziali di OC",
-    "Username as share" : "Nome utente come condivisione",
-    "URL" : "URL",
-    "Secure https://" : "Sicuro https://",
-    "SFTP with secret key login" : "SFTP con accesso a chiave segreta",
-    "Public key" : "Chiave pubblica",
     "Storage with id \"%i\" not found" : "Archiviazione con ID \"%i\" non trovata",
+    "Invalid backend or authentication mechanism class" : "Motore o classe del meccanismo di autenticazione non valido",
     "Invalid mount point" : "Punto di mount non valido",
+    "Objectstore forbidden" : "Objectstore vietato",
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
-    "Access granted" : "Accesso consentito",
-    "Error configuring Dropbox storage" : "Errore durante la configurazione dell'archivio Dropbox",
-    "Grant access" : "Concedi l'accesso",
-    "Error configuring Google Drive storage" : "Errore durante la configurazione dell'archivio Google Drive",
+    "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
+    "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
     "Personal" : "Personale",
     "System" : "Sistema",
+    "Grant access" : "Concedi l'accesso",
+    "Access granted" : "Accesso consentito",
+    "Error configuring OAuth1" : "Errore di configurazione OAuth1",
+    "Error configuring OAuth2" : "Errore di configurazione OAuth2",
+    "Generate keys" : "Genera la chiavi",
+    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
     "Enable encryption" : "Abilita cifratura",
     "Enable previews" : "Abilita le anteprime",
     "Check for changes" : "Controlla le modifiche",
@@ -63,10 +31,53 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.",
     "(group)" : "(gruppo)",
     "Saved" : "Salvato",
-    "Generate keys" : "Genera la chiavi",
-    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
+    "Access key" : "Chiave di accesso",
+    "Secret key" : "Chiave segreta",
+    "Builtin" : "Integrata",
+    "None" : "Nessuno",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chiave applicazione",
+    "App secret" : "Segreto applicazione",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID client",
+    "Client secret" : "Segreto del client",
+    "OpenStack" : "OpenStack",
+    "Username" : "Nome utente",
+    "Password" : "Password",
+    "Tenant name" : "Nome tenant",
+    "Rackspace" : "Rackspace",
+    "API key" : "Chiave API",
+    "Username and password" : "Nome utente e password",
+    "Session credentials" : "Credenziali di sessione",
+    "RSA public key" : "Chiave pubblica RSA",
+    "Public key" : "Chiave pubblica",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nome host",
+    "Port" : "Porta",
+    "Region" : "Regione",
+    "Enable SSL" : "Abilita SSL",
+    "Enable Path Style" : "Abilita stile percorsi",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Sottocartella remota",
+    "Secure https://" : "Sicuro https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicuro ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Locale",
+    "Location" : "Posizione",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Radice",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Condividi",
+    "Username as share" : "Nome utente come condivisione",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nome servizio",
     "<b>Note:</b> " : "<b>Nota:</b>",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
@@ -77,11 +88,12 @@ OC.L10N.register(
     "Scope" : "Ambito",
     "External Storage" : "Archiviazione esterna",
     "Folder name" : "Nome della cartella",
+    "Authentication" : "Autenticazione",
     "Configuration" : "Configurazione",
     "Available for" : "Disponibile per",
-    "Add storage" : "Aggiungi archiviazione",
     "Advanced settings" : "Impostazioni avanzate",
     "Delete" : "Elimina",
+    "Add storage" : "Aggiungi archiviazione",
     "Enable User External Storage" : "Abilita la memoria esterna dell'utente",
     "Allow users to mount the following external storage" : "Consenti agli utenti di montare la seguente memoria esterna"
 },
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
index 6bda84a7e2..3f6020708d 100644
--- a/apps/files_external/l10n/it.json
+++ b/apps/files_external/l10n/it.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di richiesta non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di accesso non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
-    "Please provide a valid Dropbox app key and secret." : "Fornisci chiave di applicazione e segreto di Dropbox validi.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Il recupero dei token di richiesta non è riuscito. Verifica che la chiave e il segreto dell'applicazione siano corretti.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Il recupero dei token di accesso non è riuscito. Verifica che la chiave e il segreto dell'applicazione siano corretti.",
+    "Please provide a valid app key and secret." : "Fornisci chiave e segreto dell'applicazione validi.",
     "Step 1 failed. Exception: %s" : "Fase 1 non riuscita. Eccezione: %s",
     "Step 2 failed. Exception: %s" : "Fase 2 non riuscita. Eccezione: %s",
     "External storage" : "Archiviazione esterna",
-    "Local" : "Locale",
-    "Location" : "Posizione",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Chiave",
-    "Secret" : "Segreto",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e conformi",
-    "Access Key" : "Chiave di accesso",
-    "Secret Key" : "Chiave segreta",
-    "Hostname" : "Nome host",
-    "Port" : "Porta",
-    "Region" : "Regione",
-    "Enable SSL" : "Abilita SSL",
-    "Enable Path Style" : "Abilita stile percorsi",
-    "App key" : "Chiave applicazione",
-    "App secret" : "Segreto applicazione",
-    "Host" : "Host",
-    "Username" : "Nome utente",
-    "Password" : "Password",
-    "Remote subfolder" : "Sottocartella remota",
-    "Secure ftps://" : "Sicuro ftps://",
-    "Client ID" : "ID client",
-    "Client secret" : "Segreto del client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regione (facoltativa per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chiave API (richiesta per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome tenant (richiesto per OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Password (richiesta per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome servizio (richiesta per OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del servizio di identità (richiesto per OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tempo massimo in secondi delle richieste HTTP",
-    "Share" : "Condividi",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizzando le credenziali di OC",
-    "Username as share" : "Nome utente come condivisione",
-    "URL" : "URL",
-    "Secure https://" : "Sicuro https://",
-    "SFTP with secret key login" : "SFTP con accesso a chiave segreta",
-    "Public key" : "Chiave pubblica",
     "Storage with id \"%i\" not found" : "Archiviazione con ID \"%i\" non trovata",
+    "Invalid backend or authentication mechanism class" : "Motore o classe del meccanismo di autenticazione non valido",
     "Invalid mount point" : "Punto di mount non valido",
+    "Objectstore forbidden" : "Objectstore vietato",
     "Invalid storage backend \"%s\"" : "Motore di archiviazione \"%s\" non valido",
-    "Access granted" : "Accesso consentito",
-    "Error configuring Dropbox storage" : "Errore durante la configurazione dell'archivio Dropbox",
-    "Grant access" : "Concedi l'accesso",
-    "Error configuring Google Drive storage" : "Errore durante la configurazione dell'archivio Google Drive",
+    "Unsatisfied backend parameters" : "Parametri del motore non soddisfatti",
+    "Unsatisfied authentication mechanism parameters" : "Parametri del meccanismo di autenticazione non soddisfatti",
     "Personal" : "Personale",
     "System" : "Sistema",
+    "Grant access" : "Concedi l'accesso",
+    "Access granted" : "Accesso consentito",
+    "Error configuring OAuth1" : "Errore di configurazione OAuth1",
+    "Error configuring OAuth2" : "Errore di configurazione OAuth2",
+    "Generate keys" : "Genera la chiavi",
+    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
     "Enable encryption" : "Abilita cifratura",
     "Enable previews" : "Abilita le anteprime",
     "Check for changes" : "Controlla le modifiche",
@@ -61,10 +29,53 @@
     "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.",
     "(group)" : "(gruppo)",
     "Saved" : "Salvato",
-    "Generate keys" : "Genera la chiavi",
-    "Error generating key pair" : "Errore durante la generazione della coppia di chiavi",
+    "Access key" : "Chiave di accesso",
+    "Secret key" : "Chiave segreta",
+    "Builtin" : "Integrata",
+    "None" : "Nessuno",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chiave applicazione",
+    "App secret" : "Segreto applicazione",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID client",
+    "Client secret" : "Segreto del client",
+    "OpenStack" : "OpenStack",
+    "Username" : "Nome utente",
+    "Password" : "Password",
+    "Tenant name" : "Nome tenant",
+    "Rackspace" : "Rackspace",
+    "API key" : "Chiave API",
+    "Username and password" : "Nome utente e password",
+    "Session credentials" : "Credenziali di sessione",
+    "RSA public key" : "Chiave pubblica RSA",
+    "Public key" : "Chiave pubblica",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Nome host",
+    "Port" : "Porta",
+    "Region" : "Regione",
+    "Enable SSL" : "Abilita SSL",
+    "Enable Path Style" : "Abilita stile percorsi",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Sottocartella remota",
+    "Secure https://" : "Sicuro https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Sicuro ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Locale",
+    "Location" : "Posizione",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Radice",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Condividi",
+    "Username as share" : "Nome utente come condivisione",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "Nome servizio",
     "<b>Note:</b> " : "<b>Nota:</b>",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
@@ -75,11 +86,12 @@
     "Scope" : "Ambito",
     "External Storage" : "Archiviazione esterna",
     "Folder name" : "Nome della cartella",
+    "Authentication" : "Autenticazione",
     "Configuration" : "Configurazione",
     "Available for" : "Disponibile per",
-    "Add storage" : "Aggiungi archiviazione",
     "Advanced settings" : "Impostazioni avanzate",
     "Delete" : "Elimina",
+    "Add storage" : "Aggiungi archiviazione",
     "Enable User External Storage" : "Abilita la memoria esterna dell'utente",
     "Allow users to mount the following external storage" : "Consenti agli utenti di montare la seguente memoria esterna"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js
index 9181fbb4e3..f5a9720be2 100644
--- a/apps/files_external/l10n/ja.js
+++ b/apps/files_external/l10n/ja.js
@@ -1,67 +1,58 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "リクエストトークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "アクセストークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
-    "Please provide a valid Dropbox app key and secret." : "有効なDropboxアプリのキーとパスワードを入力してください。",
     "Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
     "Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
     "External storage" : "外部ストレージ",
-    "Local" : "ローカル",
-    "Location" : "位置",
+    "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
+    "Invalid mount point" : "無効なマウントポイント",
+    "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
+    "Personal" : "個人",
+    "System" : "システム",
+    "Grant access" : "アクセスを許可",
+    "Access granted" : "アクセスは許可されました",
+    "Generate keys" : "キーを生成",
+    "Error generating key pair" : "キーペアの生成エラー",
+    "Enable encryption" : "暗号化を有効に",
+    "Enable previews" : "プレビューを有効に",
+    "Check for changes" : "変更点を確認",
+    "Never" : "更新無",
+    "Once every direct access" : "直指定時のみ",
+    "Every time the filesystem is used" : "ファイルシステム利用時には毎回",
+    "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
+    "(group)" : "(グループ)",
+    "Saved" : "保存されました",
+    "None" : "なし",
+    "App key" : "アプリキー",
+    "App secret" : "アプリシークレット",
+    "Client ID" : "クライアントID",
+    "Client secret" : "クライアント秘密キー",
+    "Username" : "ユーザー名",
+    "Password" : "パスワード",
+    "API key" : "APIキー",
+    "Public key" : "公開鍵",
     "Amazon S3" : "Amazon S3",
-    "Key" : "キー",
-    "Secret" : "シークレットキー",
     "Bucket" : "バケット名",
-    "Amazon S3 and compliant" : "Amazon S3や互換ストレージ",
-    "Access Key" : "アクセスキー",
-    "Secret Key" : "シークレットキー",
     "Hostname" : "ホスト名",
     "Port" : "ポート",
     "Region" : "リージョン",
     "Enable SSL" : "SSLを有効",
     "Enable Path Style" : "パス形式を有効",
-    "App key" : "アプリキー",
-    "App secret" : "アプリシークレット",
-    "Host" : "ホスト",
-    "Username" : "ユーザー名",
-    "Password" : "パスワード",
-    "Remote subfolder" : "リモートサブフォルダー",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "クライアントID",
-    "Client secret" : "クライアント秘密キー",
-    "OpenStack Object Storage" : "OpenStack ObjectStorage",
-    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack ObjectStorage)",
-    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace CloudFiles)",
-    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack ObjectStorage)",
-    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack ObjectStorage)",
-    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack ObjectStorage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)",
-    "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
-    "Share" : "共有",
-    "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS",
-    "Username as share" : "共有名",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "リモートサブフォルダー",
     "Secure https://" : "セキュア https://",
-    "Public key" : "公開鍵",
-    "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
-    "Invalid mount point" : "無効なマウントポイント",
-    "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
-    "Access granted" : "アクセスは許可されました",
-    "Error configuring Dropbox storage" : "Dropboxストレージの設定エラー",
-    "Grant access" : "アクセスを許可",
-    "Error configuring Google Drive storage" : "Googleドライブストレージの設定エラー",
-    "Personal" : "個人",
-    "System" : "システム",
-    "Enable encryption" : "暗号化を有効に",
-    "Check for changes" : "変更点を確認",
-    "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
-    "(group)" : "(グループ)",
-    "Saved" : "保存されました",
-    "Generate keys" : "キーを生成",
-    "Error generating key pair" : "キーペアの生成エラー",
+    "Dropbox" : "Dropbox",
+    "Host" : "ホスト",
+    "Secure ftps://" : "Secure ftps://",
+    "Local" : "ローカル",
+    "Location" : "位置",
+    "ownCloud" : "ownCloud",
+    "Root" : "ルート",
+    "Share" : "共有",
+    "Username as share" : "共有名",
+    "OpenStack Object Storage" : "OpenStack ObjectStorage",
     "<b>Note:</b> " : "<b>注意:</b> ",
-    "and" : "と",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。",
@@ -74,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "フォルダー名",
     "Configuration" : "設定",
     "Available for" : "利用可能",
-    "Add storage" : "ストレージを追加",
     "Advanced settings" : "詳細設定",
     "Delete" : "削除",
+    "Add storage" : "ストレージを追加",
     "Enable User External Storage" : "ユーザーの外部ストレージを有効にする",
     "Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する"
 },
diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json
index 19a986bfb9..951e86df8c 100644
--- a/apps/files_external/l10n/ja.json
+++ b/apps/files_external/l10n/ja.json
@@ -1,65 +1,56 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "リクエストトークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "アクセストークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
-    "Please provide a valid Dropbox app key and secret." : "有効なDropboxアプリのキーとパスワードを入力してください。",
     "Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
     "Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
     "External storage" : "外部ストレージ",
-    "Local" : "ローカル",
-    "Location" : "位置",
+    "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
+    "Invalid mount point" : "無効なマウントポイント",
+    "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
+    "Personal" : "個人",
+    "System" : "システム",
+    "Grant access" : "アクセスを許可",
+    "Access granted" : "アクセスは許可されました",
+    "Generate keys" : "キーを生成",
+    "Error generating key pair" : "キーペアの生成エラー",
+    "Enable encryption" : "暗号化を有効に",
+    "Enable previews" : "プレビューを有効に",
+    "Check for changes" : "変更点を確認",
+    "Never" : "更新無",
+    "Once every direct access" : "直指定時のみ",
+    "Every time the filesystem is used" : "ファイルシステム利用時には毎回",
+    "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
+    "(group)" : "(グループ)",
+    "Saved" : "保存されました",
+    "None" : "なし",
+    "App key" : "アプリキー",
+    "App secret" : "アプリシークレット",
+    "Client ID" : "クライアントID",
+    "Client secret" : "クライアント秘密キー",
+    "Username" : "ユーザー名",
+    "Password" : "パスワード",
+    "API key" : "APIキー",
+    "Public key" : "公開鍵",
     "Amazon S3" : "Amazon S3",
-    "Key" : "キー",
-    "Secret" : "シークレットキー",
     "Bucket" : "バケット名",
-    "Amazon S3 and compliant" : "Amazon S3や互換ストレージ",
-    "Access Key" : "アクセスキー",
-    "Secret Key" : "シークレットキー",
     "Hostname" : "ホスト名",
     "Port" : "ポート",
     "Region" : "リージョン",
     "Enable SSL" : "SSLを有効",
     "Enable Path Style" : "パス形式を有効",
-    "App key" : "アプリキー",
-    "App secret" : "アプリシークレット",
-    "Host" : "ホスト",
-    "Username" : "ユーザー名",
-    "Password" : "パスワード",
-    "Remote subfolder" : "リモートサブフォルダー",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "クライアントID",
-    "Client secret" : "クライアント秘密キー",
-    "OpenStack Object Storage" : "OpenStack ObjectStorage",
-    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack ObjectStorage)",
-    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace CloudFiles)",
-    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack ObjectStorage)",
-    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack ObjectStorage)",
-    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack ObjectStorage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack ObjectStorage)",
-    "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
-    "Share" : "共有",
-    "SMB / CIFS using OC login" : "ownCloudログインを利用したSMB / CIFS",
-    "Username as share" : "共有名",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "リモートサブフォルダー",
     "Secure https://" : "セキュア https://",
-    "Public key" : "公開鍵",
-    "Storage with id \"%i\" not found" : "ストレージID \"%i\" が見つかりません",
-    "Invalid mount point" : "無効なマウントポイント",
-    "Invalid storage backend \"%s\"" : "\"%s\" のストレージバックエンドが不正",
-    "Access granted" : "アクセスは許可されました",
-    "Error configuring Dropbox storage" : "Dropboxストレージの設定エラー",
-    "Grant access" : "アクセスを許可",
-    "Error configuring Google Drive storage" : "Googleドライブストレージの設定エラー",
-    "Personal" : "個人",
-    "System" : "システム",
-    "Enable encryption" : "暗号化を有効に",
-    "Check for changes" : "変更点を確認",
-    "All users. Type to select user or group." : "すべてのユーザー。ユーザー、グループを追加",
-    "(group)" : "(グループ)",
-    "Saved" : "保存されました",
-    "Generate keys" : "キーを生成",
-    "Error generating key pair" : "キーペアの生成エラー",
+    "Dropbox" : "Dropbox",
+    "Host" : "ホスト",
+    "Secure ftps://" : "Secure ftps://",
+    "Local" : "ローカル",
+    "Location" : "位置",
+    "ownCloud" : "ownCloud",
+    "Root" : "ルート",
+    "Share" : "共有",
+    "Username as share" : "共有名",
+    "OpenStack Object Storage" : "OpenStack ObjectStorage",
     "<b>Note:</b> " : "<b>注意:</b> ",
-    "and" : "と",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。",
@@ -72,9 +63,9 @@
     "Folder name" : "フォルダー名",
     "Configuration" : "設定",
     "Available for" : "利用可能",
-    "Add storage" : "ストレージを追加",
     "Advanced settings" : "詳細設定",
     "Delete" : "削除",
+    "Add storage" : "ストレージを追加",
     "Enable User External Storage" : "ユーザーの外部ストレージを有効にする",
     "Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/ka_GE.js b/apps/files_external/l10n/ka_GE.js
index b152dbc7a8..6f38743a21 100644
--- a/apps/files_external/l10n/ka_GE.js
+++ b/apps/files_external/l10n/ka_GE.js
@@ -1,27 +1,28 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "გთხოვთ მიუთითოთ Dropbox აპლიკაციის გასაღები და კოდი.",
     "External storage" : "ექსტერნალ საცავი",
-    "Location" : "ადგილმდებარეობა",
-    "Port" : "პორტი",
-    "Region" : "რეგიონი",
-    "Host" : "ჰოსტი",
+    "Personal" : "პირადი",
+    "Grant access" : "დაშვების მინიჭება",
+    "Access granted" : "დაშვება მინიჭებულია",
+    "None" : "არა",
     "Username" : "მომხმარებლის სახელი",
     "Password" : "პაროლი",
-    "Share" : "გაზიარება",
+    "API key" : "API გასაღები",
+    "Port" : "პორტი",
+    "Region" : "რეგიონი",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "დაშვება მინიჭებულია",
-    "Error configuring Dropbox storage" : "შეცდომა Dropbox საცავის კონფიგურირების დროს",
-    "Grant access" : "დაშვების მინიჭება",
-    "Error configuring Google Drive storage" : "შეცდომა Google Drive საცავის კონფიგურირების დროს",
-    "Personal" : "პირადი",
+    "Host" : "ჰოსტი",
+    "Location" : "ადგილმდებარეობა",
+    "ownCloud" : "ownCloud–ი",
+    "Share" : "გაზიარება",
     "Name" : "სახელი",
     "External Storage" : "ექსტერნალ საცავი",
     "Folder name" : "ფოლდერის სახელი",
     "Configuration" : "კონფიგურაცია",
-    "Add storage" : "საცავის დამატება",
     "Delete" : "წაშლა",
+    "Add storage" : "საცავის დამატება",
     "Enable User External Storage" : "მომხმარებლის ექსტერნალ საცავის აქტივირება"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/ka_GE.json b/apps/files_external/l10n/ka_GE.json
index 9e5e8e8db8..7ca96f6db5 100644
--- a/apps/files_external/l10n/ka_GE.json
+++ b/apps/files_external/l10n/ka_GE.json
@@ -1,25 +1,26 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "გთხოვთ მიუთითოთ Dropbox აპლიკაციის გასაღები და კოდი.",
     "External storage" : "ექსტერნალ საცავი",
-    "Location" : "ადგილმდებარეობა",
-    "Port" : "პორტი",
-    "Region" : "რეგიონი",
-    "Host" : "ჰოსტი",
+    "Personal" : "პირადი",
+    "Grant access" : "დაშვების მინიჭება",
+    "Access granted" : "დაშვება მინიჭებულია",
+    "None" : "არა",
     "Username" : "მომხმარებლის სახელი",
     "Password" : "პაროლი",
-    "Share" : "გაზიარება",
+    "API key" : "API გასაღები",
+    "Port" : "პორტი",
+    "Region" : "რეგიონი",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "დაშვება მინიჭებულია",
-    "Error configuring Dropbox storage" : "შეცდომა Dropbox საცავის კონფიგურირების დროს",
-    "Grant access" : "დაშვების მინიჭება",
-    "Error configuring Google Drive storage" : "შეცდომა Google Drive საცავის კონფიგურირების დროს",
-    "Personal" : "პირადი",
+    "Host" : "ჰოსტი",
+    "Location" : "ადგილმდებარეობა",
+    "ownCloud" : "ownCloud–ი",
+    "Share" : "გაზიარება",
     "Name" : "სახელი",
     "External Storage" : "ექსტერნალ საცავი",
     "Folder name" : "ფოლდერის სახელი",
     "Configuration" : "კონფიგურაცია",
-    "Add storage" : "საცავის დამატება",
     "Delete" : "წაშლა",
+    "Add storage" : "საცავის დამატება",
     "Enable User External Storage" : "მომხმარებლის ექსტერნალ საცავის აქტივირება"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/km.js b/apps/files_external/l10n/km.js
index 0706c6d8b2..7a5c6cb86c 100644
--- a/apps/files_external/l10n/km.js
+++ b/apps/files_external/l10n/km.js
@@ -2,23 +2,24 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
-    "Location" : "ទីតាំង",
-    "Port" : "ច្រក",
-    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
+    "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
+    "Saved" : "បាន​រក្សាទុក",
+    "None" : "គ្មាន",
     "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Password" : "ពាក្យសម្ងាត់",
-    "Share" : "ចែក​រំលែក",
+    "Port" : "ច្រក",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
-    "Error configuring Dropbox storage" : "កំហុស​ការ​កំណត់​សណ្ឋាន​នៃ​ឃ្លាំងផ្ទុក Dropbox",
-    "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
-    "Personal" : "ផ្ទាល់​ខ្លួន",
-    "Saved" : "បាន​រក្សាទុក",
+    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Location" : "ទីតាំង",
+    "Share" : "ចែក​រំលែក",
     "Name" : "ឈ្មោះ",
     "External Storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
     "Folder name" : "ឈ្មោះ​ថត",
     "Configuration" : "ការ​កំណត់​សណ្ឋាន",
-    "Add storage" : "បន្ថែម​ឃ្លាំងផ្ទុក",
-    "Delete" : "លុប"
+    "Delete" : "លុប",
+    "Add storage" : "បន្ថែម​ឃ្លាំងផ្ទុក"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/km.json b/apps/files_external/l10n/km.json
index 3696e721b8..0375b5bfee 100644
--- a/apps/files_external/l10n/km.json
+++ b/apps/files_external/l10n/km.json
@@ -1,22 +1,23 @@
 { "translations": {
     "External storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
-    "Location" : "ទីតាំង",
-    "Port" : "ច្រក",
-    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
+    "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
+    "Saved" : "បាន​រក្សាទុក",
+    "None" : "គ្មាន",
     "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Password" : "ពាក្យសម្ងាត់",
-    "Share" : "ចែក​រំលែក",
+    "Port" : "ច្រក",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
-    "Error configuring Dropbox storage" : "កំហុស​ការ​កំណត់​សណ្ឋាន​នៃ​ឃ្លាំងផ្ទុក Dropbox",
-    "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
-    "Personal" : "ផ្ទាល់​ខ្លួន",
-    "Saved" : "បាន​រក្សាទុក",
+    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Location" : "ទីតាំង",
+    "Share" : "ចែក​រំលែក",
     "Name" : "ឈ្មោះ",
     "External Storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
     "Folder name" : "ឈ្មោះ​ថត",
     "Configuration" : "ការ​កំណត់​សណ្ឋាន",
-    "Add storage" : "បន្ថែម​ឃ្លាំងផ្ទុក",
-    "Delete" : "លុប"
+    "Delete" : "លុប",
+    "Add storage" : "បន្ថែម​ឃ្លាំងផ្ទុក"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/kn.js b/apps/files_external/l10n/kn.js
index ad1987e226..9d01033e35 100644
--- a/apps/files_external/l10n/kn.js
+++ b/apps/files_external/l10n/kn.js
@@ -1,15 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Local" : "ಸ್ಥಳೀಯ",
-    "Port" : "ರೇವು",
-    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
-    "Username" : "ಬಳಕೆಯ ಹೆಸರು",
-    "Password" : "ಗುಪ್ತ ಪದ",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
-    "URL" : "ಜಾಲದ ಕೊಂಡಿ",
     "Personal" : "ವೈಯಕ್ತಿಕ",
     "Saved" : "ಉಳಿಸಿದ",
+    "None" : "ಯಾವುದೂ ಇಲ್ಲ",
+    "Username" : "ಬಳಕೆಯ ಹೆಸರು",
+    "Password" : "ಗುಪ್ತ ಪದ",
+    "Port" : "ರೇವು",
+    "WebDAV" : "WebDAV",
+    "URL" : "ಜಾಲದ ಕೊಂಡಿ",
+    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
+    "Local" : "ಸ್ಥಳೀಯ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Name" : "ಹೆಸರು",
     "Delete" : "ಅಳಿಸಿ"
 },
diff --git a/apps/files_external/l10n/kn.json b/apps/files_external/l10n/kn.json
index 74fc7e223b..0380f431d1 100644
--- a/apps/files_external/l10n/kn.json
+++ b/apps/files_external/l10n/kn.json
@@ -1,13 +1,15 @@
 { "translations": {
-    "Local" : "ಸ್ಥಳೀಯ",
-    "Port" : "ರೇವು",
-    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
-    "Username" : "ಬಳಕೆಯ ಹೆಸರು",
-    "Password" : "ಗುಪ್ತ ಪದ",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
-    "URL" : "ಜಾಲದ ಕೊಂಡಿ",
     "Personal" : "ವೈಯಕ್ತಿಕ",
     "Saved" : "ಉಳಿಸಿದ",
+    "None" : "ಯಾವುದೂ ಇಲ್ಲ",
+    "Username" : "ಬಳಕೆಯ ಹೆಸರು",
+    "Password" : "ಗುಪ್ತ ಪದ",
+    "Port" : "ರೇವು",
+    "WebDAV" : "WebDAV",
+    "URL" : "ಜಾಲದ ಕೊಂಡಿ",
+    "Host" : "ಅತಿಥೆಯ-ಗಣಕ",
+    "Local" : "ಸ್ಥಳೀಯ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Name" : "ಹೆಸರು",
     "Delete" : "ಅಳಿಸಿ"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js
index de1ca02820..3bed24abe6 100644
--- a/apps/files_external/l10n/ko.js
+++ b/apps/files_external/l10n/ko.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.",
-    "Please provide a valid Dropbox app key and secret." : "올바른 Dropbox 앱 키와 암호를 입력하십시오.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Please provide a valid app key and secret." : "올바른 앱 키와 비밀 값을 입력하십시오.",
     "Step 1 failed. Exception: %s" : "1단계 실패. 예외: %s",
     "Step 2 failed. Exception: %s" : "2단계 실패. 예외: %s",
     "External storage" : "외부 저장소",
-    "Local" : "로컬",
-    "Location" : "위치",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "키",
-    "Secret" : "비밀 값",
-    "Bucket" : "버킷",
-    "Amazon S3 and compliant" : "Amazon S3 및 호환 가능 서비스",
-    "Access Key" : "접근 키",
-    "Secret Key" : "비밀 키",
-    "Hostname" : "호스트 이름",
-    "Port" : "포트",
-    "Region" : "지역",
-    "Enable SSL" : "SSL 사용",
-    "Enable Path Style" : "경로 스타일 사용",
-    "App key" : "앱 키",
-    "App secret" : "앱 비밀 값",
-    "Host" : "호스트",
-    "Username" : "사용자 이름",
-    "Password" : "암호",
-    "Remote subfolder" : "원격 하위 폴더",
-    "Secure ftps://" : "보안 ftps://",
-    "Client ID" : "클라이언트 ID",
-    "Client secret" : "클라이언트 비밀 값",
-    "OpenStack Object Storage" : "OpenStack 객체 저장소",
-    "Region (optional for OpenStack Object Storage)" : "지역(OpenStack 객체 저장소는 선택 사항)",
-    "API Key (required for Rackspace Cloud Files)" : "API 키(Rackspace 클라우드 파일에 필요함)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname(OpenStack 객체 저장소에 필요함)",
-    "Password (required for OpenStack Object Storage)" : "암호(OpenStack 객체 저장소에 필요함)",
-    "Service Name (required for OpenStack Object Storage)" : "서비스 이름(OpenStack 객체 저장소에 필요함)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Identity 엔드포인트 URL(OpenStack 객체 저장소에 필요함)",
-    "Timeout of HTTP requests in seconds" : "초 단위 HTTP 요청 시간 제한",
-    "Share" : "공유",
-    "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS",
-    "Username as share" : "사용자 이름으로 공유",
-    "URL" : "URL",
-    "Secure https://" : "보안 https://",
-    "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
-    "Public key" : "공개 키",
     "Storage with id \"%i\" not found" : "ID가 \"%i\"인 저장소를 찾을 수 없음",
+    "Invalid backend or authentication mechanism class" : "백엔드나 인증 방식 클래스가 잘못됨",
     "Invalid mount point" : "잘못된 마운트 지점",
+    "Objectstore forbidden" : "Objectstore에 접근 금지됨",
     "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"",
-    "Access granted" : "접근 허가됨",
-    "Error configuring Dropbox storage" : "Dropbox 저장소 설정 오류",
-    "Grant access" : "접근 권한 부여",
-    "Error configuring Google Drive storage" : "Google 드라이브 저장소 설정 오류",
+    "Unsatisfied backend parameters" : "백엔드 인자가 부족함",
+    "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함",
     "Personal" : "개인",
     "System" : "시스템",
+    "Grant access" : "접근 권한 부여",
+    "Access granted" : "접근 허가됨",
+    "Error configuring OAuth1" : "OAuth1 설정 오류",
+    "Error configuring OAuth2" : "OAuth2 설정 오류",
+    "Generate keys" : "키 생성",
+    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
     "Enable encryption" : "암호화 사용",
     "Enable previews" : "미리 보기 사용",
     "Check for changes" : "변경 사항 감시",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오",
     "(group)" : "(그룹)",
     "Saved" : "저장됨",
-    "Generate keys" : "키 생성",
-    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
+    "Access key" : "접근 키",
+    "Secret key" : "비밀 키",
+    "Builtin" : "내장",
+    "None" : "없음",
+    "OAuth1" : "OAuth1",
+    "App key" : "앱 키",
+    "App secret" : "앱 비밀 값",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "클라이언트 ID",
+    "Client secret" : "클라이언트 비밀 값",
+    "Username" : "사용자 이름",
+    "Password" : "암호",
+    "API key" : "API 키",
+    "Username and password" : "사용자 이름과 암호",
+    "Session credentials" : "세션 접근 정보",
+    "Public key" : "공개 키",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "버킷",
+    "Hostname" : "호스트 이름",
+    "Port" : "포트",
+    "Region" : "지역",
+    "Enable SSL" : "SSL 사용",
+    "Enable Path Style" : "경로 스타일 사용",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "원격 하위 폴더",
+    "Secure https://" : "보안 https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "호스트",
+    "Secure ftps://" : "보안 ftps://",
+    "Google Drive" : "Google 드라이브",
+    "Local" : "로컬",
+    "Location" : "위치",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "루트",
+    "SMB / CIFS" : "SMB/CIFS",
+    "Share" : "공유",
+    "Username as share" : "사용자 이름으로 공유",
+    "OpenStack Object Storage" : "OpenStack 객체 저장소",
     "<b>Note:</b> " : "<b>메모:</b>",
-    "and" : "그리고",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> \"%s\"이(가) 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "범위",
     "External Storage" : "외부 저장소",
     "Folder name" : "폴더 이름",
+    "Authentication" : "인증",
     "Configuration" : "설정",
     "Available for" : "다음으로 사용 가능",
-    "Add storage" : "저장소 추가",
     "Advanced settings" : "고급 설정",
     "Delete" : "삭제",
+    "Add storage" : "저장소 추가",
     "Enable User External Storage" : "사용자 외부 저장소 사용",
     "Allow users to mount the following external storage" : "사용자가 다음 외부 저장소를 마운트할 수 있도록 허용"
 },
diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json
index 843a9dac05..86cecf0132 100644
--- a/apps/files_external/l10n/ko.json
+++ b/apps/files_external/l10n/ko.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. Dropbox 앱 키와 비밀 값이 올바른지 확인하십시오.",
-    "Please provide a valid Dropbox app key and secret." : "올바른 Dropbox 앱 키와 암호를 입력하십시오.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "요청 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "접근 토큰을 가져올 수 없습니다. 앱 키와 비밀 값이 올바른지 확인하십시오.",
+    "Please provide a valid app key and secret." : "올바른 앱 키와 비밀 값을 입력하십시오.",
     "Step 1 failed. Exception: %s" : "1단계 실패. 예외: %s",
     "Step 2 failed. Exception: %s" : "2단계 실패. 예외: %s",
     "External storage" : "외부 저장소",
-    "Local" : "로컬",
-    "Location" : "위치",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "키",
-    "Secret" : "비밀 값",
-    "Bucket" : "버킷",
-    "Amazon S3 and compliant" : "Amazon S3 및 호환 가능 서비스",
-    "Access Key" : "접근 키",
-    "Secret Key" : "비밀 키",
-    "Hostname" : "호스트 이름",
-    "Port" : "포트",
-    "Region" : "지역",
-    "Enable SSL" : "SSL 사용",
-    "Enable Path Style" : "경로 스타일 사용",
-    "App key" : "앱 키",
-    "App secret" : "앱 비밀 값",
-    "Host" : "호스트",
-    "Username" : "사용자 이름",
-    "Password" : "암호",
-    "Remote subfolder" : "원격 하위 폴더",
-    "Secure ftps://" : "보안 ftps://",
-    "Client ID" : "클라이언트 ID",
-    "Client secret" : "클라이언트 비밀 값",
-    "OpenStack Object Storage" : "OpenStack 객체 저장소",
-    "Region (optional for OpenStack Object Storage)" : "지역(OpenStack 객체 저장소는 선택 사항)",
-    "API Key (required for Rackspace Cloud Files)" : "API 키(Rackspace 클라우드 파일에 필요함)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname(OpenStack 객체 저장소에 필요함)",
-    "Password (required for OpenStack Object Storage)" : "암호(OpenStack 객체 저장소에 필요함)",
-    "Service Name (required for OpenStack Object Storage)" : "서비스 이름(OpenStack 객체 저장소에 필요함)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Identity 엔드포인트 URL(OpenStack 객체 저장소에 필요함)",
-    "Timeout of HTTP requests in seconds" : "초 단위 HTTP 요청 시간 제한",
-    "Share" : "공유",
-    "SMB / CIFS using OC login" : "OC 로그인을 사용하는 SMB/CIFS",
-    "Username as share" : "사용자 이름으로 공유",
-    "URL" : "URL",
-    "Secure https://" : "보안 https://",
-    "SFTP with secret key login" : "비밀 키 로그인을 사용하는 SFTP",
-    "Public key" : "공개 키",
     "Storage with id \"%i\" not found" : "ID가 \"%i\"인 저장소를 찾을 수 없음",
+    "Invalid backend or authentication mechanism class" : "백엔드나 인증 방식 클래스가 잘못됨",
     "Invalid mount point" : "잘못된 마운트 지점",
+    "Objectstore forbidden" : "Objectstore에 접근 금지됨",
     "Invalid storage backend \"%s\"" : "잘못된 저장소 백엔드 \"%s\"",
-    "Access granted" : "접근 허가됨",
-    "Error configuring Dropbox storage" : "Dropbox 저장소 설정 오류",
-    "Grant access" : "접근 권한 부여",
-    "Error configuring Google Drive storage" : "Google 드라이브 저장소 설정 오류",
+    "Unsatisfied backend parameters" : "백엔드 인자가 부족함",
+    "Unsatisfied authentication mechanism parameters" : "인증 방식 인자가 부족함",
     "Personal" : "개인",
     "System" : "시스템",
+    "Grant access" : "접근 권한 부여",
+    "Access granted" : "접근 허가됨",
+    "Error configuring OAuth1" : "OAuth1 설정 오류",
+    "Error configuring OAuth2" : "OAuth2 설정 오류",
+    "Generate keys" : "키 생성",
+    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
     "Enable encryption" : "암호화 사용",
     "Enable previews" : "미리 보기 사용",
     "Check for changes" : "변경 사항 감시",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "모든 사용자입니다. 사용자나 그룹을 선택하려면 입력하십시오",
     "(group)" : "(그룹)",
     "Saved" : "저장됨",
-    "Generate keys" : "키 생성",
-    "Error generating key pair" : "키 쌍을 생성하는 중 오류 발생",
+    "Access key" : "접근 키",
+    "Secret key" : "비밀 키",
+    "Builtin" : "내장",
+    "None" : "없음",
+    "OAuth1" : "OAuth1",
+    "App key" : "앱 키",
+    "App secret" : "앱 비밀 값",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "클라이언트 ID",
+    "Client secret" : "클라이언트 비밀 값",
+    "Username" : "사용자 이름",
+    "Password" : "암호",
+    "API key" : "API 키",
+    "Username and password" : "사용자 이름과 암호",
+    "Session credentials" : "세션 접근 정보",
+    "Public key" : "공개 키",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "버킷",
+    "Hostname" : "호스트 이름",
+    "Port" : "포트",
+    "Region" : "지역",
+    "Enable SSL" : "SSL 사용",
+    "Enable Path Style" : "경로 스타일 사용",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "원격 하위 폴더",
+    "Secure https://" : "보안 https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "호스트",
+    "Secure ftps://" : "보안 ftps://",
+    "Google Drive" : "Google 드라이브",
+    "Local" : "로컬",
+    "Location" : "위치",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "루트",
+    "SMB / CIFS" : "SMB/CIFS",
+    "Share" : "공유",
+    "Username as share" : "사용자 이름으로 공유",
+    "OpenStack Object Storage" : "OpenStack 객체 저장소",
     "<b>Note:</b> " : "<b>메모:</b>",
-    "and" : "그리고",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP cURL 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> PHP FTP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>메모:</b> \"%s\"이(가) 설치되어 있지 않습니다. %s을(를) 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
@@ -75,11 +81,12 @@
     "Scope" : "범위",
     "External Storage" : "외부 저장소",
     "Folder name" : "폴더 이름",
+    "Authentication" : "인증",
     "Configuration" : "설정",
     "Available for" : "다음으로 사용 가능",
-    "Add storage" : "저장소 추가",
     "Advanced settings" : "고급 설정",
     "Delete" : "삭제",
+    "Add storage" : "저장소 추가",
     "Enable User External Storage" : "사용자 외부 저장소 사용",
     "Allow users to mount the following external storage" : "사용자가 다음 외부 저장소를 마운트할 수 있도록 허용"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/ku_IQ.js b/apps/files_external/l10n/ku_IQ.js
index 60110b5a0a..72c1e8313b 100644
--- a/apps/files_external/l10n/ku_IQ.js
+++ b/apps/files_external/l10n/ku_IQ.js
@@ -1,11 +1,12 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "شوێن",
+    "None" : "هیچ",
     "Username" : "ناوی به‌کارهێنه‌ر",
     "Password" : "وشەی تێپەربو",
-    "Share" : "هاوبەشی کردن",
     "URL" : "ناونیشانی به‌سته‌ر",
+    "Location" : "شوێن",
+    "Share" : "هاوبەشی کردن",
     "Name" : "ناو",
     "Folder name" : "ناوی بوخچه"
 },
diff --git a/apps/files_external/l10n/ku_IQ.json b/apps/files_external/l10n/ku_IQ.json
index 5116096025..9ef5a71e81 100644
--- a/apps/files_external/l10n/ku_IQ.json
+++ b/apps/files_external/l10n/ku_IQ.json
@@ -1,9 +1,10 @@
 { "translations": {
-    "Location" : "شوێن",
+    "None" : "هیچ",
     "Username" : "ناوی به‌کارهێنه‌ر",
     "Password" : "وشەی تێپەربو",
-    "Share" : "هاوبەشی کردن",
     "URL" : "ناونیشانی به‌سته‌ر",
+    "Location" : "شوێن",
+    "Share" : "هاوبەشی کردن",
     "Name" : "ناو",
     "Folder name" : "ناوی بوخچه"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/lb.js b/apps/files_external/l10n/lb.js
index 4f18f5b6e3..7e03d3b1b9 100644
--- a/apps/files_external/l10n/lb.js
+++ b/apps/files_external/l10n/lb.js
@@ -1,16 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Uert",
-    "Port" : "Port",
-    "Region" : "Regioun",
-    "Host" : "Host",
-    "Username" : "Benotzernumm",
-    "Password" : "Passwuert",
-    "Share" : "Deelen",
-    "URL" : "URL",
     "Personal" : "Perséinlech",
     "Saved" : "Gespäichert",
+    "Username" : "Benotzernumm",
+    "Password" : "Passwuert",
+    "Port" : "Port",
+    "Region" : "Regioun",
+    "URL" : "URL",
+    "Host" : "Host",
+    "Location" : "Uert",
+    "ownCloud" : "ownCloud",
+    "Share" : "Deelen",
     "Name" : "Numm",
     "Folder name" : "Dossiers Numm:",
     "Delete" : "Läschen"
diff --git a/apps/files_external/l10n/lb.json b/apps/files_external/l10n/lb.json
index a9acd18180..5c6797533b 100644
--- a/apps/files_external/l10n/lb.json
+++ b/apps/files_external/l10n/lb.json
@@ -1,14 +1,15 @@
 { "translations": {
-    "Location" : "Uert",
-    "Port" : "Port",
-    "Region" : "Regioun",
-    "Host" : "Host",
-    "Username" : "Benotzernumm",
-    "Password" : "Passwuert",
-    "Share" : "Deelen",
-    "URL" : "URL",
     "Personal" : "Perséinlech",
     "Saved" : "Gespäichert",
+    "Username" : "Benotzernumm",
+    "Password" : "Passwuert",
+    "Port" : "Port",
+    "Region" : "Regioun",
+    "URL" : "URL",
+    "Host" : "Host",
+    "Location" : "Uert",
+    "ownCloud" : "ownCloud",
+    "Share" : "Deelen",
     "Name" : "Numm",
     "Folder name" : "Dossiers Numm:",
     "Delete" : "Läschen"
diff --git a/apps/files_external/l10n/lt_LT.js b/apps/files_external/l10n/lt_LT.js
index fa8dcec68e..9232ec997d 100644
--- a/apps/files_external/l10n/lt_LT.js
+++ b/apps/files_external/l10n/lt_LT.js
@@ -1,27 +1,28 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\".",
     "External storage" : "Išorinė saugykla",
-    "Location" : "Vieta",
-    "Port" : "Prievadas",
-    "Region" : "Regionas",
-    "Host" : "Mazgas",
+    "Personal" : "Asmeniniai",
+    "Grant access" : "Suteikti priėjimą",
+    "Access granted" : "Priėjimas suteiktas",
+    "None" : "Nieko",
     "Username" : "Prisijungimo vardas",
     "Password" : "Slaptažodis",
-    "Share" : "Dalintis",
+    "API key" : "API raktas",
+    "Port" : "Prievadas",
+    "Region" : "Regionas",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Priėjimas suteiktas",
-    "Error configuring Dropbox storage" : "Klaida nustatinėjant Dropbox talpyklą",
-    "Grant access" : "Suteikti priėjimą",
-    "Error configuring Google Drive storage" : "Klaida nustatinėjant Google Drive talpyklą",
-    "Personal" : "Asmeniniai",
+    "Host" : "Mazgas",
+    "Location" : "Vieta",
+    "ownCloud" : "ownCloud",
+    "Share" : "Dalintis",
     "Name" : "Pavadinimas",
     "External Storage" : "Išorinės saugyklos",
     "Folder name" : "Katalogo pavadinimas",
     "Configuration" : "Konfigūracija",
-    "Add storage" : "Pridėti saugyklą",
     "Delete" : "Ištrinti",
+    "Add storage" : "Pridėti saugyklą",
     "Enable User External Storage" : "Įjungti vartotojų išorines saugyklas"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_external/l10n/lt_LT.json b/apps/files_external/l10n/lt_LT.json
index a6d6e9bfc7..d196c8e00b 100644
--- a/apps/files_external/l10n/lt_LT.json
+++ b/apps/files_external/l10n/lt_LT.json
@@ -1,25 +1,26 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\".",
     "External storage" : "Išorinė saugykla",
-    "Location" : "Vieta",
-    "Port" : "Prievadas",
-    "Region" : "Regionas",
-    "Host" : "Mazgas",
+    "Personal" : "Asmeniniai",
+    "Grant access" : "Suteikti priėjimą",
+    "Access granted" : "Priėjimas suteiktas",
+    "None" : "Nieko",
     "Username" : "Prisijungimo vardas",
     "Password" : "Slaptažodis",
-    "Share" : "Dalintis",
+    "API key" : "API raktas",
+    "Port" : "Prievadas",
+    "Region" : "Regionas",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Priėjimas suteiktas",
-    "Error configuring Dropbox storage" : "Klaida nustatinėjant Dropbox talpyklą",
-    "Grant access" : "Suteikti priėjimą",
-    "Error configuring Google Drive storage" : "Klaida nustatinėjant Google Drive talpyklą",
-    "Personal" : "Asmeniniai",
+    "Host" : "Mazgas",
+    "Location" : "Vieta",
+    "ownCloud" : "ownCloud",
+    "Share" : "Dalintis",
     "Name" : "Pavadinimas",
     "External Storage" : "Išorinės saugyklos",
     "Folder name" : "Katalogo pavadinimas",
     "Configuration" : "Konfigūracija",
-    "Add storage" : "Pridėti saugyklą",
     "Delete" : "Ištrinti",
+    "Add storage" : "Pridėti saugyklą",
     "Enable User External Storage" : "Įjungti vartotojų išorines saugyklas"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/lv.js b/apps/files_external/l10n/lv.js
index 8b3dae5e4f..2f694de224 100644
--- a/apps/files_external/l10n/lv.js
+++ b/apps/files_external/l10n/lv.js
@@ -1,27 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu.",
     "External storage" : "Ārējā krātuve",
-    "Location" : "Vieta",
-    "Port" : "Ports",
-    "Host" : "Resursdators",
+    "Personal" : "Personīgi",
+    "Grant access" : "Piešķirt pieeju",
+    "Access granted" : "Piešķirta pieeja",
+    "Saved" : "Saglabāts",
+    "None" : "Nav",
     "Username" : "Lietotājvārds",
     "Password" : "Parole",
-    "Share" : "Dalīties",
+    "Port" : "Ports",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Piešķirta pieeja",
-    "Error configuring Dropbox storage" : "Kļūda, konfigurējot Dropbox krātuvi",
-    "Grant access" : "Piešķirt pieeju",
-    "Error configuring Google Drive storage" : "Kļūda, konfigurējot Google Drive krātuvi",
-    "Personal" : "Personīgi",
-    "Saved" : "Saglabāts",
+    "Host" : "Resursdators",
+    "Location" : "Vieta",
+    "ownCloud" : "ownCloud",
+    "Share" : "Dalīties",
     "Name" : "Nosaukums",
     "External Storage" : "Ārējā krātuve",
     "Folder name" : "Mapes nosaukums",
     "Configuration" : "Konfigurācija",
-    "Add storage" : "Pievienot krātuvi",
     "Delete" : "Dzēst",
+    "Add storage" : "Pievienot krātuvi",
     "Enable User External Storage" : "Aktivēt lietotāja ārējo krātuvi"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/files_external/l10n/lv.json b/apps/files_external/l10n/lv.json
index 6ec5fad6f9..5b281307ec 100644
--- a/apps/files_external/l10n/lv.json
+++ b/apps/files_external/l10n/lv.json
@@ -1,25 +1,25 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu.",
     "External storage" : "Ārējā krātuve",
-    "Location" : "Vieta",
-    "Port" : "Ports",
-    "Host" : "Resursdators",
+    "Personal" : "Personīgi",
+    "Grant access" : "Piešķirt pieeju",
+    "Access granted" : "Piešķirta pieeja",
+    "Saved" : "Saglabāts",
+    "None" : "Nav",
     "Username" : "Lietotājvārds",
     "Password" : "Parole",
-    "Share" : "Dalīties",
+    "Port" : "Ports",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Piešķirta pieeja",
-    "Error configuring Dropbox storage" : "Kļūda, konfigurējot Dropbox krātuvi",
-    "Grant access" : "Piešķirt pieeju",
-    "Error configuring Google Drive storage" : "Kļūda, konfigurējot Google Drive krātuvi",
-    "Personal" : "Personīgi",
-    "Saved" : "Saglabāts",
+    "Host" : "Resursdators",
+    "Location" : "Vieta",
+    "ownCloud" : "ownCloud",
+    "Share" : "Dalīties",
     "Name" : "Nosaukums",
     "External Storage" : "Ārējā krātuve",
     "Folder name" : "Mapes nosaukums",
     "Configuration" : "Konfigurācija",
-    "Add storage" : "Pievienot krātuvi",
     "Delete" : "Dzēst",
+    "Add storage" : "Pievienot krātuvi",
     "Enable User External Storage" : "Aktivēt lietotāja ārējo krātuvi"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/mk.js b/apps/files_external/l10n/mk.js
index 4250db79d3..3a62a2b580 100644
--- a/apps/files_external/l10n/mk.js
+++ b/apps/files_external/l10n/mk.js
@@ -1,22 +1,23 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Ве молам доставите валиден Dropbox клуч и тајна лозинка.",
-    "Local" : "Локален",
-    "Location" : "Локација",
-    "Port" : "Порта",
-    "Region" : "Регион",
-    "Host" : "Домаќин",
+    "Personal" : "Лично",
+    "Grant access" : "Дозволи пристап",
+    "Access granted" : "Пристапот е дозволен",
+    "Saved" : "Снимено",
+    "None" : "Ништо",
     "Username" : "Корисничко име",
     "Password" : "Лозинка",
-    "Share" : "Сподели",
+    "API key" : "API key",
+    "Port" : "Порта",
+    "Region" : "Регион",
+    "WebDAV" : "WebDAV",
     "URL" : "Адреса",
-    "Access granted" : "Пристапот е дозволен",
-    "Error configuring Dropbox storage" : "Грешка при конфигурација на Dropbox",
-    "Grant access" : "Дозволи пристап",
-    "Error configuring Google Drive storage" : "Грешка при конфигурација на Google Drive",
-    "Personal" : "Лично",
-    "Saved" : "Снимено",
+    "Host" : "Домаќин",
+    "Local" : "Локален",
+    "Location" : "Локација",
+    "ownCloud" : "ownCloud",
+    "Share" : "Сподели",
     "Name" : "Име",
     "External Storage" : "Надворешно складиште",
     "Folder name" : "Име на папка",
diff --git a/apps/files_external/l10n/mk.json b/apps/files_external/l10n/mk.json
index d216a075b3..9fb0994a60 100644
--- a/apps/files_external/l10n/mk.json
+++ b/apps/files_external/l10n/mk.json
@@ -1,20 +1,21 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Ве молам доставите валиден Dropbox клуч и тајна лозинка.",
-    "Local" : "Локален",
-    "Location" : "Локација",
-    "Port" : "Порта",
-    "Region" : "Регион",
-    "Host" : "Домаќин",
+    "Personal" : "Лично",
+    "Grant access" : "Дозволи пристап",
+    "Access granted" : "Пристапот е дозволен",
+    "Saved" : "Снимено",
+    "None" : "Ништо",
     "Username" : "Корисничко име",
     "Password" : "Лозинка",
-    "Share" : "Сподели",
+    "API key" : "API key",
+    "Port" : "Порта",
+    "Region" : "Регион",
+    "WebDAV" : "WebDAV",
     "URL" : "Адреса",
-    "Access granted" : "Пристапот е дозволен",
-    "Error configuring Dropbox storage" : "Грешка при конфигурација на Dropbox",
-    "Grant access" : "Дозволи пристап",
-    "Error configuring Google Drive storage" : "Грешка при конфигурација на Google Drive",
-    "Personal" : "Лично",
-    "Saved" : "Снимено",
+    "Host" : "Домаќин",
+    "Local" : "Локален",
+    "Location" : "Локација",
+    "ownCloud" : "ownCloud",
+    "Share" : "Сподели",
     "Name" : "Име",
     "External Storage" : "Надворешно складиште",
     "Folder name" : "Име на папка",
diff --git a/apps/files_external/l10n/ms_MY.js b/apps/files_external/l10n/ms_MY.js
index e73074f39f..1b28ef4226 100644
--- a/apps/files_external/l10n/ms_MY.js
+++ b/apps/files_external/l10n/ms_MY.js
@@ -1,13 +1,14 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Lokasi",
-    "Region" : "Wilayah",
+    "Personal" : "Peribadi",
     "Username" : "Nama pengguna",
     "Password" : "Kata laluan",
-    "Share" : "Kongsi",
+    "Region" : "Wilayah",
     "URL" : "URL",
-    "Personal" : "Peribadi",
+    "Location" : "Lokasi",
+    "ownCloud" : "ownCloud",
+    "Share" : "Kongsi",
     "Name" : "Nama",
     "Delete" : "Padam"
 },
diff --git a/apps/files_external/l10n/ms_MY.json b/apps/files_external/l10n/ms_MY.json
index 3dbcfc92a7..7929310627 100644
--- a/apps/files_external/l10n/ms_MY.json
+++ b/apps/files_external/l10n/ms_MY.json
@@ -1,11 +1,12 @@
 { "translations": {
-    "Location" : "Lokasi",
-    "Region" : "Wilayah",
+    "Personal" : "Peribadi",
     "Username" : "Nama pengguna",
     "Password" : "Kata laluan",
-    "Share" : "Kongsi",
+    "Region" : "Wilayah",
     "URL" : "URL",
-    "Personal" : "Peribadi",
+    "Location" : "Lokasi",
+    "ownCloud" : "ownCloud",
+    "Share" : "Kongsi",
     "Name" : "Nama",
     "Delete" : "Padam"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/my_MM.js b/apps/files_external/l10n/my_MM.js
index d858639143..427f35f62b 100644
--- a/apps/files_external/l10n/my_MM.js
+++ b/apps/files_external/l10n/my_MM.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "တည်နေရာ",
     "Username" : "သုံးစွဲသူအမည်",
-    "Password" : "စကားဝှက်"
+    "Password" : "စကားဝှက်",
+    "Location" : "တည်နေရာ"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/my_MM.json b/apps/files_external/l10n/my_MM.json
index ee8c8165a5..b13ba9dbd1 100644
--- a/apps/files_external/l10n/my_MM.json
+++ b/apps/files_external/l10n/my_MM.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Location" : "တည်နေရာ",
     "Username" : "သုံးစွဲသူအမည်",
-    "Password" : "စကားဝှက်"
+    "Password" : "စကားဝှက်",
+    "Location" : "တည်နေရာ"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
index 8faf9719fe..1401bbe701 100644
--- a/apps/files_external/l10n/nb_NO.js
+++ b/apps/files_external/l10n/nb_NO.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting av adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
-    "Please provide a valid Dropbox app key and secret." : "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Henting av adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Please provide a valid app key and secret." : "Vær vennlig å oppgi gyldig appnøkkel og hemmelighet.",
     "Step 1 failed. Exception: %s" : "Steg 1 feilet. Unntak: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 feilet. Unntak: %s",
     "External storage" : "Ekstern lagringsplass",
-    "Local" : "Lokal",
-    "Location" : "Sted",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 og tilsvarende",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Servernavn",
-    "Port" : "Port",
-    "Region" : "Området",
-    "Enable SSL" : "Aktiver SSL",
-    "Enable Path Style" : "Aktiver Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Tjener",
-    "Username" : "Brukernavn",
-    "Password" : "Passord",
-    "Remote subfolder" : "Ekstern undermappe",
-    "Secure ftps://" : "Sikker ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (ikke påkrevet for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (påkrevet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (påkrevet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Passord (påkrevet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjenestenavn (påkrevet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL for identity endpoint (påkrevet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsavbrudd for HTTP-forespørsler i sekunder",
-    "Share" : "Delt ressurs",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-pålogging",
-    "Username as share" : "Brukernavn som share",
-    "URL" : "URL",
-    "Secure https://" : "Sikker https://",
-    "SFTP with secret key login" : "SFTP med hemmelig nøkkel for pålogging",
-    "Public key" : "Offentlig nøkkel",
     "Storage with id \"%i\" not found" : "Lager med id \"%i\" ikke funnet",
+    "Invalid backend or authentication mechanism class" : "Ugyldig server eller type autentiseringsmekanisme",
     "Invalid mount point" : "Ugyldig oppkoblingspunkt",
+    "Objectstore forbidden" : "Objektlager forbudt",
     "Invalid storage backend \"%s\"" : "Ugyldig lagringsserver \"%s\"",
-    "Access granted" : "Tilgang innvilget",
-    "Error configuring Dropbox storage" : "Feil ved konfigurering av Dropbox-lagring",
-    "Grant access" : "Gi tilgang",
-    "Error configuring Google Drive storage" : "Feil med konfigurering av Google Drive",
+    "Unsatisfied backend parameters" : "Noen server-parameter mangler",
+    "Unsatisfied authentication mechanism parameters" : "Noen parametre for autentiseringsmekanisme mangler",
     "Personal" : "Personlig",
     "System" : "System",
+    "Grant access" : "Gi tilgang",
+    "Access granted" : "Tilgang innvilget",
+    "Error configuring OAuth1" : "Feil ved konfigurering av OAuth1",
+    "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2",
+    "Generate keys" : "Generer nøkler",
+    "Error generating key pair" : "Feil ved nøkkelgenerering",
     "Enable encryption" : "Aktiver kryptering",
     "Enable previews" : "Tillat fohåndsvisning",
     "Check for changes" : "Se etter endringer",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Lagret",
-    "Generate keys" : "Generer nøkler",
-    "Error generating key pair" : "Feil ved nøkkelgenerering",
+    "Access key" : "Tilgangsnøkkel",
+    "Secret key" : "Hemmelig nøkkel",
+    "Builtin" : "Innebygget",
+    "None" : "Ingen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Brukernavn",
+    "Password" : "Passord",
+    "API key" : "API-nøkkel",
+    "Username and password" : "Brukernavn og passord",
+    "Session credentials" : "Påloggingsdetaljer for økt",
+    "Public key" : "Offentlig nøkkel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Servernavn",
+    "Port" : "Port",
+    "Region" : "Området",
+    "Enable SSL" : "Aktiver SSL",
+    "Enable Path Style" : "Aktiver Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Ekstern undermappe",
+    "Secure https://" : "Sikker https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Tjener",
+    "Secure ftps://" : "Sikker ftps://",
+    "Google Drive" : "Google Disk",
+    "Local" : "Lokal",
+    "Location" : "Sted",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Rot",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Delt ressurs",
+    "Username as share" : "Brukernavn som share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Merk:</b> ",
-    "and" : "og",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å få dette installert.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Omfang",
     "External Storage" : "Ekstern lagring",
     "Folder name" : "Mappenavn",
+    "Authentication" : "Autentisering",
     "Configuration" : "Konfigurasjon",
     "Available for" : "Tilgjengelig for",
-    "Add storage" : "Legg til lagringsplass",
     "Advanced settings" : "Avanserte innstillinger",
     "Delete" : "Slett",
+    "Add storage" : "Legg til lagringsplass",
     "Enable User External Storage" : "Aktiver ekstern lagring for bruker",
     "Allow users to mount the following external storage" : "Tillat brukere å koble opp følgende eksterne lagring"
 },
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
index c6d566b057..cf6c2d38f9 100644
--- a/apps/files_external/l10n/nb_NO.json
+++ b/apps/files_external/l10n/nb_NO.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting av adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
-    "Please provide a valid Dropbox app key and secret." : "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Henting av adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din stemmer.",
+    "Please provide a valid app key and secret." : "Vær vennlig å oppgi gyldig appnøkkel og hemmelighet.",
     "Step 1 failed. Exception: %s" : "Steg 1 feilet. Unntak: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 feilet. Unntak: %s",
     "External storage" : "Ekstern lagringsplass",
-    "Local" : "Lokal",
-    "Location" : "Sted",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Key",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 og tilsvarende",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Servernavn",
-    "Port" : "Port",
-    "Region" : "Området",
-    "Enable SSL" : "Aktiver SSL",
-    "Enable Path Style" : "Aktiver Path Style",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Tjener",
-    "Username" : "Brukernavn",
-    "Password" : "Passord",
-    "Remote subfolder" : "Ekstern undermappe",
-    "Secure ftps://" : "Sikker ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (ikke påkrevet for OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (påkrevet for Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (påkrevet for OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Passord (påkrevet for OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjenestenavn (påkrevet for OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL for identity endpoint (påkrevet for OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Tidsavbrudd for HTTP-forespørsler i sekunder",
-    "Share" : "Delt ressurs",
-    "SMB / CIFS using OC login" : "SMB / CIFS med OC-pålogging",
-    "Username as share" : "Brukernavn som share",
-    "URL" : "URL",
-    "Secure https://" : "Sikker https://",
-    "SFTP with secret key login" : "SFTP med hemmelig nøkkel for pålogging",
-    "Public key" : "Offentlig nøkkel",
     "Storage with id \"%i\" not found" : "Lager med id \"%i\" ikke funnet",
+    "Invalid backend or authentication mechanism class" : "Ugyldig server eller type autentiseringsmekanisme",
     "Invalid mount point" : "Ugyldig oppkoblingspunkt",
+    "Objectstore forbidden" : "Objektlager forbudt",
     "Invalid storage backend \"%s\"" : "Ugyldig lagringsserver \"%s\"",
-    "Access granted" : "Tilgang innvilget",
-    "Error configuring Dropbox storage" : "Feil ved konfigurering av Dropbox-lagring",
-    "Grant access" : "Gi tilgang",
-    "Error configuring Google Drive storage" : "Feil med konfigurering av Google Drive",
+    "Unsatisfied backend parameters" : "Noen server-parameter mangler",
+    "Unsatisfied authentication mechanism parameters" : "Noen parametre for autentiseringsmekanisme mangler",
     "Personal" : "Personlig",
     "System" : "System",
+    "Grant access" : "Gi tilgang",
+    "Access granted" : "Tilgang innvilget",
+    "Error configuring OAuth1" : "Feil ved konfigurering av OAuth1",
+    "Error configuring OAuth2" : "Feil ved konfigurering av OAuth2",
+    "Generate keys" : "Generer nøkler",
+    "Error generating key pair" : "Feil ved nøkkelgenerering",
     "Enable encryption" : "Aktiver kryptering",
     "Enable previews" : "Tillat fohåndsvisning",
     "Check for changes" : "Se etter endringer",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.",
     "(group)" : "(gruppe)",
     "Saved" : "Lagret",
-    "Generate keys" : "Generer nøkler",
-    "Error generating key pair" : "Feil ved nøkkelgenerering",
+    "Access key" : "Tilgangsnøkkel",
+    "Secret key" : "Hemmelig nøkkel",
+    "Builtin" : "Innebygget",
+    "None" : "Ingen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Brukernavn",
+    "Password" : "Passord",
+    "API key" : "API-nøkkel",
+    "Username and password" : "Brukernavn og passord",
+    "Session credentials" : "Påloggingsdetaljer for økt",
+    "Public key" : "Offentlig nøkkel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Servernavn",
+    "Port" : "Port",
+    "Region" : "Området",
+    "Enable SSL" : "Aktiver SSL",
+    "Enable Path Style" : "Aktiver Path Style",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Ekstern undermappe",
+    "Secure https://" : "Sikker https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Tjener",
+    "Secure ftps://" : "Sikker ftps://",
+    "Google Drive" : "Google Disk",
+    "Local" : "Lokal",
+    "Location" : "Sted",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Rot",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Delt ressurs",
+    "Username as share" : "Brukernavn som share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Merk:</b> ",
-    "and" : "og",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å få dette installert.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.",
@@ -75,11 +81,12 @@
     "Scope" : "Omfang",
     "External Storage" : "Ekstern lagring",
     "Folder name" : "Mappenavn",
+    "Authentication" : "Autentisering",
     "Configuration" : "Konfigurasjon",
     "Available for" : "Tilgjengelig for",
-    "Add storage" : "Legg til lagringsplass",
     "Advanced settings" : "Avanserte innstillinger",
     "Delete" : "Slett",
+    "Add storage" : "Legg til lagringsplass",
     "Enable User External Storage" : "Aktiver ekstern lagring for bruker",
     "Allow users to mount the following external storage" : "Tillat brukere å koble opp følgende eksterne lagring"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
index dbfdb3bef6..1f0c219c51 100644
--- a/apps/files_external/l10n/nl.js
+++ b/apps/files_external/l10n/nl.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
-    "Please provide a valid Dropbox app key and secret." : "Geef een geldige Dropbox key en secret.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ophalen toegangstokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Please provide a valid app key and secret." : "Geef een geldige app sleutel en geheime sleutel op.",
     "Step 1 failed. Exception: %s" : "Stap 1 is mislukt. Uitzondering: %s",
     "Step 2 failed. Exception: %s" : "Stap 2 is mislukt. Uitzondering: %s",
     "External storage" : "Externe opslag",
-    "Local" : "Lokaal",
-    "Location" : "Locatie",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Sleutel",
-    "Secret" : "Geheim",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 en overeenkomstig",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Hostnaam",
-    "Port" : "Poort",
-    "Region" : "Regio",
-    "Enable SSL" : "Activeren SSL",
-    "Enable Path Style" : "Activeren pad stijl",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Host",
-    "Username" : "Gebruikersnaam",
-    "Password" : "Wachtwoord",
-    "Remote subfolder" : "Externe submap",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regio (optioneel voor OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (verplicht voor Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (Verplicht voor OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Wachtwoord (verplicht voor OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (verplicht voor OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL van identity endpoint (verplicht voor OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Time-out van HTTP-verzoeken in seconden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS via OC inlog",
-    "Username as share" : "Gebruikersnaam als share",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP met geheime sleutel inlog",
-    "Public key" : "Publieke sleutel",
     "Storage with id \"%i\" not found" : "Opslag met id \"%i\" niet gevonden",
+    "Invalid backend or authentication mechanism class" : "Ongeldige backend of authenticatie mechanisme klasse",
     "Invalid mount point" : "Ongeldig aankoppelpunt",
+    "Objectstore forbidden" : "Objectopslag verboden",
     "Invalid storage backend \"%s\"" : "Ongeldig opslagsysteem \"%s\"",
-    "Access granted" : "Toegang toegestaan",
-    "Error configuring Dropbox storage" : "Fout tijdens het configureren van Dropbox opslag",
-    "Grant access" : "Sta toegang toe",
-    "Error configuring Google Drive storage" : "Fout tijdens het configureren van Google Drive opslag",
+    "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
+    "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
     "Personal" : "Persoonlijk",
     "System" : "Systeem",
+    "Grant access" : "Sta toegang toe",
+    "Access granted" : "Toegang toegestaan",
+    "Error configuring OAuth1" : "Fout bij configureren OAuth1",
+    "Error configuring OAuth2" : "Fout bij configureren OAuth2",
+    "Generate keys" : "Genereer sleutels",
+    "Error generating key pair" : "Fout bij genereren sleutelpaar",
     "Enable encryption" : "Versleuteling inschakelen",
     "Enable previews" : "Activeren voorbeelden",
     "Check for changes" : "Controleren op wijzigingen",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.",
     "(group)" : "(groep)",
     "Saved" : "Bewaard",
-    "Generate keys" : "Genereer sleutels",
-    "Error generating key pair" : "Fout bij genereren sleutelpaar",
+    "Access key" : "Access Key",
+    "Secret key" : "Geheime sleutel",
+    "Builtin" : "Ingebouwd",
+    "None" : "Geen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Gebruikersnaam",
+    "Password" : "Wachtwoord",
+    "API key" : "API sleutel",
+    "Username and password" : "Gebruikersnaam en wachtwoord",
+    "Session credentials" : "Sessie inloggegevens",
+    "Public key" : "Publieke sleutel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostnaam",
+    "Port" : "Poort",
+    "Region" : "Regio",
+    "Enable SSL" : "Activeren SSL",
+    "Enable Path Style" : "Activeren pad stijl",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Externe submap",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Lokaal",
+    "Location" : "Locatie",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Share",
+    "Username as share" : "Gebruikersnaam als share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Let op:</b> ",
-    "and" : "en",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Scope",
     "External Storage" : "Externe opslag",
     "Folder name" : "Mapnaam",
+    "Authentication" : "Authenticatie",
     "Configuration" : "Configuratie",
     "Available for" : "Beschikbaar voor",
-    "Add storage" : "Toevoegen opslag",
     "Advanced settings" : "Geavanceerde instellingen",
     "Delete" : "Verwijder",
+    "Add storage" : "Toevoegen opslag",
     "Enable User External Storage" : "Externe opslag voor gebruikers activeren",
     "Allow users to mount the following external storage" : "Sta gebruikers toe de volgende externe opslag aan te koppelen"
 },
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
index b3912b38a1..948845cfa8 100644
--- a/apps/files_external/l10n/nl.json
+++ b/apps/files_external/l10n/nl.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
-    "Please provide a valid Dropbox app key and secret." : "Geef een geldige Dropbox key en secret.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Ophalen toegangstokens mislukt. Verifieer dat uw app sleutel en geheime sleutel juist zijn.",
+    "Please provide a valid app key and secret." : "Geef een geldige app sleutel en geheime sleutel op.",
     "Step 1 failed. Exception: %s" : "Stap 1 is mislukt. Uitzondering: %s",
     "Step 2 failed. Exception: %s" : "Stap 2 is mislukt. Uitzondering: %s",
     "External storage" : "Externe opslag",
-    "Local" : "Lokaal",
-    "Location" : "Locatie",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Sleutel",
-    "Secret" : "Geheim",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 en overeenkomstig",
-    "Access Key" : "Access Key",
-    "Secret Key" : "Secret Key",
-    "Hostname" : "Hostnaam",
-    "Port" : "Poort",
-    "Region" : "Regio",
-    "Enable SSL" : "Activeren SSL",
-    "Enable Path Style" : "Activeren pad stijl",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Host",
-    "Username" : "Gebruikersnaam",
-    "Password" : "Wachtwoord",
-    "Remote subfolder" : "Externe submap",
-    "Secure ftps://" : "Secure ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Regio (optioneel voor OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (verplicht voor Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (Verplicht voor OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Wachtwoord (verplicht voor OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Service Name (verplicht voor OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL van identity endpoint (verplicht voor OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Time-out van HTTP-verzoeken in seconden",
-    "Share" : "Share",
-    "SMB / CIFS using OC login" : "SMB / CIFS via OC inlog",
-    "Username as share" : "Gebruikersnaam als share",
-    "URL" : "URL",
-    "Secure https://" : "Secure https://",
-    "SFTP with secret key login" : "SFTP met geheime sleutel inlog",
-    "Public key" : "Publieke sleutel",
     "Storage with id \"%i\" not found" : "Opslag met id \"%i\" niet gevonden",
+    "Invalid backend or authentication mechanism class" : "Ongeldige backend of authenticatie mechanisme klasse",
     "Invalid mount point" : "Ongeldig aankoppelpunt",
+    "Objectstore forbidden" : "Objectopslag verboden",
     "Invalid storage backend \"%s\"" : "Ongeldig opslagsysteem \"%s\"",
-    "Access granted" : "Toegang toegestaan",
-    "Error configuring Dropbox storage" : "Fout tijdens het configureren van Dropbox opslag",
-    "Grant access" : "Sta toegang toe",
-    "Error configuring Google Drive storage" : "Fout tijdens het configureren van Google Drive opslag",
+    "Unsatisfied backend parameters" : "Onvoldoende backend parameters",
+    "Unsatisfied authentication mechanism parameters" : "Onvoldoende authenticatiemechanisme parameters",
     "Personal" : "Persoonlijk",
     "System" : "Systeem",
+    "Grant access" : "Sta toegang toe",
+    "Access granted" : "Toegang toegestaan",
+    "Error configuring OAuth1" : "Fout bij configureren OAuth1",
+    "Error configuring OAuth2" : "Fout bij configureren OAuth2",
+    "Generate keys" : "Genereer sleutels",
+    "Error generating key pair" : "Fout bij genereren sleutelpaar",
     "Enable encryption" : "Versleuteling inschakelen",
     "Enable previews" : "Activeren voorbeelden",
     "Check for changes" : "Controleren op wijzigingen",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.",
     "(group)" : "(groep)",
     "Saved" : "Bewaard",
-    "Generate keys" : "Genereer sleutels",
-    "Error generating key pair" : "Fout bij genereren sleutelpaar",
+    "Access key" : "Access Key",
+    "Secret key" : "Geheime sleutel",
+    "Builtin" : "Ingebouwd",
+    "None" : "Geen",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "Username" : "Gebruikersnaam",
+    "Password" : "Wachtwoord",
+    "API key" : "API sleutel",
+    "Username and password" : "Gebruikersnaam en wachtwoord",
+    "Session credentials" : "Sessie inloggegevens",
+    "Public key" : "Publieke sleutel",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Hostnaam",
+    "Port" : "Poort",
+    "Region" : "Regio",
+    "Enable SSL" : "Activeren SSL",
+    "Enable Path Style" : "Activeren pad stijl",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Externe submap",
+    "Secure https://" : "Secure https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Secure ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Lokaal",
+    "Location" : "Locatie",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Share",
+    "Username as share" : "Gebruikersnaam als share",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Let op:</b> ",
-    "and" : "en",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren.",
@@ -75,11 +81,12 @@
     "Scope" : "Scope",
     "External Storage" : "Externe opslag",
     "Folder name" : "Mapnaam",
+    "Authentication" : "Authenticatie",
     "Configuration" : "Configuratie",
     "Available for" : "Beschikbaar voor",
-    "Add storage" : "Toevoegen opslag",
     "Advanced settings" : "Geavanceerde instellingen",
     "Delete" : "Verwijder",
+    "Add storage" : "Toevoegen opslag",
     "Enable User External Storage" : "Externe opslag voor gebruikers activeren",
     "Allow users to mount the following external storage" : "Sta gebruikers toe de volgende externe opslag aan te koppelen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/nn_NO.js b/apps/files_external/l10n/nn_NO.js
index 080f510546..325a8a5752 100644
--- a/apps/files_external/l10n/nn_NO.js
+++ b/apps/files_external/l10n/nn_NO.js
@@ -1,14 +1,16 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Stad",
-    "Region" : "Region/fylke",
-    "Host" : "Tenar",
+    "Personal" : "Personleg",
     "Username" : "Brukarnamn",
     "Password" : "Passord",
-    "Share" : "Del",
+    "Region" : "Region/fylke",
+    "WebDAV" : "WebDAV",
     "URL" : "Nettstad",
-    "Personal" : "Personleg",
+    "Host" : "Tenar",
+    "Location" : "Stad",
+    "ownCloud" : "ownCloud",
+    "Share" : "Del",
     "Name" : "Namn",
     "Folder name" : "Mappenamn",
     "Configuration" : "Innstillingar",
diff --git a/apps/files_external/l10n/nn_NO.json b/apps/files_external/l10n/nn_NO.json
index 1451532c22..26e6c02d80 100644
--- a/apps/files_external/l10n/nn_NO.json
+++ b/apps/files_external/l10n/nn_NO.json
@@ -1,12 +1,14 @@
 { "translations": {
-    "Location" : "Stad",
-    "Region" : "Region/fylke",
-    "Host" : "Tenar",
+    "Personal" : "Personleg",
     "Username" : "Brukarnamn",
     "Password" : "Passord",
-    "Share" : "Del",
+    "Region" : "Region/fylke",
+    "WebDAV" : "WebDAV",
     "URL" : "Nettstad",
-    "Personal" : "Personleg",
+    "Host" : "Tenar",
+    "Location" : "Stad",
+    "ownCloud" : "ownCloud",
+    "Share" : "Del",
     "Name" : "Namn",
     "Folder name" : "Mappenamn",
     "Configuration" : "Innstillingar",
diff --git a/apps/files_external/l10n/oc.js b/apps/files_external/l10n/oc.js
index 590e6185bd..d234d0c62c 100644
--- a/apps/files_external/l10n/oc.js
+++ b/apps/files_external/l10n/oc.js
@@ -1,66 +1,49 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La recuperacion dels getons d’autentificacion a fracassat. Verificatz vòstra clau d'aplicacion Dropbox amai lo senhal.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requèsta d’accès als getons d’autentificacion a fracassat. Verificatz vòstra App-Key Dropbox amai lo senhal.",
-    "Please provide a valid Dropbox app key and secret." : "Provesissètz una clau d'aplicacion (app key) amai un senhal valids.",
     "Step 1 failed. Exception: %s" : "L’etapa 1 a fracassat. Error : %s",
     "Step 2 failed. Exception: %s" : "L’etapa 2 a fracassat. Error : %s",
     "External storage" : "Emmagazinatge extèrne",
-    "Local" : "Local",
-    "Location" : "Emplaçament",
+    "Storage with id \"%i\" not found" : "Emmagazinatge amb l'id \"%i\" pas trobat",
+    "Invalid mount point" : "Punt de montatge invalid",
+    "Invalid storage backend \"%s\"" : "Servici d'emmagazinatge invalid : \"%s\"",
+    "Personal" : "Personal",
+    "System" : "Sistèma",
+    "Grant access" : "Autorizar l'accès",
+    "Access granted" : "Accès autorizat",
+    "Generate keys" : "Generar de claus",
+    "Error generating key pair" : "Error al moment de la generacion de las claus",
+    "Enable encryption" : "Activar lo chiframent",
+    "(group)" : "(grop)",
+    "Saved" : "Salvat",
+    "None" : "Pas cap",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "ID Client",
+    "Client secret" : "Secret client",
+    "Username" : "Nom d'utilizaire",
+    "Password" : "Senhal",
+    "Public key" : "Clau publica",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Clau",
-    "Secret" : "Secret",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatibles",
-    "Access Key" : "Clau d'accès",
-    "Secret Key" : "Clau secreta",
     "Hostname" : "Nom de l'òste",
     "Port" : "Pòrt",
     "Region" : "Region",
     "Enable SSL" : "Activar SSL",
     "Enable Path Style" : "Accès per path",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Òste",
-    "Username" : "Nom d'utilizaire",
-    "Password" : "Senhal",
-    "Remote subfolder" : "Sosdorsièr distant",
-    "Secure ftps://" : "Securizacion ftps://",
-    "Client ID" : "ID Client",
-    "Client secret" : "Secret client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requesit per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nom del locatari (requesit per l'emmagazinatge OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senhal (requesit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servici (requesit per l'emmagazinatge OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt d'accès d'identitat (requesit per l'emmagazinatge OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Relmabi d'espèra maximal de las requèstas HTTP en segondas",
-    "Share" : "Partejar",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC",
-    "Username as share" : "Nom d'utilizaire coma nom de partiment",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Sosdorsièr distant",
     "Secure https://" : "Securizacion https://",
-    "SFTP with secret key login" : "SFTP amb un identificant secret",
-    "Public key" : "Clau publica",
-    "Storage with id \"%i\" not found" : "Emmagazinatge amb l'id \"%i\" pas trobat",
-    "Invalid mount point" : "Punt de montatge invalid",
-    "Invalid storage backend \"%s\"" : "Servici d'emmagazinatge invalid : \"%s\"",
-    "Access granted" : "Accès autorizat",
-    "Error configuring Dropbox storage" : "Error al moment de la configuracion de l'emmagazinatge Dropbox",
-    "Grant access" : "Autorizar l'accès",
-    "Error configuring Google Drive storage" : "Error al moment de la configuracion de l'emmagazinatge Google Drive",
-    "Personal" : "Personal",
-    "System" : "Sistèma",
-    "Enable encryption" : "Activar lo chiframent",
-    "(group)" : "(grop)",
-    "Saved" : "Salvat",
-    "Generate keys" : "Generar de claus",
-    "Error generating key pair" : "Error al moment de la generacion de las claus",
+    "Host" : "Òste",
+    "Secure ftps://" : "Securizacion ftps://",
+    "Local" : "Local",
+    "Location" : "Emplaçament",
+    "ownCloud" : "ownCloud",
+    "Share" : "Partejar",
+    "Username as share" : "Nom d'utilizaire coma nom de partiment",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Atencion :</b>",
-    "and" : " e ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion :</b> La presa en carga de cURL per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> La presa en carga del FTP per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> \"%s\" es pas installat. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
@@ -73,9 +56,9 @@ OC.L10N.register(
     "Folder name" : "Nom del dorsièr",
     "Configuration" : "Configuracion",
     "Available for" : "Disponible per",
-    "Add storage" : "Apondre un supòrt d'emmagazinatge",
     "Advanced settings" : "Paramètres avançats",
     "Delete" : "Suprimir",
+    "Add storage" : "Apondre un supòrt d'emmagazinatge",
     "Enable User External Storage" : "Autorizar los utilizaires a apondre d'emmagazinatges extèrnes",
     "Allow users to mount the following external storage" : "Autorizar los utilizaires a montar los emmagazinatges extèrnes seguents"
 },
diff --git a/apps/files_external/l10n/oc.json b/apps/files_external/l10n/oc.json
index 1696dfa56a..0dfa95426c 100644
--- a/apps/files_external/l10n/oc.json
+++ b/apps/files_external/l10n/oc.json
@@ -1,64 +1,47 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La recuperacion dels getons d’autentificacion a fracassat. Verificatz vòstra clau d'aplicacion Dropbox amai lo senhal.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requèsta d’accès als getons d’autentificacion a fracassat. Verificatz vòstra App-Key Dropbox amai lo senhal.",
-    "Please provide a valid Dropbox app key and secret." : "Provesissètz una clau d'aplicacion (app key) amai un senhal valids.",
     "Step 1 failed. Exception: %s" : "L’etapa 1 a fracassat. Error : %s",
     "Step 2 failed. Exception: %s" : "L’etapa 2 a fracassat. Error : %s",
     "External storage" : "Emmagazinatge extèrne",
-    "Local" : "Local",
-    "Location" : "Emplaçament",
+    "Storage with id \"%i\" not found" : "Emmagazinatge amb l'id \"%i\" pas trobat",
+    "Invalid mount point" : "Punt de montatge invalid",
+    "Invalid storage backend \"%s\"" : "Servici d'emmagazinatge invalid : \"%s\"",
+    "Personal" : "Personal",
+    "System" : "Sistèma",
+    "Grant access" : "Autorizar l'accès",
+    "Access granted" : "Accès autorizat",
+    "Generate keys" : "Generar de claus",
+    "Error generating key pair" : "Error al moment de la generacion de las claus",
+    "Enable encryption" : "Activar lo chiframent",
+    "(group)" : "(grop)",
+    "Saved" : "Salvat",
+    "None" : "Pas cap",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Client ID" : "ID Client",
+    "Client secret" : "Secret client",
+    "Username" : "Nom d'utilizaire",
+    "Password" : "Senhal",
+    "Public key" : "Clau publica",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Clau",
-    "Secret" : "Secret",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatibles",
-    "Access Key" : "Clau d'accès",
-    "Secret Key" : "Clau secreta",
     "Hostname" : "Nom de l'òste",
     "Port" : "Pòrt",
     "Region" : "Region",
     "Enable SSL" : "Activar SSL",
     "Enable Path Style" : "Accès per path",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "Òste",
-    "Username" : "Nom d'utilizaire",
-    "Password" : "Senhal",
-    "Remote subfolder" : "Sosdorsièr distant",
-    "Secure ftps://" : "Securizacion ftps://",
-    "Client ID" : "ID Client",
-    "Client secret" : "Secret client",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcional per OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Clau API (requesit per Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nom del locatari (requesit per l'emmagazinatge OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senhal (requesit per OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nom del servici (requesit per l'emmagazinatge OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt d'accès d'identitat (requesit per l'emmagazinatge OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Relmabi d'espèra maximal de las requèstas HTTP en segondas",
-    "Share" : "Partejar",
-    "SMB / CIFS using OC login" : "SMB / CIFS en utilizant los identificants OC",
-    "Username as share" : "Nom d'utilizaire coma nom de partiment",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Sosdorsièr distant",
     "Secure https://" : "Securizacion https://",
-    "SFTP with secret key login" : "SFTP amb un identificant secret",
-    "Public key" : "Clau publica",
-    "Storage with id \"%i\" not found" : "Emmagazinatge amb l'id \"%i\" pas trobat",
-    "Invalid mount point" : "Punt de montatge invalid",
-    "Invalid storage backend \"%s\"" : "Servici d'emmagazinatge invalid : \"%s\"",
-    "Access granted" : "Accès autorizat",
-    "Error configuring Dropbox storage" : "Error al moment de la configuracion de l'emmagazinatge Dropbox",
-    "Grant access" : "Autorizar l'accès",
-    "Error configuring Google Drive storage" : "Error al moment de la configuracion de l'emmagazinatge Google Drive",
-    "Personal" : "Personal",
-    "System" : "Sistèma",
-    "Enable encryption" : "Activar lo chiframent",
-    "(group)" : "(grop)",
-    "Saved" : "Salvat",
-    "Generate keys" : "Generar de claus",
-    "Error generating key pair" : "Error al moment de la generacion de las claus",
+    "Host" : "Òste",
+    "Secure ftps://" : "Securizacion ftps://",
+    "Local" : "Local",
+    "Location" : "Emplaçament",
+    "ownCloud" : "ownCloud",
+    "Share" : "Partejar",
+    "Username as share" : "Nom d'utilizaire coma nom de partiment",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Atencion :</b>",
-    "and" : " e ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion :</b> La presa en carga de cURL per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> La presa en carga del FTP per PHP es pas activada o installada. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Atencion : </b> \"%s\" es pas installat. Lo montatge de %s es pas possible. Contactatz vòstre administrator sistèma per l'installar.",
@@ -71,9 +54,9 @@
     "Folder name" : "Nom del dorsièr",
     "Configuration" : "Configuracion",
     "Available for" : "Disponible per",
-    "Add storage" : "Apondre un supòrt d'emmagazinatge",
     "Advanced settings" : "Paramètres avançats",
     "Delete" : "Suprimir",
+    "Add storage" : "Apondre un supòrt d'emmagazinatge",
     "Enable User External Storage" : "Autorizar los utilizaires a apondre d'emmagazinatges extèrnes",
     "Allow users to mount the following external storage" : "Autorizar los utilizaires a montar los emmagazinatges extèrnes seguents"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_external/l10n/pa.js b/apps/files_external/l10n/pa.js
index 47acbde23d..ff376198ae 100644
--- a/apps/files_external/l10n/pa.js
+++ b/apps/files_external/l10n/pa.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Password" : "ਪਾਸਵਰ",
+    "ownCloud" : "ਓਵਨਕਲਾਉਡ",
     "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Delete" : "ਹਟਾਓ"
 },
diff --git a/apps/files_external/l10n/pa.json b/apps/files_external/l10n/pa.json
index 2bdafd7a25..a2ba80af13 100644
--- a/apps/files_external/l10n/pa.json
+++ b/apps/files_external/l10n/pa.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Password" : "ਪਾਸਵਰ",
+    "ownCloud" : "ਓਵਨਕਲਾਉਡ",
     "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Delete" : "ਹਟਾਓ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js
index 1c580075d6..9fb70e7177 100644
--- a/apps/files_external/l10n/pl.js
+++ b/apps/files_external/l10n/pl.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
-    "Please provide a valid Dropbox app key and secret." : "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny.",
     "Step 1 failed. Exception: %s" : "Krok 1 błędny. Błąd: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 błędny. Błąd: %s",
     "External storage" : "Zewnętrzne zasoby dyskowe",
-    "Local" : "Lokalny",
-    "Location" : "Lokalizacja",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Klucz",
-    "Secret" : "Hasło",
-    "Bucket" : "Kosz",
-    "Amazon S3 and compliant" : "Amazon S3 i zgodne",
-    "Access Key" : "Klucz dostępu",
-    "Secret Key" : "Klucz hasła",
-    "Hostname" : "Nazwa serwera",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Włącz SSL",
-    "Enable Path Style" : "Włącz styl ścieżki",
-    "App key" : "Klucz aplikacji",
-    "App secret" : "Hasło aplikacji",
-    "Host" : "Host",
-    "Username" : "Nazwa użytkownika",
-    "Password" : "Hasło",
-    "Remote subfolder" : "Zdalny podfolder",
-    "Secure ftps://" : "Bezpieczny ftps://",
-    "Client ID" : "ID klienta",
-    "Client secret" : "Hasło klienta",
-    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcjonalny dla magazynu obiektów OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Klucz API (wymagany dla plików Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nazwa najemcy (wymagana dla magazynu obiektów OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Hasło (wymagane dla magazynu obiektów OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nazwa usługi (wymagana dla magazynu obiektów OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL lub zakończenie jednostki (wymagane dla magazynu obiektów OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Czas nieaktywności żądania HTTP w sekundach",
-    "Share" : "Udostępnij",
-    "SMB / CIFS using OC login" : "SMB / CIFS przy użyciu loginu OC",
-    "Username as share" : "Użytkownik jako zasób",
-    "URL" : "URL",
-    "Secure https://" : "Bezpieczny https://",
-    "SFTP with secret key login" : "Logowanie tajnym kluczem do SFTP",
-    "Public key" : "Klucz publiczny",
     "Storage with id \"%i\" not found" : "Id magazynu nie został znaleziony",
     "Invalid mount point" : "Nieprawidłowy punkt montowania",
     "Invalid storage backend \"%s\"" : "Nieprawidłowy magazyn zaplecza \"%s\"",
-    "Access granted" : "Dostęp do",
-    "Error configuring Dropbox storage" : "Wystąpił błąd podczas konfigurowania zasobu Dropbox",
-    "Grant access" : "Udziel dostępu",
-    "Error configuring Google Drive storage" : "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
     "Personal" : "Osobiste",
     "System" : "System",
+    "Grant access" : "Udziel dostępu",
+    "Access granted" : "Dostęp do",
+    "Generate keys" : "Wygeneruj klucze",
+    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
     "Enable encryption" : "Włącz szyfrowanie",
     "Enable previews" : "Włącz podgląd",
     "Check for changes" : "Sprawdź zmiany",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.",
     "(group)" : "(grupa)",
     "Saved" : "Zapisano",
-    "Generate keys" : "Wygeneruj klucze",
-    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
+    "None" : "Nic",
+    "App key" : "Klucz aplikacji",
+    "App secret" : "Hasło aplikacji",
+    "Client ID" : "ID klienta",
+    "Client secret" : "Hasło klienta",
+    "Username" : "Nazwa użytkownika",
+    "Password" : "Hasło",
+    "API key" : "Klucz API",
+    "Public key" : "Klucz publiczny",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Kosz",
+    "Hostname" : "Nazwa serwera",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Włącz SSL",
+    "Enable Path Style" : "Włącz styl ścieżki",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Zdalny podfolder",
+    "Secure https://" : "Bezpieczny https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Bezpieczny ftps://",
+    "Local" : "Lokalny",
+    "Location" : "Lokalizacja",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Udostępnij",
+    "Username as share" : "Użytkownik jako zasób",
+    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
     "<b>Note:</b> " : "<b>Uwaga:</b> ",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Nazwa folderu",
     "Configuration" : "Konfiguracja",
     "Available for" : "Dostępne przez",
-    "Add storage" : "Dodaj zasoby dyskowe",
     "Advanced settings" : "Ustawienia zaawansowane",
     "Delete" : "Usuń",
+    "Add storage" : "Dodaj zasoby dyskowe",
     "Enable User External Storage" : "Włącz zewnętrzne zasoby dyskowe użytkownika",
     "Allow users to mount the following external storage" : "Pozwól użytkownikom montować następujące zewnętrzne zasoby dyskowe"
 },
diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json
index dee33026ca..d7cd70b8c3 100644
--- a/apps/files_external/l10n/pl.json
+++ b/apps/files_external/l10n/pl.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
-    "Please provide a valid Dropbox app key and secret." : "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny.",
     "Step 1 failed. Exception: %s" : "Krok 1 błędny. Błąd: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 błędny. Błąd: %s",
     "External storage" : "Zewnętrzne zasoby dyskowe",
-    "Local" : "Lokalny",
-    "Location" : "Lokalizacja",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Klucz",
-    "Secret" : "Hasło",
-    "Bucket" : "Kosz",
-    "Amazon S3 and compliant" : "Amazon S3 i zgodne",
-    "Access Key" : "Klucz dostępu",
-    "Secret Key" : "Klucz hasła",
-    "Hostname" : "Nazwa serwera",
-    "Port" : "Port",
-    "Region" : "Region",
-    "Enable SSL" : "Włącz SSL",
-    "Enable Path Style" : "Włącz styl ścieżki",
-    "App key" : "Klucz aplikacji",
-    "App secret" : "Hasło aplikacji",
-    "Host" : "Host",
-    "Username" : "Nazwa użytkownika",
-    "Password" : "Hasło",
-    "Remote subfolder" : "Zdalny podfolder",
-    "Secure ftps://" : "Bezpieczny ftps://",
-    "Client ID" : "ID klienta",
-    "Client secret" : "Hasło klienta",
-    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Region (opcjonalny dla magazynu obiektów OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Klucz API (wymagany dla plików Rackspace Cloud)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nazwa najemcy (wymagana dla magazynu obiektów OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Hasło (wymagane dla magazynu obiektów OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nazwa usługi (wymagana dla magazynu obiektów OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL lub zakończenie jednostki (wymagane dla magazynu obiektów OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Czas nieaktywności żądania HTTP w sekundach",
-    "Share" : "Udostępnij",
-    "SMB / CIFS using OC login" : "SMB / CIFS przy użyciu loginu OC",
-    "Username as share" : "Użytkownik jako zasób",
-    "URL" : "URL",
-    "Secure https://" : "Bezpieczny https://",
-    "SFTP with secret key login" : "Logowanie tajnym kluczem do SFTP",
-    "Public key" : "Klucz publiczny",
     "Storage with id \"%i\" not found" : "Id magazynu nie został znaleziony",
     "Invalid mount point" : "Nieprawidłowy punkt montowania",
     "Invalid storage backend \"%s\"" : "Nieprawidłowy magazyn zaplecza \"%s\"",
-    "Access granted" : "Dostęp do",
-    "Error configuring Dropbox storage" : "Wystąpił błąd podczas konfigurowania zasobu Dropbox",
-    "Grant access" : "Udziel dostępu",
-    "Error configuring Google Drive storage" : "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
     "Personal" : "Osobiste",
     "System" : "System",
+    "Grant access" : "Udziel dostępu",
+    "Access granted" : "Dostęp do",
+    "Generate keys" : "Wygeneruj klucze",
+    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
     "Enable encryption" : "Włącz szyfrowanie",
     "Enable previews" : "Włącz podgląd",
     "Check for changes" : "Sprawdź zmiany",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.",
     "(group)" : "(grupa)",
     "Saved" : "Zapisano",
-    "Generate keys" : "Wygeneruj klucze",
-    "Error generating key pair" : "Błąd podczas generowania pary kluczy",
+    "None" : "Nic",
+    "App key" : "Klucz aplikacji",
+    "App secret" : "Hasło aplikacji",
+    "Client ID" : "ID klienta",
+    "Client secret" : "Hasło klienta",
+    "Username" : "Nazwa użytkownika",
+    "Password" : "Hasło",
+    "API key" : "Klucz API",
+    "Public key" : "Klucz publiczny",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Kosz",
+    "Hostname" : "Nazwa serwera",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Włącz SSL",
+    "Enable Path Style" : "Włącz styl ścieżki",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Zdalny podfolder",
+    "Secure https://" : "Bezpieczny https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Host",
+    "Secure ftps://" : "Bezpieczny ftps://",
+    "Local" : "Lokalny",
+    "Location" : "Lokalizacja",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Udostępnij",
+    "Username as share" : "Użytkownik jako zasób",
+    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
     "<b>Note:</b> " : "<b>Uwaga:</b> ",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
@@ -77,9 +63,9 @@
     "Folder name" : "Nazwa folderu",
     "Configuration" : "Konfiguracja",
     "Available for" : "Dostępne przez",
-    "Add storage" : "Dodaj zasoby dyskowe",
     "Advanced settings" : "Ustawienia zaawansowane",
     "Delete" : "Usuń",
+    "Add storage" : "Dodaj zasoby dyskowe",
     "Enable User External Storage" : "Włącz zewnętrzne zasoby dyskowe użytkownika",
     "Allow users to mount the following external storage" : "Pozwól użytkownikom montować następujące zewnętrzne zasoby dyskowe"
 },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
index c05f208953..fefe1e899f 100644
--- a/apps/files_external/l10n/pt_BR.js
+++ b/apps/files_external/l10n/pt_BR.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de fichas de solicitação falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de tokens de acesso falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor forneça uma chave de aplicativo e segurança válidos para o Dropbox",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de requesição falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de acesso falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
+    "Please provide a valid app key and secret." : "Por favor forneça uma chave e segurança válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "Local" : "Local",
-    "Location" : "Localização",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Chave",
-    "Secret" : "Segredo",
-    "Bucket" : "Cesta",
-    "Amazon S3 and compliant" : "Amazon S3 e compatível",
-    "Access Key" : "Chave de Acesso",
-    "Secret Key" : "Chave Secreta",
-    "Hostname" : "Nome do Host",
-    "Port" : "Porta",
-    "Region" : "Região",
-    "Enable SSL" : "Habilitar SSL",
-    "Enable Path Style" : "Habilitar Estilo do Caminho",
-    "App key" : "Chave do Aplicativo",
-    "App secret" : "Segredo da Aplicação",
-    "Host" : "Host",
-    "Username" : "Nome de Usuário",
-    "Password" : "Senha",
-    "Remote subfolder" : "Subpasta remota",
-    "Secure ftps://" : "Seguro ftps://",
-    "Client ID" : "ID do Cliente",
-    "Client secret" : "Segredo do cliente",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para armazenamento de objetos OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome Tenant (necessário para armazenamento de objetos OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessário para armazenamento de objetos OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para armazenamento de objetos OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Ponto final de identidade da URL (obrigatório para armazenamento de objetos OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Tempo de vencimento do pedido HTTP em segundos",
-    "Share" : "Compartilhar",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
-    "Username as share" : "Nome de usuário como compartilhado",
-    "URL" : "URL",
-    "Secure https://" : "https:// segura",
-    "SFTP with secret key login" : "SFTP com chave secreta de login",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Armazenamento com id \"%i\" não encontrado",
+    "Invalid backend or authentication mechanism class" : "Backend inválido ou classe de mecanismo de autenticação",
     "Invalid mount point" : "Ponto de montagem inválido",
+    "Objectstore forbidden" : "Proibido armazenamento de objetos",
     "Invalid storage backend \"%s\"" : "Armazenamento backend inválido \"%s\"",
-    "Access granted" : "Acesso concedido",
-    "Error configuring Dropbox storage" : "Erro ao configurar armazenamento do Dropbox",
-    "Grant access" : "Permitir acesso",
-    "Error configuring Google Drive storage" : "Erro ao configurar armazenamento do Google Drive",
+    "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
     "Personal" : "Pessoal",
     "System" : "Sistema",
+    "Grant access" : "Permitir acesso",
+    "Access granted" : "Acesso concedido",
+    "Error configuring OAuth1" : "Erro configurando OAuth1",
+    "Error configuring OAuth2" : "Erro configurando OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar um par de chaves",
     "Enable encryption" : "Ativar criptografia",
     "Enable previews" : "Habilitar visualizações prévias",
     "Check for changes" : "Verifique se há alterações",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Salvo",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar um par de chaves",
+    "Access key" : "Chave da acesso",
+    "Secret key" : "Chave secreta",
+    "Builtin" : "Construídas em",
+    "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chave do Aplicativo",
+    "App secret" : "Segredo da Aplicação",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID do Cliente",
+    "Client secret" : "Segredo do cliente",
+    "Username" : "Nome de Usuário",
+    "Password" : "Senha",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de Usuário e senha",
+    "Session credentials" : "Credenciais de Sessão",
+    "Public key" : "Chave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cesta",
+    "Hostname" : "Nome do Host",
+    "Port" : "Porta",
+    "Region" : "Região",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo do Caminho",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subpasta remota",
+    "Secure https://" : "https:// segura",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Seguro ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Localização",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Raiz",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartilhar",
+    "Username as share" : "Nome de usuário como compartilhado",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b>",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" não está instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Escopo",
     "External Storage" : "Armazenamento Externo",
     "Folder name" : "Nome da pasta",
+    "Authentication" : "Autenticação",
     "Configuration" : "Configuração",
     "Available for" : "Disponível para",
-    "Add storage" : "Adicionar Armazenamento",
     "Advanced settings" : "Configurações avançadas",
     "Delete" : "Excluir",
+    "Add storage" : "Adicionar Armazenamento",
     "Enable User External Storage" : "Habilitar Armazenamento Externo do Usuário",
     "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo"
 },
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
index 92423280fc..f133b469f7 100644
--- a/apps/files_external/l10n/pt_BR.json
+++ b/apps/files_external/l10n/pt_BR.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de fichas de solicitação falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de tokens de acesso falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor forneça uma chave de aplicativo e segurança válidos para o Dropbox",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de requesição falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "A solicitação dos tokens de acesso falhou. Verifique se a sua chave de aplicativo e segurança estão corretos.",
+    "Please provide a valid app key and secret." : "Por favor forneça uma chave e segurança válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "Local" : "Local",
-    "Location" : "Localização",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Chave",
-    "Secret" : "Segredo",
-    "Bucket" : "Cesta",
-    "Amazon S3 and compliant" : "Amazon S3 e compatível",
-    "Access Key" : "Chave de Acesso",
-    "Secret Key" : "Chave Secreta",
-    "Hostname" : "Nome do Host",
-    "Port" : "Porta",
-    "Region" : "Região",
-    "Enable SSL" : "Habilitar SSL",
-    "Enable Path Style" : "Habilitar Estilo do Caminho",
-    "App key" : "Chave do Aplicativo",
-    "App secret" : "Segredo da Aplicação",
-    "Host" : "Host",
-    "Username" : "Nome de Usuário",
-    "Password" : "Senha",
-    "Remote subfolder" : "Subpasta remota",
-    "Secure ftps://" : "Seguro ftps://",
-    "Client ID" : "ID do Cliente",
-    "Client secret" : "Segredo do cliente",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para armazenamento de objetos OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome Tenant (necessário para armazenamento de objetos OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessário para armazenamento de objetos OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para armazenamento de objetos OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Ponto final de identidade da URL (obrigatório para armazenamento de objetos OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Tempo de vencimento do pedido HTTP em segundos",
-    "Share" : "Compartilhar",
-    "SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
-    "Username as share" : "Nome de usuário como compartilhado",
-    "URL" : "URL",
-    "Secure https://" : "https:// segura",
-    "SFTP with secret key login" : "SFTP com chave secreta de login",
-    "Public key" : "Chave pública",
     "Storage with id \"%i\" not found" : "Armazenamento com id \"%i\" não encontrado",
+    "Invalid backend or authentication mechanism class" : "Backend inválido ou classe de mecanismo de autenticação",
     "Invalid mount point" : "Ponto de montagem inválido",
+    "Objectstore forbidden" : "Proibido armazenamento de objetos",
     "Invalid storage backend \"%s\"" : "Armazenamento backend inválido \"%s\"",
-    "Access granted" : "Acesso concedido",
-    "Error configuring Dropbox storage" : "Erro ao configurar armazenamento do Dropbox",
-    "Grant access" : "Permitir acesso",
-    "Error configuring Google Drive storage" : "Erro ao configurar armazenamento do Google Drive",
+    "Unsatisfied backend parameters" : "Parâmetros de back-end não-atendidos",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros de mecanismos de autenticação não satisfeitos",
     "Personal" : "Pessoal",
     "System" : "Sistema",
+    "Grant access" : "Permitir acesso",
+    "Access granted" : "Acesso concedido",
+    "Error configuring OAuth1" : "Erro configurando OAuth1",
+    "Error configuring OAuth2" : "Erro configurando OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar um par de chaves",
     "Enable encryption" : "Ativar criptografia",
     "Enable previews" : "Habilitar visualizações prévias",
     "Check for changes" : "Verifique se há alterações",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.",
     "(group)" : "(grupo)",
     "Saved" : "Salvo",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar um par de chaves",
+    "Access key" : "Chave da acesso",
+    "Secret key" : "Chave secreta",
+    "Builtin" : "Construídas em",
+    "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chave do Aplicativo",
+    "App secret" : "Segredo da Aplicação",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "ID do Cliente",
+    "Client secret" : "Segredo do cliente",
+    "Username" : "Nome de Usuário",
+    "Password" : "Senha",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de Usuário e senha",
+    "Session credentials" : "Credenciais de Sessão",
+    "Public key" : "Chave pública",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Cesta",
+    "Hostname" : "Nome do Host",
+    "Port" : "Porta",
+    "Region" : "Região",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo do Caminho",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Subpasta remota",
+    "Secure https://" : "https:// segura",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Host",
+    "Secure ftps://" : "Seguro ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Localização",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Raiz",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartilhar",
+    "Username as share" : "Nome de usuário como compartilhado",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b>",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" não está instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
@@ -75,11 +81,12 @@
     "Scope" : "Escopo",
     "External Storage" : "Armazenamento Externo",
     "Folder name" : "Nome da pasta",
+    "Authentication" : "Autenticação",
     "Configuration" : "Configuração",
     "Available for" : "Disponível para",
-    "Add storage" : "Adicionar Armazenamento",
     "Advanced settings" : "Configurações avançadas",
     "Delete" : "Excluir",
+    "Add storage" : "Adicionar Armazenamento",
     "Enable User External Storage" : "Habilitar Armazenamento Externo do Usuário",
     "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js
index 7e41105bfe..ba1d86a40d 100644
--- a/apps/files_external/l10n/pt_PT.js
+++ b/apps/files_external/l10n/pt_PT.js
@@ -1,65 +1,75 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de obtenção falhou. Verifique se a sua chave da app Dropbox e o segredo estão corretos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de obtenção falhou. Verifique se a sua chave da app Dropbox e o segredo estão corretos.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, forneça uma chave da app e o segredo da Dropbox válidos.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas solicitadas. Verifique se o código e o segredo da sua app estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas de acesso. Verifique se o código e o segredo da sua app estão corretos.",
+    "Please provide a valid app key and secret." : "Por favor, indique um código e segredo de app válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "Local" : "Local",
-    "Location" : "Localização:",
+    "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
+    "Invalid mount point" : "Ponto de montagem inválido",
+    "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos",
+    "Personal" : "Pessoal",
+    "System" : "Sistema",
+    "Grant access" : "Conceder acesso",
+    "Access granted" : "Acesso autorizado",
+    "Error configuring OAuth1" : "Erro de configuração OAuth1",
+    "Error configuring OAuth2" : "Erro de configuração OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar chave par",
+    "Enable encryption" : "Ative a encriptação",
+    "Enable previews" : "Ative as pré-visualizações",
+    "Check for changes" : "Verifique as suas alterações",
+    "Never" : "Nunca",
+    "Once every direct access" : "Uma vez em cada acesso direto",
+    "Every time the filesystem is used" : "De todas as vezes que o sistema de ficheiros é usado",
+    "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
+    "(group)" : "(grupo)",
+    "Saved" : "Guardado",
+    "Access key" : "Código de acesso",
+    "Secret key" : "Código secreto",
+    "Builtin" : "Integrado",
+    "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chave da App",
+    "App secret" : "Segredo da app",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Id. do Cliente",
+    "Client secret" : "Segredo do cliente\\\\",
+    "Username" : "Nome de utilizador",
+    "Password" : "Palavra-passe",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de utilizador e palavra-passe",
+    "Session credentials" : "Credenciais da sessão",
+    "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Chave",
-    "Secret" : "Secreto",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatível",
-    "Access Key" : "Chave de Acesso",
-    "Secret Key" : "Chave Secreta",
     "Hostname" : "Nome do Anfitrião",
     "Port" : "Porta",
     "Region" : "Região",
     "Enable SSL" : "Ativar SSL",
     "Enable Path Style" : "Ativar Estilo do Caminho",
-    "App key" : "Chave da App",
-    "App secret" : "Chave secreta da aplicação",
-    "Host" : "Anfitrião",
-    "Username" : "Nome de utilizador",
-    "Password" : "Palavra-passe",
-    "Remote subfolder" : "Subpasta remota ",
-    "Secure ftps://" : "ftps:// Seguro",
-    "Client ID" : "Id. do Cliente",
-    "Client secret" : "Segredo do cliente",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessária para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout de pedidos HTTP em segundos",
-    "Share" : "Compartilhar",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
-    "Username as share" : "Utilizar nome de utilizador como partilha",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subpasta remota ",
     "Secure https://" : "https:// Seguro",
-    "Public key" : "Chave pública",
-    "Storage with id \"%i\" not found" : "Armazenamento com ID \"%i\" não encontrado",
-    "Invalid mount point" : "Ponto de montagem inválido",
-    "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
-    "Access granted" : "Acesso autorizado",
-    "Error configuring Dropbox storage" : "Erro ao configurar o armazenamento do Dropbox",
-    "Grant access" : "Conceder acesso",
-    "Error configuring Google Drive storage" : "Erro ao configurar o armazenamento do Google Drive",
-    "Personal" : "Pessoal",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
-    "(group)" : "(grupo)",
-    "Saved" : "Guardado",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar chave par",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Anfitrião",
+    "Secure ftps://" : "ftps:// Seguro",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Localização:",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartilhar",
+    "Username as share" : "Nome de utilizador como partilha",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O cliente\"%s\" não está instalado. Não é possível montar \"%s\" . Peça ao seu administrador para instalar.",
@@ -70,11 +80,12 @@ OC.L10N.register(
     "Scope" : "Âmbito",
     "External Storage" : "Armazenamento Externo",
     "Folder name" : "Nome da pasta",
+    "Authentication" : "Autenticação",
     "Configuration" : "Configuração",
     "Available for" : "Disponível para ",
-    "Add storage" : "Adicionar armazenamento",
     "Advanced settings" : "Definições avançadas",
     "Delete" : "Apagar",
+    "Add storage" : "Adicionar armazenamento",
     "Enable User External Storage" : "Ativar Armazenamento Externo para o Utilizador",
     "Allow users to mount the following external storage" : "Permitir que os utilizadores montem o seguinte armazenamento externo"
 },
diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json
index 72fe8a6ee3..24955db65f 100644
--- a/apps/files_external/l10n/pt_PT.json
+++ b/apps/files_external/l10n/pt_PT.json
@@ -1,63 +1,73 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de obtenção falhou. Verifique se a sua chave da app Dropbox e o segredo estão corretos.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de obtenção falhou. Verifique se a sua chave da app Dropbox e o segredo estão corretos.",
-    "Please provide a valid Dropbox app key and secret." : "Por favor, forneça uma chave da app e o segredo da Dropbox válidos.",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas solicitadas. Verifique se o código e o segredo da sua app estão corretos.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Não foi possível obter as senhas de acesso. Verifique se o código e o segredo da sua app estão corretos.",
+    "Please provide a valid app key and secret." : "Por favor, indique um código e segredo de app válidos.",
     "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
     "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
     "External storage" : "Armazenamento Externo",
-    "Local" : "Local",
-    "Location" : "Localização:",
+    "Storage with id \"%i\" not found" : "Não foi encontrado o armazenamento com a id. \"%i\"",
+    "Invalid mount point" : "Ponto de montagem inválido",
+    "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
+    "Unsatisfied authentication mechanism parameters" : "Parâmetros do mecanismo de autenticação inválidos",
+    "Personal" : "Pessoal",
+    "System" : "Sistema",
+    "Grant access" : "Conceder acesso",
+    "Access granted" : "Acesso autorizado",
+    "Error configuring OAuth1" : "Erro de configuração OAuth1",
+    "Error configuring OAuth2" : "Erro de configuração OAuth2",
+    "Generate keys" : "Gerar chaves",
+    "Error generating key pair" : "Erro ao gerar chave par",
+    "Enable encryption" : "Ative a encriptação",
+    "Enable previews" : "Ative as pré-visualizações",
+    "Check for changes" : "Verifique as suas alterações",
+    "Never" : "Nunca",
+    "Once every direct access" : "Uma vez em cada acesso direto",
+    "Every time the filesystem is used" : "De todas as vezes que o sistema de ficheiros é usado",
+    "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
+    "(group)" : "(grupo)",
+    "Saved" : "Guardado",
+    "Access key" : "Código de acesso",
+    "Secret key" : "Código secreto",
+    "Builtin" : "Integrado",
+    "None" : "Nenhum",
+    "OAuth1" : "OAuth1",
+    "App key" : "Chave da App",
+    "App secret" : "Segredo da app",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Id. do Cliente",
+    "Client secret" : "Segredo do cliente\\\\",
+    "Username" : "Nome de utilizador",
+    "Password" : "Palavra-passe",
+    "API key" : "Chave API",
+    "Username and password" : "Nome de utilizador e palavra-passe",
+    "Session credentials" : "Credenciais da sessão",
+    "Public key" : "Chave pública",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Chave",
-    "Secret" : "Secreto",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 e compatível",
-    "Access Key" : "Chave de Acesso",
-    "Secret Key" : "Chave Secreta",
     "Hostname" : "Nome do Anfitrião",
     "Port" : "Porta",
     "Region" : "Região",
     "Enable SSL" : "Ativar SSL",
     "Enable Path Style" : "Ativar Estilo do Caminho",
-    "App key" : "Chave da App",
-    "App secret" : "Chave secreta da aplicação",
-    "Host" : "Anfitrião",
-    "Username" : "Nome de utilizador",
-    "Password" : "Palavra-passe",
-    "Remote subfolder" : "Subpasta remota ",
-    "Secure ftps://" : "ftps:// Seguro",
-    "Client ID" : "Id. do Cliente",
-    "Client secret" : "Segredo do cliente",
-    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Região (opcional para OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
-    "Tenantname (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Senha (necessária para OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout de pedidos HTTP em segundos",
-    "Share" : "Compartilhar",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
-    "Username as share" : "Utilizar nome de utilizador como partilha",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Subpasta remota ",
     "Secure https://" : "https:// Seguro",
-    "Public key" : "Chave pública",
-    "Storage with id \"%i\" not found" : "Armazenamento com ID \"%i\" não encontrado",
-    "Invalid mount point" : "Ponto de montagem inválido",
-    "Invalid storage backend \"%s\"" : "Backend de armazenamento inválido \"%s\"",
-    "Access granted" : "Acesso autorizado",
-    "Error configuring Dropbox storage" : "Erro ao configurar o armazenamento do Dropbox",
-    "Grant access" : "Conceder acesso",
-    "Error configuring Google Drive storage" : "Erro ao configurar o armazenamento do Google Drive",
-    "Personal" : "Pessoal",
-    "System" : "Sistema",
-    "All users. Type to select user or group." : "Todos os utilizadores. Digite para selecionar o utilizador ou grupo.",
-    "(group)" : "(grupo)",
-    "Saved" : "Guardado",
-    "Generate keys" : "Gerar chaves",
-    "Error generating key pair" : "Erro ao gerar chave par",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Anfitrião",
+    "Secure ftps://" : "ftps:// Seguro",
+    "Google Drive" : "Google Drive",
+    "Local" : "Local",
+    "Location" : "Localização:",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Root",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Compartilhar",
+    "Username as share" : "Nome de utilizador como partilha",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
     "<b>Note:</b> " : "<b>Nota:</b> ",
-    "and" : "e",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O cliente\"%s\" não está instalado. Não é possível montar \"%s\" . Peça ao seu administrador para instalar.",
@@ -68,11 +78,12 @@
     "Scope" : "Âmbito",
     "External Storage" : "Armazenamento Externo",
     "Folder name" : "Nome da pasta",
+    "Authentication" : "Autenticação",
     "Configuration" : "Configuração",
     "Available for" : "Disponível para ",
-    "Add storage" : "Adicionar armazenamento",
     "Advanced settings" : "Definições avançadas",
     "Delete" : "Apagar",
+    "Add storage" : "Adicionar armazenamento",
     "Enable User External Storage" : "Ativar Armazenamento Externo para o Utilizador",
     "Allow users to mount the following external storage" : "Permitir que os utilizadores montem o seguinte armazenamento externo"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/ro.js b/apps/files_external/l10n/ro.js
index e7e6a5662f..502d9a5cbe 100644
--- a/apps/files_external/l10n/ro.js
+++ b/apps/files_external/l10n/ro.js
@@ -1,37 +1,35 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Prezintă te rog o cheie de Dropbox validă și parola",
     "External storage" : "Stocare externă",
-    "Local" : "Local",
-    "Location" : "Locație",
+    "Personal" : "Personal",
+    "Grant access" : "Permite accesul",
+    "Access granted" : "Acces permis",
+    "Saved" : "Salvat",
+    "None" : "Niciuna",
+    "Username" : "Nume utilizator",
+    "Password" : "Parolă",
+    "API key" : "Cheie API",
+    "Public key" : "Cheie publică",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Cheie",
-    "Secret" : "Secret",
-    "Access Key" : "Cheie de acces",
-    "Secret Key" : "Cheie secretă",
     "Hostname" : "Hostname",
     "Port" : "Portul",
     "Region" : "Regiune",
-    "Host" : "Gazdă",
-    "Username" : "Nume utilizator",
-    "Password" : "Parolă",
-    "Share" : "Partajează",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Public key" : "Cheie publică",
-    "Access granted" : "Acces permis",
-    "Error configuring Dropbox storage" : "Eroare la configurarea mediului de stocare Dropbox",
-    "Grant access" : "Permite accesul",
-    "Error configuring Google Drive storage" : "Eroare la configurarea mediului de stocare Google Drive",
-    "Personal" : "Personal",
-    "Saved" : "Salvat",
+    "Host" : "Gazdă",
+    "Local" : "Local",
+    "Location" : "Locație",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Partajează",
     "Name" : "Nume",
     "Storage type" : "Tip stocare",
     "External Storage" : "Stocare externă",
     "Folder name" : "Denumire director",
     "Configuration" : "Configurație",
-    "Add storage" : "Adauga stocare",
     "Delete" : "Șterge",
+    "Add storage" : "Adauga stocare",
     "Enable User External Storage" : "Permite stocare externă pentru utilizatori",
     "Allow users to mount the following external storage" : "Permite utilizatorilor să monteze următoarea unitate de stocare"
 },
diff --git a/apps/files_external/l10n/ro.json b/apps/files_external/l10n/ro.json
index bc7612b5cd..41c844e36b 100644
--- a/apps/files_external/l10n/ro.json
+++ b/apps/files_external/l10n/ro.json
@@ -1,35 +1,33 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Prezintă te rog o cheie de Dropbox validă și parola",
     "External storage" : "Stocare externă",
-    "Local" : "Local",
-    "Location" : "Locație",
+    "Personal" : "Personal",
+    "Grant access" : "Permite accesul",
+    "Access granted" : "Acces permis",
+    "Saved" : "Salvat",
+    "None" : "Niciuna",
+    "Username" : "Nume utilizator",
+    "Password" : "Parolă",
+    "API key" : "Cheie API",
+    "Public key" : "Cheie publică",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Cheie",
-    "Secret" : "Secret",
-    "Access Key" : "Cheie de acces",
-    "Secret Key" : "Cheie secretă",
     "Hostname" : "Hostname",
     "Port" : "Portul",
     "Region" : "Regiune",
-    "Host" : "Gazdă",
-    "Username" : "Nume utilizator",
-    "Password" : "Parolă",
-    "Share" : "Partajează",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Public key" : "Cheie publică",
-    "Access granted" : "Acces permis",
-    "Error configuring Dropbox storage" : "Eroare la configurarea mediului de stocare Dropbox",
-    "Grant access" : "Permite accesul",
-    "Error configuring Google Drive storage" : "Eroare la configurarea mediului de stocare Google Drive",
-    "Personal" : "Personal",
-    "Saved" : "Salvat",
+    "Host" : "Gazdă",
+    "Local" : "Local",
+    "Location" : "Locație",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Partajează",
     "Name" : "Nume",
     "Storage type" : "Tip stocare",
     "External Storage" : "Stocare externă",
     "Folder name" : "Denumire director",
     "Configuration" : "Configurație",
-    "Add storage" : "Adauga stocare",
     "Delete" : "Șterge",
+    "Add storage" : "Adauga stocare",
     "Enable User External Storage" : "Permite stocare externă pentru utilizatori",
     "Allow users to mount the following external storage" : "Permite utilizatorilor să monteze următoarea unitate de stocare"
 },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js
index d395470a79..f76c5526bc 100644
--- a/apps/files_external/l10n/ru.js
+++ b/apps/files_external/l10n/ru.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен запроса. Проверьте правильность вашего ключа и секрета Dropbox.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен доступа. Проверьте правильность вашего ключа и секрета Dropbox.",
-    "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и секрет для Dropbox.",
     "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
     "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
     "External storage" : "Внешнее хранилище",
-    "Local" : "Локально",
-    "Location" : "Местоположение",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Ключ",
-    "Secret" : "Секрет",
-    "Bucket" : "Корзина",
-    "Amazon S3 and compliant" : "Amazon S3 и совместимый",
-    "Access Key" : "Ключ доступа",
-    "Secret Key" : "Секретный ключ",
-    "Hostname" : "Имя хоста",
-    "Port" : "Порт",
-    "Region" : "Область",
-    "Enable SSL" : "Включить SSL",
-    "Enable Path Style" : "Включить стиль пути",
-    "App key" : "Ключ приложения",
-    "App secret" : "Секретный ключ ",
-    "Host" : "Сервер",
-    "Username" : "Имя пользователя",
-    "Password" : "Пароль",
-    "Remote subfolder" : "Удаленный подкаталог",
-    "Secure ftps://" : "Защищённый ftps://",
-    "Client ID" : "Идентификатор клиента",
-    "Client secret" : "Клиентский ключ ",
-    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Регион (необяз. для Хранилища объектов OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обяз. для Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Имя арендатора (обяз. для Хранилища объектов OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Пароль (обяз. для Хранилища объектов OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах",
-    "Share" : "Общий доступ",
-    "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
-    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
-    "URL" : "Ссылка",
-    "Secure https://" : "Безопасный https://",
-    "SFTP with secret key login" : "SFTP с помощью секретного ключа",
-    "Public key" : "Открытый ключ",
     "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено",
     "Invalid mount point" : "Неправильная точка входа",
     "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"",
-    "Access granted" : "Доступ предоставлен",
-    "Error configuring Dropbox storage" : "Ошибка при настройке хранилища Dropbox",
-    "Grant access" : "Предоставить доступ",
-    "Error configuring Google Drive storage" : "Ошибка при настройке хранилища Google Drive",
     "Personal" : "Личное",
     "System" : "Система",
+    "Grant access" : "Предоставить доступ",
+    "Access granted" : "Доступ предоставлен",
+    "Generate keys" : "Создать ключи",
+    "Error generating key pair" : "Ошибка создания ключевой пары",
     "Enable encryption" : "Включить шифрование",
     "Enable previews" : "Включить предпросмотр",
     "Check for changes" : "Проверять изменения",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.",
     "(group)" : "(группа)",
     "Saved" : "Сохранено",
-    "Generate keys" : "Создать ключи",
-    "Error generating key pair" : "Ошибка создания ключевой пары",
+    "None" : "Отсутствует",
+    "App key" : "Ключ приложения",
+    "App secret" : "Секретный ключ ",
+    "Client ID" : "Идентификатор клиента",
+    "Client secret" : "Клиентский ключ ",
+    "Username" : "Имя пользователя",
+    "Password" : "Пароль",
+    "API key" : "Ключ API",
+    "Public key" : "Открытый ключ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Корзина",
+    "Hostname" : "Имя хоста",
+    "Port" : "Порт",
+    "Region" : "Область",
+    "Enable SSL" : "Включить SSL",
+    "Enable Path Style" : "Включить стиль пути",
+    "WebDAV" : "WebDAV",
+    "URL" : "Ссылка",
+    "Remote subfolder" : "Удаленный подкаталог",
+    "Secure https://" : "Безопасный https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Сервер",
+    "Secure ftps://" : "Защищённый ftps://",
+    "Local" : "Локально",
+    "Location" : "Местоположение",
+    "ownCloud" : "ownCloud",
+    "Root" : "Корневой каталог",
+    "Share" : "Общий доступ",
+    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
+    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
     "<b>Note:</b> " : "<b>Примечание:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> \"%s\" не установлен. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Имя каталога",
     "Configuration" : "Конфигурация",
     "Available for" : "Доступно для",
-    "Add storage" : "Добавить хранилище",
     "Advanced settings" : "Расширенные настройки",
     "Delete" : "Удалить",
+    "Add storage" : "Добавить хранилище",
     "Enable User External Storage" : "Включить пользовательские внешние хранилища",
     "Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующие сервисы хранения данных"
 },
diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json
index daeda1d836..3428d05ef4 100644
--- a/apps/files_external/l10n/ru.json
+++ b/apps/files_external/l10n/ru.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен запроса. Проверьте правильность вашего ключа и секрета Dropbox.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Не удалось получить токен доступа. Проверьте правильность вашего ключа и секрета Dropbox.",
-    "Please provide a valid Dropbox app key and secret." : "Укажите действительные ключ и секрет для Dropbox.",
     "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
     "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
     "External storage" : "Внешнее хранилище",
-    "Local" : "Локально",
-    "Location" : "Местоположение",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Ключ",
-    "Secret" : "Секрет",
-    "Bucket" : "Корзина",
-    "Amazon S3 and compliant" : "Amazon S3 и совместимый",
-    "Access Key" : "Ключ доступа",
-    "Secret Key" : "Секретный ключ",
-    "Hostname" : "Имя хоста",
-    "Port" : "Порт",
-    "Region" : "Область",
-    "Enable SSL" : "Включить SSL",
-    "Enable Path Style" : "Включить стиль пути",
-    "App key" : "Ключ приложения",
-    "App secret" : "Секретный ключ ",
-    "Host" : "Сервер",
-    "Username" : "Имя пользователя",
-    "Password" : "Пароль",
-    "Remote subfolder" : "Удаленный подкаталог",
-    "Secure ftps://" : "Защищённый ftps://",
-    "Client ID" : "Идентификатор клиента",
-    "Client secret" : "Клиентский ключ ",
-    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Регион (необяз. для Хранилища объектов OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обяз. для Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Имя арендатора (обяз. для Хранилища объектов OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Пароль (обяз. для Хранилища объектов OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах",
-    "Share" : "Общий доступ",
-    "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
-    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
-    "URL" : "Ссылка",
-    "Secure https://" : "Безопасный https://",
-    "SFTP with secret key login" : "SFTP с помощью секретного ключа",
-    "Public key" : "Открытый ключ",
     "Storage with id \"%i\" not found" : "Хранилище с идентификатором \"%i\" не найдено",
     "Invalid mount point" : "Неправильная точка входа",
     "Invalid storage backend \"%s\"" : "Неверный бэкенд хранилища \"%s\"",
-    "Access granted" : "Доступ предоставлен",
-    "Error configuring Dropbox storage" : "Ошибка при настройке хранилища Dropbox",
-    "Grant access" : "Предоставить доступ",
-    "Error configuring Google Drive storage" : "Ошибка при настройке хранилища Google Drive",
     "Personal" : "Личное",
     "System" : "Система",
+    "Grant access" : "Предоставить доступ",
+    "Access granted" : "Доступ предоставлен",
+    "Generate keys" : "Создать ключи",
+    "Error generating key pair" : "Ошибка создания ключевой пары",
     "Enable encryption" : "Включить шифрование",
     "Enable previews" : "Включить предпросмотр",
     "Check for changes" : "Проверять изменения",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.",
     "(group)" : "(группа)",
     "Saved" : "Сохранено",
-    "Generate keys" : "Создать ключи",
-    "Error generating key pair" : "Ошибка создания ключевой пары",
+    "None" : "Отсутствует",
+    "App key" : "Ключ приложения",
+    "App secret" : "Секретный ключ ",
+    "Client ID" : "Идентификатор клиента",
+    "Client secret" : "Клиентский ключ ",
+    "Username" : "Имя пользователя",
+    "Password" : "Пароль",
+    "API key" : "Ключ API",
+    "Public key" : "Открытый ключ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Корзина",
+    "Hostname" : "Имя хоста",
+    "Port" : "Порт",
+    "Region" : "Область",
+    "Enable SSL" : "Включить SSL",
+    "Enable Path Style" : "Включить стиль пути",
+    "WebDAV" : "WebDAV",
+    "URL" : "Ссылка",
+    "Remote subfolder" : "Удаленный подкаталог",
+    "Secure https://" : "Безопасный https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Сервер",
+    "Secure ftps://" : "Защищённый ftps://",
+    "Local" : "Локально",
+    "Location" : "Местоположение",
+    "ownCloud" : "ownCloud",
+    "Root" : "Корневой каталог",
+    "Share" : "Общий доступ",
+    "Username as share" : "Имя пользователя в качестве имени общего ресурса",
+    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
     "<b>Note:</b> " : "<b>Примечание:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> \"%s\" не установлен. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
@@ -77,9 +63,9 @@
     "Folder name" : "Имя каталога",
     "Configuration" : "Конфигурация",
     "Available for" : "Доступно для",
-    "Add storage" : "Добавить хранилище",
     "Advanced settings" : "Расширенные настройки",
     "Delete" : "Удалить",
+    "Add storage" : "Добавить хранилище",
     "Enable User External Storage" : "Включить пользовательские внешние хранилища",
     "Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующие сервисы хранения данных"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
diff --git a/apps/files_external/l10n/si_LK.js b/apps/files_external/l10n/si_LK.js
index 61ce19641b..80a6026ad7 100644
--- a/apps/files_external/l10n/si_LK.js
+++ b/apps/files_external/l10n/si_LK.js
@@ -1,20 +1,19 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න.",
-    "Location" : "ස්ථානය",
-    "Port" : "තොට",
-    "Region" : "කළාපය",
-    "Host" : "සත්කාරකය",
+    "Personal" : "පෞද්ගලික",
+    "Grant access" : "පිවිසුම ලබාදෙන්න",
+    "Access granted" : "පිවිසීමට හැක",
+    "None" : "කිසිවක් නැත",
     "Username" : "පරිශීලක නම",
     "Password" : "මුර පදය",
-    "Share" : "බෙදා හදා ගන්න",
+    "Port" : "තොට",
+    "Region" : "කළාපය",
     "URL" : "URL",
-    "Access granted" : "පිවිසීමට හැක",
-    "Error configuring Dropbox storage" : "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
-    "Grant access" : "පිවිසුම ලබාදෙන්න",
-    "Error configuring Google Drive storage" : "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
-    "Personal" : "පෞද්ගලික",
+    "Host" : "සත්කාරකය",
+    "Location" : "ස්ථානය",
+    "ownCloud" : "ownCloud",
+    "Share" : "බෙදා හදා ගන්න",
     "Name" : "නම",
     "External Storage" : "භාහිර ගබඩාව",
     "Folder name" : "ෆොල්ඩරයේ නම",
diff --git a/apps/files_external/l10n/si_LK.json b/apps/files_external/l10n/si_LK.json
index d9554fdb97..bc3a9ee11d 100644
--- a/apps/files_external/l10n/si_LK.json
+++ b/apps/files_external/l10n/si_LK.json
@@ -1,18 +1,17 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න.",
-    "Location" : "ස්ථානය",
-    "Port" : "තොට",
-    "Region" : "කළාපය",
-    "Host" : "සත්කාරකය",
+    "Personal" : "පෞද්ගලික",
+    "Grant access" : "පිවිසුම ලබාදෙන්න",
+    "Access granted" : "පිවිසීමට හැක",
+    "None" : "කිසිවක් නැත",
     "Username" : "පරිශීලක නම",
     "Password" : "මුර පදය",
-    "Share" : "බෙදා හදා ගන්න",
+    "Port" : "තොට",
+    "Region" : "කළාපය",
     "URL" : "URL",
-    "Access granted" : "පිවිසීමට හැක",
-    "Error configuring Dropbox storage" : "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
-    "Grant access" : "පිවිසුම ලබාදෙන්න",
-    "Error configuring Google Drive storage" : "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
-    "Personal" : "පෞද්ගලික",
+    "Host" : "සත්කාරකය",
+    "Location" : "ස්ථානය",
+    "ownCloud" : "ownCloud",
+    "Share" : "බෙදා හදා ගන්න",
     "Name" : "නම",
     "External Storage" : "භාහිර ගබඩාව",
     "Folder name" : "ෆොල්ඩරයේ නම",
diff --git a/apps/files_external/l10n/sk.js b/apps/files_external/l10n/sk.js
deleted file mode 100644
index edae863703..0000000000
--- a/apps/files_external/l10n/sk.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files_external",
-    {
-    "Location" : "Poloha",
-    "Share" : "Zdieľať",
-    "Personal" : "Osobné",
-    "Delete" : "Odstrániť"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_external/l10n/sk.json b/apps/files_external/l10n/sk.json
deleted file mode 100644
index 4d6a95caf3..0000000000
--- a/apps/files_external/l10n/sk.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Location" : "Poloha",
-    "Share" : "Zdieľať",
-    "Personal" : "Osobné",
-    "Delete" : "Odstrániť"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/files_external/l10n/sk_SK.js b/apps/files_external/l10n/sk_SK.js
index dc9b1ee84e..87ea8c64bc 100644
--- a/apps/files_external/l10n/sk_SK.js
+++ b/apps/files_external/l10n/sk_SK.js
@@ -1,66 +1,53 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie tokenov požiadavky zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie prístupových tokenov zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
-    "Please provide a valid Dropbox app key and secret." : "Zadajte platný kľúč aplikácie a heslo Dropbox",
     "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s",
     "External storage" : "Externé úložisko",
-    "Local" : "Lokálny",
-    "Location" : "Umiestnenie",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Kľúč",
-    "Secret" : "Tajné",
-    "Bucket" : "Sektor",
-    "Amazon S3 and compliant" : "Amazon S3 a kompatibilné",
-    "Access Key" : "Prístupový kľúč",
-    "Secret Key" : "Tajný kľúč",
-    "Hostname" : "Hostname",
-    "Port" : "Port",
-    "Region" : "Región",
-    "Enable SSL" : "Povoliť SSL",
-    "Enable Path Style" : "Povoliť štýl cesty",
-    "App key" : "Kľúč aplikácie",
-    "App secret" : "Heslo aplikácie",
-    "Host" : "Hostiteľ",
-    "Username" : "Používateľské meno",
-    "Password" : "Heslo",
-    "Remote subfolder" : "Vzdialený podpriečinok",
-    "Secure ftps://" : "Zabezpečené ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Heslo klienta",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Meno nájomcu (požadované pre OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadaviek v sekundách",
-    "Share" : "Zdieľať",
-    "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia",
-    "Username as share" : "Používateľské meno ako zdieľaný priečinok",
-    "URL" : "URL",
-    "Secure https://" : "Zabezpečené https://",
-    "Public key" : "Verejný kľúč",
     "Invalid mount point" : "Chybný prípojný bod",
-    "Access granted" : "Prístup povolený",
-    "Error configuring Dropbox storage" : "Chyba pri konfigurácii úložiska Dropbox",
-    "Grant access" : "Povoliť prístup",
-    "Error configuring Google Drive storage" : "Chyba pri konfigurácii úložiska Google drive",
     "Personal" : "Osobné",
     "System" : "Systém",
+    "Grant access" : "Povoliť prístup",
+    "Access granted" : "Prístup povolený",
+    "Generate keys" : "Vytvoriť kľúče",
+    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
     "Enable encryption" : "Povoliť šifrovanie",
     "Enable previews" : "Povoliť náhľady",
     "Never" : "Nikdy",
     "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.",
     "(group)" : "(skupina)",
     "Saved" : "Uložené",
-    "Generate keys" : "Vytvoriť kľúče",
-    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
+    "None" : "Žiadny",
+    "App key" : "Kľúč aplikácie",
+    "App secret" : "Heslo aplikácie",
+    "Client ID" : "Client ID",
+    "Client secret" : "Heslo klienta",
+    "Username" : "Používateľské meno",
+    "Password" : "Heslo",
+    "API key" : "API kľúč",
+    "Public key" : "Verejný kľúč",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Sektor",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Región",
+    "Enable SSL" : "Povoliť SSL",
+    "Enable Path Style" : "Povoliť štýl cesty",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Vzdialený podpriečinok",
+    "Secure https://" : "Zabezpečené https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Hostiteľ",
+    "Secure ftps://" : "Zabezpečené ftps://",
+    "Local" : "Lokálny",
+    "Location" : "Umiestnenie",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Zdieľať",
+    "Username as share" : "Používateľské meno ako zdieľaný priečinok",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b> ",
-    "and" : "a",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
@@ -72,9 +59,9 @@ OC.L10N.register(
     "Folder name" : "Názov priečinka",
     "Configuration" : "Nastavenia",
     "Available for" : "K dispozícii pre",
-    "Add storage" : "Pridať úložisko",
     "Advanced settings" : "Rozšírené nastavenia",
     "Delete" : "Zmazať",
+    "Add storage" : "Pridať úložisko",
     "Enable User External Storage" : "Povoliť externé úložisko",
     "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská"
 },
diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json
index fbc4c82121..5e7f4d1fa9 100644
--- a/apps/files_external/l10n/sk_SK.json
+++ b/apps/files_external/l10n/sk_SK.json
@@ -1,64 +1,51 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie tokenov požiadavky zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie prístupových tokenov zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
-    "Please provide a valid Dropbox app key and secret." : "Zadajte platný kľúč aplikácie a heslo Dropbox",
     "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s",
     "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s",
     "External storage" : "Externé úložisko",
-    "Local" : "Lokálny",
-    "Location" : "Umiestnenie",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Kľúč",
-    "Secret" : "Tajné",
-    "Bucket" : "Sektor",
-    "Amazon S3 and compliant" : "Amazon S3 a kompatibilné",
-    "Access Key" : "Prístupový kľúč",
-    "Secret Key" : "Tajný kľúč",
-    "Hostname" : "Hostname",
-    "Port" : "Port",
-    "Region" : "Región",
-    "Enable SSL" : "Povoliť SSL",
-    "Enable Path Style" : "Povoliť štýl cesty",
-    "App key" : "Kľúč aplikácie",
-    "App secret" : "Heslo aplikácie",
-    "Host" : "Hostiteľ",
-    "Username" : "Používateľské meno",
-    "Password" : "Heslo",
-    "Remote subfolder" : "Vzdialený podpriečinok",
-    "Secure ftps://" : "Zabezpečené ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Heslo klienta",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Meno nájomcu (požadované pre OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadaviek v sekundách",
-    "Share" : "Zdieľať",
-    "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia",
-    "Username as share" : "Používateľské meno ako zdieľaný priečinok",
-    "URL" : "URL",
-    "Secure https://" : "Zabezpečené https://",
-    "Public key" : "Verejný kľúč",
     "Invalid mount point" : "Chybný prípojný bod",
-    "Access granted" : "Prístup povolený",
-    "Error configuring Dropbox storage" : "Chyba pri konfigurácii úložiska Dropbox",
-    "Grant access" : "Povoliť prístup",
-    "Error configuring Google Drive storage" : "Chyba pri konfigurácii úložiska Google drive",
     "Personal" : "Osobné",
     "System" : "Systém",
+    "Grant access" : "Povoliť prístup",
+    "Access granted" : "Prístup povolený",
+    "Generate keys" : "Vytvoriť kľúče",
+    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
     "Enable encryption" : "Povoliť šifrovanie",
     "Enable previews" : "Povoliť náhľady",
     "Never" : "Nikdy",
     "All users. Type to select user or group." : "Všetci používatelia. Začnite písať pre výber používateľa alebo skupinu.",
     "(group)" : "(skupina)",
     "Saved" : "Uložené",
-    "Generate keys" : "Vytvoriť kľúče",
-    "Error generating key pair" : "Chyba pri vytváraní dvojice kľúčov",
+    "None" : "Žiadny",
+    "App key" : "Kľúč aplikácie",
+    "App secret" : "Heslo aplikácie",
+    "Client ID" : "Client ID",
+    "Client secret" : "Heslo klienta",
+    "Username" : "Používateľské meno",
+    "Password" : "Heslo",
+    "API key" : "API kľúč",
+    "Public key" : "Verejný kľúč",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Sektor",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Región",
+    "Enable SSL" : "Povoliť SSL",
+    "Enable Path Style" : "Povoliť štýl cesty",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Vzdialený podpriečinok",
+    "Secure https://" : "Zabezpečené https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Hostiteľ",
+    "Secure ftps://" : "Zabezpečené ftps://",
+    "Local" : "Lokálny",
+    "Location" : "Umiestnenie",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Zdieľať",
+    "Username as share" : "Používateľské meno ako zdieľaný priečinok",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Poznámka:</b> ",
-    "and" : "a",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
@@ -70,9 +57,9 @@
     "Folder name" : "Názov priečinka",
     "Configuration" : "Nastavenia",
     "Available for" : "K dispozícii pre",
-    "Add storage" : "Pridať úložisko",
     "Advanced settings" : "Rozšírené nastavenia",
     "Delete" : "Zmazať",
+    "Add storage" : "Pridať úložisko",
     "Enable User External Storage" : "Povoliť externé úložisko",
     "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js
index 094414ed29..b4c9cc0027 100644
--- a/apps/files_external/l10n/sl.js
+++ b/apps/files_external/l10n/sl.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za zahteve je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za dostop je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
-    "Please provide a valid Dropbox app key and secret." : "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
     "Step 1 failed. Exception: %s" : "1. korak je spodletel. Izjemna napaka: %s",
     "Step 2 failed. Exception: %s" : "2. korak je spodletel. Izjemna napaka: %s",
     "External storage" : "Zunanja shramba",
-    "Local" : "Krajevno",
-    "Location" : "Mesto",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Skrivni ključ",
-    "Bucket" : "Pomnilniško vedro",
-    "Amazon S3 and compliant" : "Amazon S3 in podobno",
-    "Access Key" : "Ključ za dostop",
-    "Secret Key" : "Skrivni ključ",
-    "Hostname" : "Ime gostitelja",
-    "Port" : "Vrata",
-    "Region" : "Območje",
-    "Enable SSL" : "Omogoči SSL",
-    "Enable Path Style" : "Omogoči slog poti",
-    "App key" : "Programski ključ",
-    "App secret" : "Skrivni programski ključ",
-    "Host" : "Gostitelj",
-    "Username" : "Uporabniško ime",
-    "Password" : "Geslo",
-    "Remote subfolder" : "Oddaljena podrejena mapa",
-    "Secure ftps://" : "Varni način ftps://",
-    "Client ID" : "ID odjemalca",
-    "Client secret" : "Skrivni ključ odjemalca",
-    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Območje (zahtevano za shrambo predmeta OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ključ programskega vmesnika (API) (zahtevan je za datoteke v oblaku Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Geslo (zahtevano za shrambo predmeta OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime storitve (zahtevano za shrambo predmeta OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Naslov URL končne točke  uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Časovni zamik zahtev HTTP v sekundah",
-    "Share" : "Souporaba",
-    "SMB / CIFS using OC login" : "SMB / CIFS z uporabo prijave OC",
-    "Username as share" : "Uporabniško ime za souporabo",
-    "URL" : "Naslov URL",
-    "Secure https://" : "Varni način https://",
-    "SFTP with secret key login" : "Prijava preko protokola SFTP z geslom",
-    "Public key" : "Javni ključ",
     "Storage with id \"%i\" not found" : "Shrambe z ID \"%i\" ni mogoče najti.",
     "Invalid mount point" : "Neveljavna priklopna točka",
     "Invalid storage backend \"%s\"" : "Neveljaven ozadnji program shrambe \"%s\"",
-    "Access granted" : "Dostop je odobren",
-    "Error configuring Dropbox storage" : "Napaka nastavljanja shrambe Dropbox",
-    "Grant access" : "Odobri dostop",
-    "Error configuring Google Drive storage" : "Napaka nastavljanja shrambe Google Drive",
     "Personal" : "Osebno",
     "System" : "Sistem",
+    "Grant access" : "Odobri dostop",
+    "Access granted" : "Dostop je odobren",
+    "Generate keys" : "Ustvari ključe",
+    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "Enable encryption" : "Omogoči šifriranje",
     "Enable previews" : "Omogoči predogled",
     "Check for changes" : "Preveri za spremembe",
@@ -63,10 +22,37 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
     "(group)" : "(skupina)",
     "Saved" : "Shranjeno",
-    "Generate keys" : "Ustvari ključe",
-    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
+    "None" : "Brez",
+    "App key" : "Programski ključ",
+    "App secret" : "Skrivni programski ključ",
+    "Client ID" : "ID odjemalca",
+    "Client secret" : "Skrivni ključ odjemalca",
+    "Username" : "Uporabniško ime",
+    "Password" : "Geslo",
+    "API key" : "Ključ API",
+    "Public key" : "Javni ključ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Pomnilniško vedro",
+    "Hostname" : "Ime gostitelja",
+    "Port" : "Vrata",
+    "Region" : "Območje",
+    "Enable SSL" : "Omogoči SSL",
+    "Enable Path Style" : "Omogoči slog poti",
+    "WebDAV" : "WebDAV",
+    "URL" : "Naslov URL",
+    "Remote subfolder" : "Oddaljena podrejena mapa",
+    "Secure https://" : "Varni način https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Gostitelj",
+    "Secure ftps://" : "Varni način ftps://",
+    "Local" : "Krajevno",
+    "Location" : "Mesto",
+    "ownCloud" : "ownCloud",
+    "Root" : "Koren",
+    "Share" : "Souporaba",
+    "Username as share" : "Uporabniško ime za souporabo",
+    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
     "<b>Note:</b> " : "<b>Opomba:</b> ",
-    "and" : "in",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
@@ -79,9 +65,9 @@ OC.L10N.register(
     "Folder name" : "Ime mape",
     "Configuration" : "Nastavitve",
     "Available for" : "Na voljo za",
-    "Add storage" : "Dodaj shrambo",
     "Advanced settings" : "Napredne nastavitve",
     "Delete" : "Izbriši",
+    "Add storage" : "Dodaj shrambo",
     "Enable User External Storage" : "Omogoči zunanjo uporabniško podatkovno shrambo",
     "Allow users to mount the following external storage" : "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb."
 },
diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json
index 4cebc8a1ac..56b64fb17c 100644
--- a/apps/files_external/l10n/sl.json
+++ b/apps/files_external/l10n/sl.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za zahteve je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za dostop je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
-    "Please provide a valid Dropbox app key and secret." : "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
     "Step 1 failed. Exception: %s" : "1. korak je spodletel. Izjemna napaka: %s",
     "Step 2 failed. Exception: %s" : "2. korak je spodletel. Izjemna napaka: %s",
     "External storage" : "Zunanja shramba",
-    "Local" : "Krajevno",
-    "Location" : "Mesto",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Skrivni ključ",
-    "Bucket" : "Pomnilniško vedro",
-    "Amazon S3 and compliant" : "Amazon S3 in podobno",
-    "Access Key" : "Ključ za dostop",
-    "Secret Key" : "Skrivni ključ",
-    "Hostname" : "Ime gostitelja",
-    "Port" : "Vrata",
-    "Region" : "Območje",
-    "Enable SSL" : "Omogoči SSL",
-    "Enable Path Style" : "Omogoči slog poti",
-    "App key" : "Programski ključ",
-    "App secret" : "Skrivni programski ključ",
-    "Host" : "Gostitelj",
-    "Username" : "Uporabniško ime",
-    "Password" : "Geslo",
-    "Remote subfolder" : "Oddaljena podrejena mapa",
-    "Secure ftps://" : "Varni način ftps://",
-    "Client ID" : "ID odjemalca",
-    "Client secret" : "Skrivni ključ odjemalca",
-    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
-    "Region (optional for OpenStack Object Storage)" : "Območje (zahtevano za shrambo predmeta OpenStack)",
-    "API Key (required for Rackspace Cloud Files)" : "Ključ programskega vmesnika (API) (zahtevan je za datoteke v oblaku Rackspace)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Password (required for OpenStack Object Storage)" : "Geslo (zahtevano za shrambo predmeta OpenStack)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime storitve (zahtevano za shrambo predmeta OpenStack)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Naslov URL končne točke  uporabnika (zahtevano za shrambo predmeta OpenStack)",
-    "Timeout of HTTP requests in seconds" : "Časovni zamik zahtev HTTP v sekundah",
-    "Share" : "Souporaba",
-    "SMB / CIFS using OC login" : "SMB / CIFS z uporabo prijave OC",
-    "Username as share" : "Uporabniško ime za souporabo",
-    "URL" : "Naslov URL",
-    "Secure https://" : "Varni način https://",
-    "SFTP with secret key login" : "Prijava preko protokola SFTP z geslom",
-    "Public key" : "Javni ključ",
     "Storage with id \"%i\" not found" : "Shrambe z ID \"%i\" ni mogoče najti.",
     "Invalid mount point" : "Neveljavna priklopna točka",
     "Invalid storage backend \"%s\"" : "Neveljaven ozadnji program shrambe \"%s\"",
-    "Access granted" : "Dostop je odobren",
-    "Error configuring Dropbox storage" : "Napaka nastavljanja shrambe Dropbox",
-    "Grant access" : "Odobri dostop",
-    "Error configuring Google Drive storage" : "Napaka nastavljanja shrambe Google Drive",
     "Personal" : "Osebno",
     "System" : "Sistem",
+    "Grant access" : "Odobri dostop",
+    "Access granted" : "Dostop je odobren",
+    "Generate keys" : "Ustvari ključe",
+    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
     "Enable encryption" : "Omogoči šifriranje",
     "Enable previews" : "Omogoči predogled",
     "Check for changes" : "Preveri za spremembe",
@@ -61,10 +20,37 @@
     "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
     "(group)" : "(skupina)",
     "Saved" : "Shranjeno",
-    "Generate keys" : "Ustvari ključe",
-    "Error generating key pair" : "Prišlo je do napake med ustvarjanjem para ključev",
+    "None" : "Brez",
+    "App key" : "Programski ključ",
+    "App secret" : "Skrivni programski ključ",
+    "Client ID" : "ID odjemalca",
+    "Client secret" : "Skrivni ključ odjemalca",
+    "Username" : "Uporabniško ime",
+    "Password" : "Geslo",
+    "API key" : "Ključ API",
+    "Public key" : "Javni ključ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Pomnilniško vedro",
+    "Hostname" : "Ime gostitelja",
+    "Port" : "Vrata",
+    "Region" : "Območje",
+    "Enable SSL" : "Omogoči SSL",
+    "Enable Path Style" : "Omogoči slog poti",
+    "WebDAV" : "WebDAV",
+    "URL" : "Naslov URL",
+    "Remote subfolder" : "Oddaljena podrejena mapa",
+    "Secure https://" : "Varni način https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Gostitelj",
+    "Secure ftps://" : "Varni način ftps://",
+    "Local" : "Krajevno",
+    "Location" : "Mesto",
+    "ownCloud" : "ownCloud",
+    "Root" : "Koren",
+    "Share" : "Souporaba",
+    "Username as share" : "Uporabniško ime za souporabo",
+    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
     "<b>Note:</b> " : "<b>Opomba:</b> ",
-    "and" : "in",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
@@ -77,9 +63,9 @@
     "Folder name" : "Ime mape",
     "Configuration" : "Nastavitve",
     "Available for" : "Na voljo za",
-    "Add storage" : "Dodaj shrambo",
     "Advanced settings" : "Napredne nastavitve",
     "Delete" : "Izbriši",
+    "Add storage" : "Dodaj shrambo",
     "Enable User External Storage" : "Omogoči zunanjo uporabniško podatkovno shrambo",
     "Allow users to mount the following external storage" : "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb."
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js
index 5a8c70406d..61262e8c8b 100644
--- a/apps/files_external/l10n/sq.js
+++ b/apps/files_external/l10n/sq.js
@@ -1,15 +1,17 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "Vendndodhja",
-    "Port" : "Porta",
-    "Host" : "Pritësi",
-    "Username" : "Përdoruesi",
-    "Password" : "fjalëkalim",
-    "Share" : "Ndaj",
-    "URL" : "URL-i",
     "Personal" : "Personale",
     "Saved" : "U ruajt",
+    "None" : "Asgjë",
+    "Username" : "Përdoruesi",
+    "Password" : "fjalëkalim",
+    "Port" : "Porta",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL-i",
+    "Host" : "Pritësi",
+    "Location" : "Vendndodhja",
+    "Share" : "Ndaj",
     "Name" : "Emri",
     "Folder name" : "Emri i Skedarit",
     "Delete" : "Elimino"
diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json
index d2abfb55bf..20ebd50848 100644
--- a/apps/files_external/l10n/sq.json
+++ b/apps/files_external/l10n/sq.json
@@ -1,13 +1,15 @@
 { "translations": {
-    "Location" : "Vendndodhja",
-    "Port" : "Porta",
-    "Host" : "Pritësi",
-    "Username" : "Përdoruesi",
-    "Password" : "fjalëkalim",
-    "Share" : "Ndaj",
-    "URL" : "URL-i",
     "Personal" : "Personale",
     "Saved" : "U ruajt",
+    "None" : "Asgjë",
+    "Username" : "Përdoruesi",
+    "Password" : "fjalëkalim",
+    "Port" : "Porta",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL-i",
+    "Host" : "Pritësi",
+    "Location" : "Vendndodhja",
+    "Share" : "Ndaj",
     "Name" : "Emri",
     "Folder name" : "Emri i Skedarit",
     "Delete" : "Elimino"
diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js
index 1609ac0191..ddc5878f1f 100644
--- a/apps/files_external/l10n/sr.js
+++ b/apps/files_external/l10n/sr.js
@@ -1,59 +1,18 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Преузимање тражених токена није успело. Проверите  да ли су Dropbox апликациони кључ и тајна тачни.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Преузимање приступних токена није успело. Проверите  да ли су Dropbox апликациони кључ и тајна тачни.",
-    "Please provide a valid Dropbox app key and secret." : "Унесите исправан кључ и тајну за Дропбокс апликацију.",
     "Step 1 failed. Exception: %s" : "Корак 1 није успео. Изузетак: %s",
     "Step 2 failed. Exception: %s" : "Корак 2 није успео. Изузетак: %s",
     "External storage" : "Спољашње складиште",
-    "Local" : "локална",
-    "Location" : "Локација",
-    "Amazon S3" : "Амазон С3",
-    "Key" : "Кључ",
-    "Secret" : "Тајна",
-    "Bucket" : "Канта",
-    "Amazon S3 and compliant" : "Амазон С3 и одговарајући",
-    "Access Key" : "Приступни кључ",
-    "Secret Key" : "Тајни кључ",
-    "Hostname" : "Име домаћина",
-    "Port" : "Порт",
-    "Region" : "Регија",
-    "Enable SSL" : "Омогући ССЛ",
-    "Enable Path Style" : "Омогући стил путање",
-    "App key" : "Кључ апликације",
-    "App secret" : "Тајна апликације",
-    "Host" : "Домаћин",
-    "Username" : "Корисничко име",
-    "Password" : "Лозинка",
-    "Remote subfolder" : "Удаљена потфасцикла",
-    "Secure ftps://" : "Сигурни ftps://",
-    "Client ID" : "ИД клијента",
-    "Client secret" : "Тајна клијента",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Регион (није обавезно за OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (потребан за Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (потребно за OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Лозинка (потребна за OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Име сервиса (потребно за OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Адреса идентитета крајње тачке (потребно за OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Време истека ХТТП захтева у секундама",
-    "Share" : "Дели",
-    "SMB / CIFS using OC login" : "СМБ/ЦИФС користећи оунКлауд пријаву",
-    "Username as share" : "Корисничко име као дељење",
-    "URL" : "УРЛ",
-    "Secure https://" : "Сигурни https://",
-    "SFTP with secret key login" : "СФТП са пријавом помоћу тајног кључа",
-    "Public key" : "Јавни кључ",
     "Storage with id \"%i\" not found" : "Складиште са идентификацијом \"%i\" није пронађено",
     "Invalid mount point" : "Неисправна тачка монтирања",
     "Invalid storage backend \"%s\"" : "Неисправна позадина складишта „%s“",
-    "Access granted" : "Приступ одобрен",
-    "Error configuring Dropbox storage" : "Грешка при подешавању Дропбокс складишта",
-    "Grant access" : "Одобри приступ",
-    "Error configuring Google Drive storage" : "Грешка при подешавању Гугл диск складишта",
     "Personal" : "Лично",
     "System" : "Систем",
+    "Grant access" : "Одобри приступ",
+    "Access granted" : "Приступ одобрен",
+    "Generate keys" : "Генериши кључеве",
+    "Error generating key pair" : "Грешка при генерисању пара кључева",
     "Enable encryption" : "Укључи шифровање",
     "Enable previews" : "Укључи прегледе",
     "Check for changes" : "Провери измене",
@@ -63,10 +22,36 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.",
     "(group)" : "(група)",
     "Saved" : "Сачувано",
-    "Generate keys" : "Генериши кључеве",
-    "Error generating key pair" : "Грешка при генерисању пара кључева",
+    "None" : "Ништа",
+    "App key" : "Кључ апликације",
+    "App secret" : "Тајна апликације",
+    "Client ID" : "ИД клијента",
+    "Client secret" : "Тајна клијента",
+    "Username" : "Корисничко име",
+    "Password" : "Лозинка",
+    "API key" : "API кључ",
+    "Public key" : "Јавни кључ",
+    "Amazon S3" : "Амазон С3",
+    "Bucket" : "Канта",
+    "Hostname" : "Име домаћина",
+    "Port" : "Порт",
+    "Region" : "Регија",
+    "Enable SSL" : "Омогући ССЛ",
+    "Enable Path Style" : "Омогући стил путање",
+    "WebDAV" : "ВебДАВ",
+    "URL" : "УРЛ",
+    "Remote subfolder" : "Удаљена потфасцикла",
+    "Secure https://" : "Сигурни https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Домаћин",
+    "Secure ftps://" : "Сигурни ftps://",
+    "Local" : "локална",
+    "Location" : "Локација",
+    "ownCloud" : "оунКлауд",
+    "Share" : "Дели",
+    "Username as share" : "Корисничко име као дељење",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Напомена:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> cURL подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> ФТП подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> „%s“ није инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
@@ -79,9 +64,9 @@ OC.L10N.register(
     "Folder name" : "Назив фасцикле",
     "Configuration" : "Подешавање",
     "Available for" : "Доступно за",
-    "Add storage" : "Додај складиште",
     "Advanced settings" : "Напредне поставке",
     "Delete" : "Обриши",
+    "Add storage" : "Додај складиште",
     "Enable User External Storage" : "Укључи корисничко спољашње складиште",
     "Allow users to mount the following external storage" : "Дозволи корисницима да монтирају следећа спољашња складишта"
 },
diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json
index b6a85b1e1b..bc7dc4de21 100644
--- a/apps/files_external/l10n/sr.json
+++ b/apps/files_external/l10n/sr.json
@@ -1,57 +1,16 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Преузимање тражених токена није успело. Проверите  да ли су Dropbox апликациони кључ и тајна тачни.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Преузимање приступних токена није успело. Проверите  да ли су Dropbox апликациони кључ и тајна тачни.",
-    "Please provide a valid Dropbox app key and secret." : "Унесите исправан кључ и тајну за Дропбокс апликацију.",
     "Step 1 failed. Exception: %s" : "Корак 1 није успео. Изузетак: %s",
     "Step 2 failed. Exception: %s" : "Корак 2 није успео. Изузетак: %s",
     "External storage" : "Спољашње складиште",
-    "Local" : "локална",
-    "Location" : "Локација",
-    "Amazon S3" : "Амазон С3",
-    "Key" : "Кључ",
-    "Secret" : "Тајна",
-    "Bucket" : "Канта",
-    "Amazon S3 and compliant" : "Амазон С3 и одговарајући",
-    "Access Key" : "Приступни кључ",
-    "Secret Key" : "Тајни кључ",
-    "Hostname" : "Име домаћина",
-    "Port" : "Порт",
-    "Region" : "Регија",
-    "Enable SSL" : "Омогући ССЛ",
-    "Enable Path Style" : "Омогући стил путање",
-    "App key" : "Кључ апликације",
-    "App secret" : "Тајна апликације",
-    "Host" : "Домаћин",
-    "Username" : "Корисничко име",
-    "Password" : "Лозинка",
-    "Remote subfolder" : "Удаљена потфасцикла",
-    "Secure ftps://" : "Сигурни ftps://",
-    "Client ID" : "ИД клијента",
-    "Client secret" : "Тајна клијента",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Регион (није обавезно за OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (потребан за Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (потребно за OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Лозинка (потребна за OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Име сервиса (потребно за OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Адреса идентитета крајње тачке (потребно за OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Време истека ХТТП захтева у секундама",
-    "Share" : "Дели",
-    "SMB / CIFS using OC login" : "СМБ/ЦИФС користећи оунКлауд пријаву",
-    "Username as share" : "Корисничко име као дељење",
-    "URL" : "УРЛ",
-    "Secure https://" : "Сигурни https://",
-    "SFTP with secret key login" : "СФТП са пријавом помоћу тајног кључа",
-    "Public key" : "Јавни кључ",
     "Storage with id \"%i\" not found" : "Складиште са идентификацијом \"%i\" није пронађено",
     "Invalid mount point" : "Неисправна тачка монтирања",
     "Invalid storage backend \"%s\"" : "Неисправна позадина складишта „%s“",
-    "Access granted" : "Приступ одобрен",
-    "Error configuring Dropbox storage" : "Грешка при подешавању Дропбокс складишта",
-    "Grant access" : "Одобри приступ",
-    "Error configuring Google Drive storage" : "Грешка при подешавању Гугл диск складишта",
     "Personal" : "Лично",
     "System" : "Систем",
+    "Grant access" : "Одобри приступ",
+    "Access granted" : "Приступ одобрен",
+    "Generate keys" : "Генериши кључеве",
+    "Error generating key pair" : "Грешка при генерисању пара кључева",
     "Enable encryption" : "Укључи шифровање",
     "Enable previews" : "Укључи прегледе",
     "Check for changes" : "Провери измене",
@@ -61,10 +20,36 @@
     "All users. Type to select user or group." : "Сви корисници. Куцајте за избор корисника или групе.",
     "(group)" : "(група)",
     "Saved" : "Сачувано",
-    "Generate keys" : "Генериши кључеве",
-    "Error generating key pair" : "Грешка при генерисању пара кључева",
+    "None" : "Ништа",
+    "App key" : "Кључ апликације",
+    "App secret" : "Тајна апликације",
+    "Client ID" : "ИД клијента",
+    "Client secret" : "Тајна клијента",
+    "Username" : "Корисничко име",
+    "Password" : "Лозинка",
+    "API key" : "API кључ",
+    "Public key" : "Јавни кључ",
+    "Amazon S3" : "Амазон С3",
+    "Bucket" : "Канта",
+    "Hostname" : "Име домаћина",
+    "Port" : "Порт",
+    "Region" : "Регија",
+    "Enable SSL" : "Омогући ССЛ",
+    "Enable Path Style" : "Омогући стил путање",
+    "WebDAV" : "ВебДАВ",
+    "URL" : "УРЛ",
+    "Remote subfolder" : "Удаљена потфасцикла",
+    "Secure https://" : "Сигурни https://",
+    "Dropbox" : "Dropbox",
+    "Host" : "Домаћин",
+    "Secure ftps://" : "Сигурни ftps://",
+    "Local" : "локална",
+    "Location" : "Локација",
+    "ownCloud" : "оунКлауд",
+    "Share" : "Дели",
+    "Username as share" : "Корисничко име као дељење",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Напомена:</b> ",
-    "and" : "и",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> cURL подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> ФТП подршка за ПХП није омогућена или инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Напомена:</b> „%s“ није инсталирана. Монтирање %s није могуће. Затражите од вашег администратора система да је инсталира.",
@@ -77,9 +62,9 @@
     "Folder name" : "Назив фасцикле",
     "Configuration" : "Подешавање",
     "Available for" : "Доступно за",
-    "Add storage" : "Додај складиште",
     "Advanced settings" : "Напредне поставке",
     "Delete" : "Обриши",
+    "Add storage" : "Додај складиште",
     "Enable User External Storage" : "Укључи корисничко спољашње складиште",
     "Allow users to mount the following external storage" : "Дозволи корисницима да монтирају следећа спољашња складишта"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_external/l10n/sr@latin.js b/apps/files_external/l10n/sr@latin.js
index bac947bc12..64301b4a02 100644
--- a/apps/files_external/l10n/sr@latin.js
+++ b/apps/files_external/l10n/sr@latin.js
@@ -1,59 +1,42 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Dobavljanje detalja zahteva nije uspelo. Proverite da li su Vaš ključ aplikacije za Dropbox i tajna lozinka ispravni.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Dobavljanje detalja pristupa nije uspelo. Proverite da li su Vaš Dropbox ključ aplikacije i tajna lozinka ispravni.",
-    "Please provide a valid Dropbox app key and secret." : "Molimo unesite ispravan Dropbox ključ aplikacije i tajnu lozinku.",
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspeo. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspeo. Izuzetak: %s",
     "External storage" : "Spoljašnje skladište",
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
+    "Personal" : "Lično",
+    "System" : "Sistemsko",
+    "Grant access" : "Dozvoli pristup",
+    "Access granted" : "Pristup Dozvoljen",
+    "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.",
+    "(group)" : "(grupa)",
+    "Saved" : "Sačuvano",
+    "App key" : "Ključ Aplikacije",
+    "App secret" : "Tajna lozinka Aplikacije",
+    "Client ID" : "Identifikator klijenta",
+    "Client secret" : "Tajna lozinka klijenta",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Tajna lozinka",
     "Bucket" : "Korpa",
-    "Amazon S3 and compliant" : "Amazon S3 i kompatibilni",
-    "Access Key" : "Pristupni Ključ",
-    "Secret Key" : "Tajni Ključ",
     "Hostname" : "Ime računara",
     "Port" : "Port",
     "Region" : "Regija",
     "Enable SSL" : "Uključi SSL",
     "Enable Path Style" : "Omogući stil putanje",
-    "App key" : "Ključ Aplikacije",
-    "App secret" : "Tajna lozinka Aplikacije",
-    "Host" : "Računar",
-    "Username" : "Korisničko ime",
-    "Password" : "Lozinka",
-    "Remote subfolder" : "Udaljeni poddirektorijum",
-    "Secure ftps://" : "Sigurni ftps://",
-    "Client ID" : "Identifikator klijenta",
-    "Client secret" : "Tajna lozinka klijenta",
-    "OpenStack Object Storage" : "OpenStack skladište objekata",
-    "Region (optional for OpenStack Object Storage)" : "Region (opciono za OpenStack skladište objekata)",
-    "API Key (required for Rackspace Cloud Files)" : "API ključ (neophodno za Rackspace datoteke u oblaku)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime stanara (neophodno za OpenStack skladište objekata)",
-    "Password (required for OpenStack Object Storage)" : "Lozinka (neophodno za OpenStack skladište objekata)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime Servisa (neophodno za OpenStack skladište objekata)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje tačke identiteta (neophodno za OpenStack skladište objekata)",
-    "Timeout of HTTP requests in seconds" : "Ograničenje vremena veze HTTP zahteva u sekundama",
-    "Share" : "Podeli",
-    "SMB / CIFS using OC login" : "SMB / CIFS koji koristi OC prijavljivanje",
-    "Username as share" : "Korisničko ime i deljeni direktorijum",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Udaljeni poddirektorijum",
     "Secure https://" : "Sigurni https://",
-    "Access granted" : "Pristup Dozvoljen",
-    "Error configuring Dropbox storage" : "Greška u podešavanju Dropbox skladišta",
-    "Grant access" : "Dozvoli pristup",
-    "Error configuring Google Drive storage" : "Greška u podešavanju Google Disk skladišta",
-    "Personal" : "Lično",
-    "System" : "Sistemsko",
-    "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.",
-    "(group)" : "(grupa)",
-    "Saved" : "Sačuvano",
+    "Host" : "Računar",
+    "Secure ftps://" : "Sigurni ftps://",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "Root" : "Koren",
+    "Share" : "Podeli",
+    "Username as share" : "Korisničko ime i deljeni direktorijum",
+    "OpenStack Object Storage" : "OpenStack skladište objekata",
     "<b>Note:</b> " : "<b>Obratite pažnju:</b>",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju</b> Podrška za cURL u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da se obratite Vašem sistem administratoru da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju:</b> FTP podrška u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da tražite od Vašeg sistem administratora da je instalira.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju:</b> \"%s\" nije instaliran. Monitranje %s nije moguće. Molimo Vas da se obratite Vašem sistem administratoru da to instalira.",
@@ -64,8 +47,8 @@ OC.L10N.register(
     "Folder name" : "Ime fascikle",
     "Configuration" : "Podešavanje",
     "Available for" : "Dostupno za",
-    "Add storage" : "Dodaj skladište",
     "Delete" : "Obriši",
+    "Add storage" : "Dodaj skladište",
     "Enable User External Storage" : "Omogući korisničko spoljašnje skladište",
     "Allow users to mount the following external storage" : "Omogući korisnicima da namontiraju sledeće spoljašnje skladište"
 },
diff --git a/apps/files_external/l10n/sr@latin.json b/apps/files_external/l10n/sr@latin.json
index 2dfab1ba06..72fc20844b 100644
--- a/apps/files_external/l10n/sr@latin.json
+++ b/apps/files_external/l10n/sr@latin.json
@@ -1,57 +1,40 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Dobavljanje detalja zahteva nije uspelo. Proverite da li su Vaš ključ aplikacije za Dropbox i tajna lozinka ispravni.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Dobavljanje detalja pristupa nije uspelo. Proverite da li su Vaš Dropbox ključ aplikacije i tajna lozinka ispravni.",
-    "Please provide a valid Dropbox app key and secret." : "Molimo unesite ispravan Dropbox ključ aplikacije i tajnu lozinku.",
     "Step 1 failed. Exception: %s" : "Korak 1 nije uspeo. Izuzetak: %s",
     "Step 2 failed. Exception: %s" : "Korak 2 nije uspeo. Izuzetak: %s",
     "External storage" : "Spoljašnje skladište",
-    "Local" : "Lokalno",
-    "Location" : "Lokacija",
+    "Personal" : "Lično",
+    "System" : "Sistemsko",
+    "Grant access" : "Dozvoli pristup",
+    "Access granted" : "Pristup Dozvoljen",
+    "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.",
+    "(group)" : "(grupa)",
+    "Saved" : "Sačuvano",
+    "App key" : "Ključ Aplikacije",
+    "App secret" : "Tajna lozinka Aplikacije",
+    "Client ID" : "Identifikator klijenta",
+    "Client secret" : "Tajna lozinka klijenta",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ključ",
-    "Secret" : "Tajna lozinka",
     "Bucket" : "Korpa",
-    "Amazon S3 and compliant" : "Amazon S3 i kompatibilni",
-    "Access Key" : "Pristupni Ključ",
-    "Secret Key" : "Tajni Ključ",
     "Hostname" : "Ime računara",
     "Port" : "Port",
     "Region" : "Regija",
     "Enable SSL" : "Uključi SSL",
     "Enable Path Style" : "Omogući stil putanje",
-    "App key" : "Ključ Aplikacije",
-    "App secret" : "Tajna lozinka Aplikacije",
-    "Host" : "Računar",
-    "Username" : "Korisničko ime",
-    "Password" : "Lozinka",
-    "Remote subfolder" : "Udaljeni poddirektorijum",
-    "Secure ftps://" : "Sigurni ftps://",
-    "Client ID" : "Identifikator klijenta",
-    "Client secret" : "Tajna lozinka klijenta",
-    "OpenStack Object Storage" : "OpenStack skladište objekata",
-    "Region (optional for OpenStack Object Storage)" : "Region (opciono za OpenStack skladište objekata)",
-    "API Key (required for Rackspace Cloud Files)" : "API ključ (neophodno za Rackspace datoteke u oblaku)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ime stanara (neophodno za OpenStack skladište objekata)",
-    "Password (required for OpenStack Object Storage)" : "Lozinka (neophodno za OpenStack skladište objekata)",
-    "Service Name (required for OpenStack Object Storage)" : "Ime Servisa (neophodno za OpenStack skladište objekata)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje tačke identiteta (neophodno za OpenStack skladište objekata)",
-    "Timeout of HTTP requests in seconds" : "Ograničenje vremena veze HTTP zahteva u sekundama",
-    "Share" : "Podeli",
-    "SMB / CIFS using OC login" : "SMB / CIFS koji koristi OC prijavljivanje",
-    "Username as share" : "Korisničko ime i deljeni direktorijum",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Udaljeni poddirektorijum",
     "Secure https://" : "Sigurni https://",
-    "Access granted" : "Pristup Dozvoljen",
-    "Error configuring Dropbox storage" : "Greška u podešavanju Dropbox skladišta",
-    "Grant access" : "Dozvoli pristup",
-    "Error configuring Google Drive storage" : "Greška u podešavanju Google Disk skladišta",
-    "Personal" : "Lično",
-    "System" : "Sistemsko",
-    "All users. Type to select user or group." : "Svi korisnici. Kucajte da biste izabrali korisnika ili grupu.",
-    "(group)" : "(grupa)",
-    "Saved" : "Sačuvano",
+    "Host" : "Računar",
+    "Secure ftps://" : "Sigurni ftps://",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "Root" : "Koren",
+    "Share" : "Podeli",
+    "Username as share" : "Korisničko ime i deljeni direktorijum",
+    "OpenStack Object Storage" : "OpenStack skladište objekata",
     "<b>Note:</b> " : "<b>Obratite pažnju:</b>",
-    "and" : "i",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju</b> Podrška za cURL u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da se obratite Vašem sistem administratoru da je instalira.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju:</b> FTP podrška u PHP-u nije uključena ili instalirana. Montiranje %s nije moguće. Molimo Vas da tražite od Vašeg sistem administratora da je instalira.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Obratite pažnju:</b> \"%s\" nije instaliran. Monitranje %s nije moguće. Molimo Vas da se obratite Vašem sistem administratoru da to instalira.",
@@ -62,8 +45,8 @@
     "Folder name" : "Ime fascikle",
     "Configuration" : "Podešavanje",
     "Available for" : "Dostupno za",
-    "Add storage" : "Dodaj skladište",
     "Delete" : "Obriši",
+    "Add storage" : "Dodaj skladište",
     "Enable User External Storage" : "Omogući korisničko spoljašnje skladište",
     "Allow users to mount the following external storage" : "Omogući korisnicima da namontiraju sledeće spoljašnje skladište"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_external/l10n/sv.js b/apps/files_external/l10n/sv.js
index 3a3f321297..08175a5656 100644
--- a/apps/files_external/l10n/sv.js
+++ b/apps/files_external/l10n/sv.js
@@ -1,60 +1,47 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta access tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta request tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
-    "Please provide a valid Dropbox app key and secret." : "Ange en giltig Dropbox nyckel och hemlighet.",
     "Step 1 failed. Exception: %s" : "Steg 1 flaerade. Undantag: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 falerade. Undantag: %s",
     "External storage" : "Extern lagring",
-    "Local" : "Lokal",
-    "Location" : "Plats",
+    "Personal" : "Personligt",
+    "System" : "System",
+    "Grant access" : "Bevilja åtkomst",
+    "Access granted" : "Åtkomst beviljad",
+    "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.",
+    "(group)" : "(grupp)",
+    "Saved" : "Sparad",
+    "None" : "Ingen",
+    "App key" : "App-nyckel",
+    "App secret" : "App-hemlighet",
+    "Client ID" : "Klient ID",
+    "Client secret" : "klient secret",
+    "Username" : "Användarnamn",
+    "Password" : "Lösenord",
+    "API key" : "API-nyckel",
+    "Public key" : "Publik nyckel",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Nyckel",
-    "Secret" : "Hemlig",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 och compliant",
-    "Access Key" : "Accessnyckel",
-    "Secret Key" : "Hemlig nyckel",
     "Hostname" : "Värdnamn",
     "Port" : "Port",
     "Region" : "Län",
     "Enable SSL" : "Aktivera SSL",
     "Enable Path Style" : "Aktivera Path Style",
-    "App key" : "App-nyckel",
-    "App secret" : "App-hemlighet",
-    "Host" : "Server",
-    "Username" : "Användarnamn",
-    "Password" : "Lösenord",
-    "Remote subfolder" : "Fjärrmapp",
-    "Secure ftps://" : "Säker ftps://",
-    "Client ID" : "Klient ID",
-    "Client secret" : "klient secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (valfritt för OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nyckel (krävs för Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (krävs för OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Lösenord (krävs för OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjänstens namn (krävs för OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL för identitetens slutpunkt (krävs för OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout för HTTP-anrop i sekunder",
-    "Share" : "Dela",
-    "SMB / CIFS using OC login" : "SMB / CIFS använder OC inloggning",
-    "Username as share" : "Användarnamn till utdelning",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Fjärrmapp",
     "Secure https://" : "Säker https://",
-    "Public key" : "Publik nyckel",
-    "Access granted" : "Åtkomst beviljad",
-    "Error configuring Dropbox storage" : "Fel vid konfigurering av Dropbox",
-    "Grant access" : "Bevilja åtkomst",
-    "Error configuring Google Drive storage" : "Fel vid konfigurering av Google Drive",
-    "Personal" : "Personligt",
-    "System" : "System",
-    "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.",
-    "(group)" : "(grupp)",
-    "Saved" : "Sparad",
+    "Dropbox" : "Dropbox",
+    "Host" : "Server",
+    "Secure ftps://" : "Säker ftps://",
+    "Local" : "Lokal",
+    "Location" : "Plats",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Dela",
+    "Username as share" : "Användarnamn till utdelning",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b> OBS: </ b>",
-    "and" : "och",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> cURL-stöd i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> FTP-stödet i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> \"%s\" är inte installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
@@ -65,8 +52,8 @@ OC.L10N.register(
     "Folder name" : "Mappnamn",
     "Configuration" : "Konfiguration",
     "Available for" : "Tillgänglig för",
-    "Add storage" : "Lägg till lagring",
     "Delete" : "Radera",
+    "Add storage" : "Lägg till lagring",
     "Enable User External Storage" : "Aktivera extern lagring för användare",
     "Allow users to mount the following external storage" : "Tillåt användare att montera följande extern lagring"
 },
diff --git a/apps/files_external/l10n/sv.json b/apps/files_external/l10n/sv.json
index 7a80077545..c44ad337ab 100644
--- a/apps/files_external/l10n/sv.json
+++ b/apps/files_external/l10n/sv.json
@@ -1,58 +1,45 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta access tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta request tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
-    "Please provide a valid Dropbox app key and secret." : "Ange en giltig Dropbox nyckel och hemlighet.",
     "Step 1 failed. Exception: %s" : "Steg 1 flaerade. Undantag: %s",
     "Step 2 failed. Exception: %s" : "Steg 2 falerade. Undantag: %s",
     "External storage" : "Extern lagring",
-    "Local" : "Lokal",
-    "Location" : "Plats",
+    "Personal" : "Personligt",
+    "System" : "System",
+    "Grant access" : "Bevilja åtkomst",
+    "Access granted" : "Åtkomst beviljad",
+    "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.",
+    "(group)" : "(grupp)",
+    "Saved" : "Sparad",
+    "None" : "Ingen",
+    "App key" : "App-nyckel",
+    "App secret" : "App-hemlighet",
+    "Client ID" : "Klient ID",
+    "Client secret" : "klient secret",
+    "Username" : "Användarnamn",
+    "Password" : "Lösenord",
+    "API key" : "API-nyckel",
+    "Public key" : "Publik nyckel",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Nyckel",
-    "Secret" : "Hemlig",
     "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 och compliant",
-    "Access Key" : "Accessnyckel",
-    "Secret Key" : "Hemlig nyckel",
     "Hostname" : "Värdnamn",
     "Port" : "Port",
     "Region" : "Län",
     "Enable SSL" : "Aktivera SSL",
     "Enable Path Style" : "Aktivera Path Style",
-    "App key" : "App-nyckel",
-    "App secret" : "App-hemlighet",
-    "Host" : "Server",
-    "Username" : "Användarnamn",
-    "Password" : "Lösenord",
-    "Remote subfolder" : "Fjärrmapp",
-    "Secure ftps://" : "Säker ftps://",
-    "Client ID" : "Klient ID",
-    "Client secret" : "klient secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Region (valfritt för OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API-nyckel (krävs för Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (krävs för OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Lösenord (krävs för OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Tjänstens namn (krävs för OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL för identitetens slutpunkt (krävs för OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Timeout för HTTP-anrop i sekunder",
-    "Share" : "Dela",
-    "SMB / CIFS using OC login" : "SMB / CIFS använder OC inloggning",
-    "Username as share" : "Användarnamn till utdelning",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Fjärrmapp",
     "Secure https://" : "Säker https://",
-    "Public key" : "Publik nyckel",
-    "Access granted" : "Åtkomst beviljad",
-    "Error configuring Dropbox storage" : "Fel vid konfigurering av Dropbox",
-    "Grant access" : "Bevilja åtkomst",
-    "Error configuring Google Drive storage" : "Fel vid konfigurering av Google Drive",
-    "Personal" : "Personligt",
-    "System" : "System",
-    "All users. Type to select user or group." : "Alla användare. Skriv för att välja användare eller grupp.",
-    "(group)" : "(grupp)",
-    "Saved" : "Sparad",
+    "Dropbox" : "Dropbox",
+    "Host" : "Server",
+    "Secure ftps://" : "Säker ftps://",
+    "Local" : "Lokal",
+    "Location" : "Plats",
+    "ownCloud" : "ownCloud",
+    "Root" : "Root",
+    "Share" : "Dela",
+    "Username as share" : "Användarnamn till utdelning",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b> OBS: </ b>",
-    "and" : "och",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> cURL-stöd i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> FTP-stödet i PHP inte är aktiverat eller installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> \"%s\" är inte installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
@@ -63,8 +50,8 @@
     "Folder name" : "Mappnamn",
     "Configuration" : "Konfiguration",
     "Available for" : "Tillgänglig för",
-    "Add storage" : "Lägg till lagring",
     "Delete" : "Radera",
+    "Add storage" : "Lägg till lagring",
     "Enable User External Storage" : "Aktivera extern lagring för användare",
     "Allow users to mount the following external storage" : "Tillåt användare att montera följande extern lagring"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/ta_LK.js b/apps/files_external/l10n/ta_LK.js
index 274f2dcf34..382d5e943a 100644
--- a/apps/files_external/l10n/ta_LK.js
+++ b/apps/files_external/l10n/ta_LK.js
@@ -1,20 +1,19 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. ",
-    "Location" : "இடம்",
-    "Port" : "துறை ",
-    "Region" : "பிரதேசம்",
-    "Host" : "ஓம்புனர்",
+    "Personal" : "தனிப்பட்ட",
+    "Grant access" : "அனுமதியை வழங்கல்",
+    "Access granted" : "அனுமதி வழங்கப்பட்டது",
+    "None" : "ஒன்றுமில்லை",
     "Username" : "பயனாளர் பெயர்",
     "Password" : "கடவுச்சொல்",
-    "Share" : "பகிர்வு",
+    "Port" : "துறை ",
+    "Region" : "பிரதேசம்",
     "URL" : "URL",
-    "Access granted" : "அனுமதி வழங்கப்பட்டது",
-    "Error configuring Dropbox storage" : "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
-    "Grant access" : "அனுமதியை வழங்கல்",
-    "Error configuring Google Drive storage" : "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு",
-    "Personal" : "தனிப்பட்ட",
+    "Host" : "ஓம்புனர்",
+    "Location" : "இடம்",
+    "ownCloud" : "OwnCloud",
+    "Share" : "பகிர்வு",
     "Name" : "பெயர்",
     "External Storage" : "வெளி சேமிப்பு",
     "Folder name" : "கோப்புறை பெயர்",
diff --git a/apps/files_external/l10n/ta_LK.json b/apps/files_external/l10n/ta_LK.json
index 6d9b600b56..c838cbe017 100644
--- a/apps/files_external/l10n/ta_LK.json
+++ b/apps/files_external/l10n/ta_LK.json
@@ -1,18 +1,17 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. ",
-    "Location" : "இடம்",
-    "Port" : "துறை ",
-    "Region" : "பிரதேசம்",
-    "Host" : "ஓம்புனர்",
+    "Personal" : "தனிப்பட்ட",
+    "Grant access" : "அனுமதியை வழங்கல்",
+    "Access granted" : "அனுமதி வழங்கப்பட்டது",
+    "None" : "ஒன்றுமில்லை",
     "Username" : "பயனாளர் பெயர்",
     "Password" : "கடவுச்சொல்",
-    "Share" : "பகிர்வு",
+    "Port" : "துறை ",
+    "Region" : "பிரதேசம்",
     "URL" : "URL",
-    "Access granted" : "அனுமதி வழங்கப்பட்டது",
-    "Error configuring Dropbox storage" : "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
-    "Grant access" : "அனுமதியை வழங்கல்",
-    "Error configuring Google Drive storage" : "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு",
-    "Personal" : "தனிப்பட்ட",
+    "Host" : "ஓம்புனர்",
+    "Location" : "இடம்",
+    "ownCloud" : "OwnCloud",
+    "Share" : "பகிர்வு",
     "Name" : "பெயர்",
     "External Storage" : "வெளி சேமிப்பு",
     "Folder name" : "கோப்புறை பெயர்",
diff --git a/apps/files_external/l10n/te.js b/apps/files_external/l10n/te.js
index b1f0e091c2..155676d9a8 100644
--- a/apps/files_external/l10n/te.js
+++ b/apps/files_external/l10n/te.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "files_external",
     {
+    "Personal" : "వ్యక్తిగతం",
     "Username" : "వాడుకరి పేరు",
     "Password" : "సంకేతపదం",
-    "Personal" : "వ్యక్తిగతం",
     "Name" : "పేరు",
     "Folder name" : "సంచయం పేరు",
     "Delete" : "తొలగించు"
diff --git a/apps/files_external/l10n/te.json b/apps/files_external/l10n/te.json
index 4a6f3caba8..5a55f60376 100644
--- a/apps/files_external/l10n/te.json
+++ b/apps/files_external/l10n/te.json
@@ -1,7 +1,7 @@
 { "translations": {
+    "Personal" : "వ్యక్తిగతం",
     "Username" : "వాడుకరి పేరు",
     "Password" : "సంకేతపదం",
-    "Personal" : "వ్యక్తిగతం",
     "Name" : "పేరు",
     "Folder name" : "సంచయం పేరు",
     "Delete" : "తొలగించు"
diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js
index ba2271f5f8..34c1f74ecf 100644
--- a/apps/files_external/l10n/th_TH.js
+++ b/apps/files_external/l10n/th_TH.js
@@ -1,59 +1,29 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "ร้องขอโทเค็นล้มเหลว กรุณาตรวจสอบแอพฯคีย์และ Secret ของ Dropbox ของคุณว่าถูกต้องหรือไม่",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "โทเค็นการเข้าถึงล้มเหลว กรุณาตรวจสอบแอพฯคีย์และ Secret ของ Dropbox ของคุณว่าถูกต้องหรือไม่",
-    "Please provide a valid Dropbox app key and secret." : "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับให้ถูกต้อง",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
+    "Please provide a valid app key and secret." : "โปรดระบุคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
     "Step 1 failed. Exception: %s" : "ขั้นตอนที่ 1 ล้มเหลว ข้อยกเว้น: %s",
     "Step 2 failed. Exception: %s" : "ขั้นตอนที่ 2 ล้มเหลว ข้อยกเว้น: %s",
     "External storage" : "จัดเก็บข้อมูลภายนอก",
-    "Local" : "ต้นทาง",
-    "Location" : "ตำแหน่งที่อยู่",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "รหัส",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 และ Compliant",
-    "Access Key" : "รหัสการเข้าถึง",
-    "Secret Key" : "รหัสลับ",
-    "Hostname" : "ชื่อโฮสต์",
-    "Port" : "พอร์ต",
-    "Region" : "พื้นที่",
-    "Enable SSL" : "เปิดใช้งาน SSL",
-    "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "โฮสต์",
-    "Username" : "ชื่อผู้ใช้งาน",
-    "Password" : "รหัสผ่าน",
-    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
-    "Secure ftps://" : "โหมดปลอดภัย ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "ภูมิภาค (จำเป็นสำหรับ OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (จำเป็นสำหรับ Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "ชื่อผู้เช่า (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "รหัสผ่าน (ที่จำเป็นสำหรับ OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "ชื่อบริการ (จำเป็นสำหรับ OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "ตัวตนของ URL ปลายทาง (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "หมดเวลาของการร้องขอ HTTP ในไม่กี่วินาที",
-    "Share" : "แชร์",
-    "SMB / CIFS using OC login" : "SMB/CIFS กำลังใช้ OC เข้าสู่ระบบ",
-    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
-    "URL" : "URL",
-    "Secure https://" : "โหมดปลอดภัย https://",
-    "SFTP with secret key login" : "SFTP กับคีย์ลับสำหรับเข้าสู่ระบบ",
-    "Public key" : "คีย์สาธารณะ",
     "Storage with id \"%i\" not found" : "ไม่พบจัดการเก็บข้อมูลของ ID \"%i\"",
+    "Invalid backend or authentication mechanism class" : "แบ็กเอนด์ไม่ถูกต้องหรือระดับการรับรองความถูกต้องไม่เพียงพอ",
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
+    "Objectstore forbidden" : "เก็บวัตถุต้องห้าม",
     "Invalid storage backend \"%s\"" : "การจัดเก็บข้อมูลแบ็กเอนด์ไม่ถูกต้อง \"%s\"",
-    "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
-    "Error configuring Dropbox storage" : "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox",
-    "Grant access" : "อนุญาตให้เข้าถึงได้",
-    "Error configuring Google Drive storage" : "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive",
+    "Not permitted to use backend \"%s\"" : "ไม่อนุญาตให้ใช้แบ็กเอนด์ \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "ไม่อนุญาตให้ตรวจสอบการรับรองความถูกต้อง \"%s\"",
+    "Unsatisfied backend parameters" : "พารามิเตอร์แบ็กเอนด์ไม่ได้รับอนุญาต",
+    "Unsatisfied authentication mechanism parameters" : "การรับรองความถูกต้องไม่เพียงพอ",
     "Personal" : "ส่วนตัว",
     "System" : "ระบบ",
+    "Grant access" : "อนุญาตให้เข้าถึงได้",
+    "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
+    "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1",
+    "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2",
+    "Generate keys" : "สร้างคีย์",
+    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "Enable previews" : "เปิดใช้งานการแสดงตัวอย่าง",
     "Check for changes" : "ตรวจสอบการเปลี่ยนแปลง",
@@ -63,10 +33,57 @@ OC.L10N.register(
     "All users. Type to select user or group." : "ผู้ใช้ทุกคน พิมพ์เพื่อเลือกผู้ใช้หรือกลุ่ม",
     "(group)" : "(กลุ่ม)",
     "Saved" : "บันทึกแล้ว",
-    "Generate keys" : "สร้างคีย์",
-    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
+    "Access key" : "คีย์การเข้าถึง",
+    "Secret key" : "คีย์ลับ",
+    "Builtin" : "ในตัว",
+    "None" : "ไม่มี",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack" : "OpenStack",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Password" : "รหัสผ่าน",
+    "Tenant name" : "ชื่อผู้เช่า",
+    "Identity endpoint URL" : "ตัวตนของ URL ปลายทาง",
+    "Rackspace" : "Rackspace",
+    "API key" : "รหัส API",
+    "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
+    "Session credentials" : "ข้อมูลของเซสชั่น",
+    "RSA public key" : "RSA คีย์สาธารณะ",
+    "Public key" : "คีย์สาธารณะ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "ชื่อโฮสต์",
+    "Port" : "พอร์ต",
+    "Region" : "พื้นที่",
+    "Enable SSL" : "เปิดใช้งาน SSL",
+    "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
+    "Secure https://" : "โหมดปลอดภัย https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "โฮสต์",
+    "Secure ftps://" : "โหมดปลอดภัย ftps://",
+    "Google Drive" : "กูเกิ้ลไดร์ฟ",
+    "Local" : "ต้นทาง",
+    "Location" : "ตำแหน่งที่อยู่",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "รูท",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP กับรหัสลับเข้าสู่ระบบ [ยกเลิก]",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "แชร์",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS กำลังใช้ OC เข้าสู่ระบบ [ยกเลิก]",
+    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "ชื่อบริการ",
+    "Request timeout (seconds)" : "หมดเวลาการร้องขอ (วินาที)",
     "<b>Note:</b> " : "<b>หมายเหตุ:</b>",
-    "and" : "และ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน FTP ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> %s ไม่ได้ติดตั้ง การติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
@@ -77,11 +94,12 @@ OC.L10N.register(
     "Scope" : "ขอบเขต",
     "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
     "Folder name" : "ชื่อโฟลเดอร์",
+    "Authentication" : "รับรองความถูกต้อง",
     "Configuration" : "การกำหนดค่า",
     "Available for" : "สามารถใช้ได้สำหรับ",
-    "Add storage" : "เพิ่มพื้นที่จัดเก็บข้อมูล",
     "Advanced settings" : "ตั้งค่าขั้นสูง",
     "Delete" : "ลบ",
+    "Add storage" : "เพิ่มพื้นที่จัดเก็บข้อมูล",
     "Enable User External Storage" : "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้",
     "Allow users to mount the following external storage" : "อนุญาตให้ผู้ใช้ติดตั้งจัดเก็บข้อมูลภายนอกต่อไปนี้"
 },
diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json
index 957cc5570c..cb18b221c4 100644
--- a/apps/files_external/l10n/th_TH.json
+++ b/apps/files_external/l10n/th_TH.json
@@ -1,57 +1,27 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "ร้องขอโทเค็นล้มเหลว กรุณาตรวจสอบแอพฯคีย์และ Secret ของ Dropbox ของคุณว่าถูกต้องหรือไม่",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "โทเค็นการเข้าถึงล้มเหลว กรุณาตรวจสอบแอพฯคีย์และ Secret ของ Dropbox ของคุณว่าถูกต้องหรือไม่",
-    "Please provide a valid Dropbox app key and secret." : "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับให้ถูกต้อง",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "การเรียกร้องขอโทเคนล้มเหลว โปรดตรวจสอบคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
+    "Please provide a valid app key and secret." : "โปรดระบุคีย์และรหัสลับของแอพฯ ให้ถูกต้อง",
     "Step 1 failed. Exception: %s" : "ขั้นตอนที่ 1 ล้มเหลว ข้อยกเว้น: %s",
     "Step 2 failed. Exception: %s" : "ขั้นตอนที่ 2 ล้มเหลว ข้อยกเว้น: %s",
     "External storage" : "จัดเก็บข้อมูลภายนอก",
-    "Local" : "ต้นทาง",
-    "Location" : "ตำแหน่งที่อยู่",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "รหัส",
-    "Secret" : "Secret",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 และ Compliant",
-    "Access Key" : "รหัสการเข้าถึง",
-    "Secret Key" : "รหัสลับ",
-    "Hostname" : "ชื่อโฮสต์",
-    "Port" : "พอร์ต",
-    "Region" : "พื้นที่",
-    "Enable SSL" : "เปิดใช้งาน SSL",
-    "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง",
-    "App key" : "App key",
-    "App secret" : "App secret",
-    "Host" : "โฮสต์",
-    "Username" : "ชื่อผู้ใช้งาน",
-    "Password" : "รหัสผ่าน",
-    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
-    "Secure ftps://" : "โหมดปลอดภัย ftps://",
-    "Client ID" : "Client ID",
-    "Client secret" : "Client secret",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "ภูมิภาค (จำเป็นสำหรับ OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "API Key (จำเป็นสำหรับ Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "ชื่อผู้เช่า (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "รหัสผ่าน (ที่จำเป็นสำหรับ OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "ชื่อบริการ (จำเป็นสำหรับ OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "ตัวตนของ URL ปลายทาง (จำเป็นสำหรับ OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "หมดเวลาของการร้องขอ HTTP ในไม่กี่วินาที",
-    "Share" : "แชร์",
-    "SMB / CIFS using OC login" : "SMB/CIFS กำลังใช้ OC เข้าสู่ระบบ",
-    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
-    "URL" : "URL",
-    "Secure https://" : "โหมดปลอดภัย https://",
-    "SFTP with secret key login" : "SFTP กับคีย์ลับสำหรับเข้าสู่ระบบ",
-    "Public key" : "คีย์สาธารณะ",
     "Storage with id \"%i\" not found" : "ไม่พบจัดการเก็บข้อมูลของ ID \"%i\"",
+    "Invalid backend or authentication mechanism class" : "แบ็กเอนด์ไม่ถูกต้องหรือระดับการรับรองความถูกต้องไม่เพียงพอ",
     "Invalid mount point" : "จุดเชื่อมต่อที่ไม่ถูกต้อง",
+    "Objectstore forbidden" : "เก็บวัตถุต้องห้าม",
     "Invalid storage backend \"%s\"" : "การจัดเก็บข้อมูลแบ็กเอนด์ไม่ถูกต้อง \"%s\"",
-    "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
-    "Error configuring Dropbox storage" : "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox",
-    "Grant access" : "อนุญาตให้เข้าถึงได้",
-    "Error configuring Google Drive storage" : "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive",
+    "Not permitted to use backend \"%s\"" : "ไม่อนุญาตให้ใช้แบ็กเอนด์ \"%s\"",
+    "Not permitted to use authentication mechanism \"%s\"" : "ไม่อนุญาตให้ตรวจสอบการรับรองความถูกต้อง \"%s\"",
+    "Unsatisfied backend parameters" : "พารามิเตอร์แบ็กเอนด์ไม่ได้รับอนุญาต",
+    "Unsatisfied authentication mechanism parameters" : "การรับรองความถูกต้องไม่เพียงพอ",
     "Personal" : "ส่วนตัว",
     "System" : "ระบบ",
+    "Grant access" : "อนุญาตให้เข้าถึงได้",
+    "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
+    "Error configuring OAuth1" : "ข้อผิดพลาดในการกำหนดค่า OAuth1",
+    "Error configuring OAuth2" : "ข้อผิดพลาดในการกำหนดค่า OAuth2",
+    "Generate keys" : "สร้างคีย์",
+    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "Enable previews" : "เปิดใช้งานการแสดงตัวอย่าง",
     "Check for changes" : "ตรวจสอบการเปลี่ยนแปลง",
@@ -61,10 +31,57 @@
     "All users. Type to select user or group." : "ผู้ใช้ทุกคน พิมพ์เพื่อเลือกผู้ใช้หรือกลุ่ม",
     "(group)" : "(กลุ่ม)",
     "Saved" : "บันทึกแล้ว",
-    "Generate keys" : "สร้างคีย์",
-    "Error generating key pair" : "ข้อผิดพลาดในการสร้างคีย์แบบเป็นคู่",
+    "Access key" : "คีย์การเข้าถึง",
+    "Secret key" : "คีย์ลับ",
+    "Builtin" : "ในตัว",
+    "None" : "ไม่มี",
+    "OAuth1" : "OAuth1",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack" : "OpenStack",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Password" : "รหัสผ่าน",
+    "Tenant name" : "ชื่อผู้เช่า",
+    "Identity endpoint URL" : "ตัวตนของ URL ปลายทาง",
+    "Rackspace" : "Rackspace",
+    "API key" : "รหัส API",
+    "Username and password" : "ชื่อผู้ใช้และรหัสผ่าน",
+    "Session credentials" : "ข้อมูลของเซสชั่น",
+    "RSA public key" : "RSA คีย์สาธารณะ",
+    "Public key" : "คีย์สาธารณะ",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "ชื่อโฮสต์",
+    "Port" : "พอร์ต",
+    "Region" : "พื้นที่",
+    "Enable SSL" : "เปิดใช้งาน SSL",
+    "Enable Path Style" : "เปิดใช้งานสไตล์เส้นทาง",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "โฟลเดอร์ย่อยระยะไกล",
+    "Secure https://" : "โหมดปลอดภัย https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "โฮสต์",
+    "Secure ftps://" : "โหมดปลอดภัย ftps://",
+    "Google Drive" : "กูเกิ้ลไดร์ฟ",
+    "Local" : "ต้นทาง",
+    "Location" : "ตำแหน่งที่อยู่",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "รูท",
+    "SFTP with secret key login [DEPRECATED]" : "SFTP กับรหัสลับเข้าสู่ระบบ [ยกเลิก]",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "แชร์",
+    "SMB / CIFS using OC login [DEPRECATED]" : "SMB / CIFS กำลังใช้ OC เข้าสู่ระบบ [ยกเลิก]",
+    "Username as share" : "ชื่อผู้ใช้ที่แชร์",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Service name" : "ชื่อบริการ",
+    "Request timeout (seconds)" : "หมดเวลาการร้องขอ (วินาที)",
     "<b>Note:</b> " : "<b>หมายเหตุ:</b>",
-    "and" : "และ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน FTP ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> %s ไม่ได้ติดตั้ง การติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน",
@@ -75,11 +92,12 @@
     "Scope" : "ขอบเขต",
     "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
     "Folder name" : "ชื่อโฟลเดอร์",
+    "Authentication" : "รับรองความถูกต้อง",
     "Configuration" : "การกำหนดค่า",
     "Available for" : "สามารถใช้ได้สำหรับ",
-    "Add storage" : "เพิ่มพื้นที่จัดเก็บข้อมูล",
     "Advanced settings" : "ตั้งค่าขั้นสูง",
     "Delete" : "ลบ",
+    "Add storage" : "เพิ่มพื้นที่จัดเก็บข้อมูล",
     "Enable User External Storage" : "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้",
     "Allow users to mount the following external storage" : "อนุญาตให้ผู้ใช้ติดตั้งจัดเก็บข้อมูลภายนอกต่อไปนี้"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js
index afd80de3b6..652bc61186 100644
--- a/apps/files_external/l10n/tr.js
+++ b/apps/files_external/l10n/tr.js
@@ -1,59 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "İstek belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Erişim belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
-    "Please provide a valid Dropbox app key and secret." : "Lütfen Dropbox app key ve secret temin ediniz",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Getirme istek jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Getirme erişim jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Please provide a valid app key and secret." : "Lütfen geçerli bir uygulama anahtarı ve gizli bilgisini girin.",
     "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
     "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
     "External storage" : "Harici depolama",
-    "Local" : "Yerel",
-    "Location" : "Konum",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Anahtar",
-    "Secret" : "Parola",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 ve uyumlu olanlar",
-    "Access Key" : "Erişim Anahtarı",
-    "Secret Key" : "Gizli Anahtar",
-    "Hostname" : "Makine adı",
-    "Port" : "Port",
-    "Region" : "Bölge",
-    "Enable SSL" : "SSL'yi Etkinleştir",
-    "Enable Path Style" : "Yol Biçemini Etkinleştir",
-    "App key" : "Uyg. anahtarı",
-    "App secret" : "Uyg. parolası",
-    "Host" : "Sunucu",
-    "Username" : "Kullanıcı Adı",
-    "Password" : "Parola",
-    "Remote subfolder" : "Uzak alt klasör",
-    "Secure ftps://" : "Güvenli ftps://",
-    "Client ID" : "İstemci kimliği",
-    "Client secret" : "İstemci parolası",
-    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
-    "Region (optional for OpenStack Object Storage)" : "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)",
-    "API Key (required for Rackspace Cloud Files)" : "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)",
-    "Password (required for OpenStack Object Storage)" : "Parola (OpenStack Nesne Depolaması için gerekli)",
-    "Service Name (required for OpenStack Object Storage)" : "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)",
-    "Timeout of HTTP requests in seconds" : "Saniye cinsinden HTTP istek zaman aşımı",
-    "Share" : "Paylaş",
-    "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
-    "Username as share" : "Paylaşım olarak kullanıcı adı",
-    "URL" : "URL",
-    "Secure https://" : "Güvenli https://",
-    "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
-    "Public key" : "Ortak anahtar",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
+    "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
+    "Objectstore forbidden" : "Nesne deposu yasaktır",
     "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"",
-    "Access granted" : "Giriş kabul edildi",
-    "Error configuring Dropbox storage" : "Dropbox depo yapılandırma hatası",
-    "Grant access" : "Erişimi sağla",
-    "Error configuring Google Drive storage" : "Google Drive depo yapılandırma hatası",
+    "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri",
+    "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri",
     "Personal" : "Kişisel",
     "System" : "Sistem",
+    "Grant access" : "Erişimi sağla",
+    "Access granted" : "Giriş kabul edildi",
+    "Error configuring OAuth1" : "OAuth1 yapılandırma hatası",
+    "Error configuring OAuth2" : "OAuth2 yapılandırma hatası",
+    "Generate keys" : "Anahtarlar üret",
+    "Error generating key pair" : "Anahtar çifti üretirken hata",
     "Enable encryption" : "Şifrelemeyi aç",
     "Enable previews" : "Önizlemeleri aç",
     "Check for changes" : "Değişiklikleri denetle",
@@ -63,10 +31,48 @@ OC.L10N.register(
     "All users. Type to select user or group." : "Tüm kullanıcılar. Kullanıcı veya grup seçmek için yazın.",
     "(group)" : "(grup)",
     "Saved" : "Kaydedildi",
-    "Generate keys" : "Anahtarlar üret",
-    "Error generating key pair" : "Anahtar çifti üretirken hata",
+    "Access key" : "Erişim anahtarı",
+    "Secret key" : "Gizli anahtar",
+    "Builtin" : "Yerleşik",
+    "None" : "Hiçbiri",
+    "OAuth1" : "OAuth1",
+    "App key" : "Uyg. anahtarı",
+    "App secret" : "Uyg. parolası",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "İstemci kimliği",
+    "Client secret" : "İstemci parolası",
+    "Username" : "Kullanıcı Adı",
+    "Password" : "Parola",
+    "API key" : "API anahtarı",
+    "Username and password" : "Kullanıcı adı ve parola",
+    "Session credentials" : "Oturum bilgileri",
+    "Public key" : "Ortak anahtar",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Makine adı",
+    "Port" : "Port",
+    "Region" : "Bölge",
+    "Enable SSL" : "SSL'yi Etkinleştir",
+    "Enable Path Style" : "Yol Biçemini Etkinleştir",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Uzak alt klasör",
+    "Secure https://" : "Güvenli https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Sunucu",
+    "Secure ftps://" : "Güvenli ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Yerel",
+    "Location" : "Konum",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Kök",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Paylaş",
+    "Username as share" : "Paylaşım olarak kullanıcı adı",
+    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
     "<b>Note:</b> " : "<b>Not:</b> ",
-    "and" : "ve",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> \"%s\" kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
@@ -77,11 +83,12 @@ OC.L10N.register(
     "Scope" : "Kapsam",
     "External Storage" : "Harici Depolama",
     "Folder name" : "Klasör ismi",
+    "Authentication" : "Kimlik Doğrulama",
     "Configuration" : "Yapılandırma",
     "Available for" : "Kullanabilenler",
-    "Add storage" : "Depo ekle",
     "Advanced settings" : "Gelişmiş ayarlar",
     "Delete" : "Sil",
+    "Add storage" : "Depo ekle",
     "Enable User External Storage" : "Kullanıcılar için Harici Depolamayı Etkinleştir",
     "Allow users to mount the following external storage" : "Kullanıcıların aşağıdaki harici depolamayı bağlamalarına izin ver"
 },
diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json
index 07fa89651d..328ecab466 100644
--- a/apps/files_external/l10n/tr.json
+++ b/apps/files_external/l10n/tr.json
@@ -1,57 +1,25 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "İstek belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Erişim belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
-    "Please provide a valid Dropbox app key and secret." : "Lütfen Dropbox app key ve secret temin ediniz",
+    "Fetching request tokens failed. Verify that your app key and secret are correct." : "Getirme istek jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Fetching access tokens failed. Verify that your app key and secret are correct." : "Getirme erişim jetonları başarısız oldu. Uygulama anahtarınızın ve gizli bilginin doğruluğunu kontrol edin.",
+    "Please provide a valid app key and secret." : "Lütfen geçerli bir uygulama anahtarı ve gizli bilgisini girin.",
     "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
     "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
     "External storage" : "Harici depolama",
-    "Local" : "Yerel",
-    "Location" : "Konum",
-    "Amazon S3" : "Amazon S3",
-    "Key" : "Anahtar",
-    "Secret" : "Parola",
-    "Bucket" : "Bucket",
-    "Amazon S3 and compliant" : "Amazon S3 ve uyumlu olanlar",
-    "Access Key" : "Erişim Anahtarı",
-    "Secret Key" : "Gizli Anahtar",
-    "Hostname" : "Makine adı",
-    "Port" : "Port",
-    "Region" : "Bölge",
-    "Enable SSL" : "SSL'yi Etkinleştir",
-    "Enable Path Style" : "Yol Biçemini Etkinleştir",
-    "App key" : "Uyg. anahtarı",
-    "App secret" : "Uyg. parolası",
-    "Host" : "Sunucu",
-    "Username" : "Kullanıcı Adı",
-    "Password" : "Parola",
-    "Remote subfolder" : "Uzak alt klasör",
-    "Secure ftps://" : "Güvenli ftps://",
-    "Client ID" : "İstemci kimliği",
-    "Client secret" : "İstemci parolası",
-    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
-    "Region (optional for OpenStack Object Storage)" : "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)",
-    "API Key (required for Rackspace Cloud Files)" : "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)",
-    "Tenantname (required for OpenStack Object Storage)" : "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)",
-    "Password (required for OpenStack Object Storage)" : "Parola (OpenStack Nesne Depolaması için gerekli)",
-    "Service Name (required for OpenStack Object Storage)" : "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)",
-    "Timeout of HTTP requests in seconds" : "Saniye cinsinden HTTP istek zaman aşımı",
-    "Share" : "Paylaş",
-    "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
-    "Username as share" : "Paylaşım olarak kullanıcı adı",
-    "URL" : "URL",
-    "Secure https://" : "Güvenli https://",
-    "SFTP with secret key login" : "Gizli anahtar oturumu ile SFTP",
-    "Public key" : "Ortak anahtar",
     "Storage with id \"%i\" not found" : "\"%i\" kimliği ile bir depolama bulunamadı",
+    "Invalid backend or authentication mechanism class" : "Geçersiz arkauç veya kimlik doğrulama mekanizma sınıfı",
     "Invalid mount point" : "Geçersiz bağlama noktası",
+    "Objectstore forbidden" : "Nesne deposu yasaktır",
     "Invalid storage backend \"%s\"" : "Geçersiz depolama arka ucu \"%s\"",
-    "Access granted" : "Giriş kabul edildi",
-    "Error configuring Dropbox storage" : "Dropbox depo yapılandırma hatası",
-    "Grant access" : "Erişimi sağla",
-    "Error configuring Google Drive storage" : "Google Drive depo yapılandırma hatası",
+    "Unsatisfied backend parameters" : "Yetersiz arkauç parametreleri",
+    "Unsatisfied authentication mechanism parameters" : "Yetersiz kimlik doğrulama mekanizması parametreleri",
     "Personal" : "Kişisel",
     "System" : "Sistem",
+    "Grant access" : "Erişimi sağla",
+    "Access granted" : "Giriş kabul edildi",
+    "Error configuring OAuth1" : "OAuth1 yapılandırma hatası",
+    "Error configuring OAuth2" : "OAuth2 yapılandırma hatası",
+    "Generate keys" : "Anahtarlar üret",
+    "Error generating key pair" : "Anahtar çifti üretirken hata",
     "Enable encryption" : "Şifrelemeyi aç",
     "Enable previews" : "Önizlemeleri aç",
     "Check for changes" : "Değişiklikleri denetle",
@@ -61,10 +29,48 @@
     "All users. Type to select user or group." : "Tüm kullanıcılar. Kullanıcı veya grup seçmek için yazın.",
     "(group)" : "(grup)",
     "Saved" : "Kaydedildi",
-    "Generate keys" : "Anahtarlar üret",
-    "Error generating key pair" : "Anahtar çifti üretirken hata",
+    "Access key" : "Erişim anahtarı",
+    "Secret key" : "Gizli anahtar",
+    "Builtin" : "Yerleşik",
+    "None" : "Hiçbiri",
+    "OAuth1" : "OAuth1",
+    "App key" : "Uyg. anahtarı",
+    "App secret" : "Uyg. parolası",
+    "OAuth2" : "OAuth2",
+    "Client ID" : "İstemci kimliği",
+    "Client secret" : "İstemci parolası",
+    "Username" : "Kullanıcı Adı",
+    "Password" : "Parola",
+    "API key" : "API anahtarı",
+    "Username and password" : "Kullanıcı adı ve parola",
+    "Session credentials" : "Oturum bilgileri",
+    "Public key" : "Ortak anahtar",
+    "Amazon S3" : "Amazon S3",
+    "Bucket" : "Bucket",
+    "Hostname" : "Makine adı",
+    "Port" : "Port",
+    "Region" : "Bölge",
+    "Enable SSL" : "SSL'yi Etkinleştir",
+    "Enable Path Style" : "Yol Biçemini Etkinleştir",
+    "WebDAV" : "WebDAV",
+    "URL" : "URL",
+    "Remote subfolder" : "Uzak alt klasör",
+    "Secure https://" : "Güvenli https://",
+    "Dropbox" : "Dropbox",
+    "FTP" : "FTP",
+    "Host" : "Sunucu",
+    "Secure ftps://" : "Güvenli ftps://",
+    "Google Drive" : "Google Drive",
+    "Local" : "Yerel",
+    "Location" : "Konum",
+    "ownCloud" : "ownCloud",
+    "SFTP" : "SFTP",
+    "Root" : "Kök",
+    "SMB / CIFS" : "SMB / CIFS",
+    "Share" : "Paylaş",
+    "Username as share" : "Paylaşım olarak kullanıcı adı",
+    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
     "<b>Note:</b> " : "<b>Not:</b> ",
-    "and" : "ve",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> \"%s\" kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
@@ -75,11 +81,12 @@
     "Scope" : "Kapsam",
     "External Storage" : "Harici Depolama",
     "Folder name" : "Klasör ismi",
+    "Authentication" : "Kimlik Doğrulama",
     "Configuration" : "Yapılandırma",
     "Available for" : "Kullanabilenler",
-    "Add storage" : "Depo ekle",
     "Advanced settings" : "Gelişmiş ayarlar",
     "Delete" : "Sil",
+    "Add storage" : "Depo ekle",
     "Enable User External Storage" : "Kullanıcılar için Harici Depolamayı Etkinleştir",
     "Allow users to mount the following external storage" : "Kullanıcıların aşağıdaki harici depolamayı bağlamalarına izin ver"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_external/l10n/ug.js b/apps/files_external/l10n/ug.js
index a1a5dc648b..37adb85197 100644
--- a/apps/files_external/l10n/ug.js
+++ b/apps/files_external/l10n/ug.js
@@ -2,14 +2,17 @@ OC.L10N.register(
     "files_external",
     {
     "External storage" : "سىرتقى ساقلىغۇچ",
-    "Location" : "ئورنى",
-    "Port" : "ئېغىز",
-    "Host" : "باش ئاپپارات",
+    "Personal" : "شەخسىي",
+    "None" : "يوق",
     "Username" : "ئىشلەتكۈچى ئاتى",
     "Password" : "ئىم",
-    "Share" : "ھەمبەھىر",
+    "Port" : "ئېغىز",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Personal" : "شەخسىي",
+    "Host" : "باش ئاپپارات",
+    "Location" : "ئورنى",
+    "ownCloud" : "ownCloud",
+    "Share" : "ھەمبەھىر",
     "Name" : "ئاتى",
     "Folder name" : "قىسقۇچ ئاتى",
     "Configuration" : "سەپلىمە",
diff --git a/apps/files_external/l10n/ug.json b/apps/files_external/l10n/ug.json
index d6923a8659..f7a072bfe3 100644
--- a/apps/files_external/l10n/ug.json
+++ b/apps/files_external/l10n/ug.json
@@ -1,13 +1,16 @@
 { "translations": {
     "External storage" : "سىرتقى ساقلىغۇچ",
-    "Location" : "ئورنى",
-    "Port" : "ئېغىز",
-    "Host" : "باش ئاپپارات",
+    "Personal" : "شەخسىي",
+    "None" : "يوق",
     "Username" : "ئىشلەتكۈچى ئاتى",
     "Password" : "ئىم",
-    "Share" : "ھەمبەھىر",
+    "Port" : "ئېغىز",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Personal" : "شەخسىي",
+    "Host" : "باش ئاپپارات",
+    "Location" : "ئورنى",
+    "ownCloud" : "ownCloud",
+    "Share" : "ھەمبەھىر",
     "Name" : "ئاتى",
     "Folder name" : "قىسقۇچ ئاتى",
     "Configuration" : "سەپلىمە",
diff --git a/apps/files_external/l10n/uk.js b/apps/files_external/l10n/uk.js
index 6e061a0526..024d4fcf98 100644
--- a/apps/files_external/l10n/uk.js
+++ b/apps/files_external/l10n/uk.js
@@ -1,66 +1,53 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токенів. Перевірте правильність вашого секретного ключа та ключ додатка.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токена доступу. Перевірте правильність вашого секретного ключа та ключ додатка.",
-    "Please provide a valid Dropbox app key and secret." : "Будь ласка, надайте дійсний ключ та пароль Dropbox.",
     "Step 1 failed. Exception: %s" : "1-й крок невдалий. Виключення: %s",
     "Step 2 failed. Exception: %s" : "2-й крок невдалий. Виключення: %s",
     "External storage" : "Зовнішнє сховище",
-    "Local" : "Локально",
-    "Location" : "Місце",
+    "Storage with id \"%i\" not found" : "Сховище з id \"%i\" не знайдено",
+    "Invalid mount point" : "Невірна точка монтування",
+    "Invalid storage backend \"%s\"" : "Невірне сховище \"%s\"",
+    "Personal" : "Особисте",
+    "System" : "Система",
+    "Grant access" : "Дозволити доступ",
+    "Access granted" : "Доступ дозволено",
+    "Generate keys" : "Створити ключі",
+    "Error generating key pair" : "Помилка створення ключової пари",
+    "Enable encryption" : "Увімкнути шифрування",
+    "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
+    "(group)" : "(група)",
+    "Saved" : "Збережено",
+    "None" : "Жоден",
+    "App key" : "Ключ додатку",
+    "App secret" : "Секретний ключ додатку",
+    "Client ID" : "Ідентифікатор клієнта",
+    "Client secret" : "Ключ клієнта",
+    "Username" : "Ім'я користувача",
+    "Password" : "Пароль",
+    "API key" : "ключ API",
+    "Public key" : "Відкритий ключ",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ключ",
-    "Secret" : "Секрет",
     "Bucket" : "Кошик",
-    "Amazon S3 and compliant" : "Amazon S3 та сумісний",
-    "Access Key" : "Ключ доступу",
-    "Secret Key" : "Секретний ключ",
     "Hostname" : "Ім'я хоста",
     "Port" : "Порт",
     "Region" : "Регіон",
     "Enable SSL" : "Включити SSL",
     "Enable Path Style" : "Включити стиль шляху",
-    "App key" : "Ключ додатку",
-    "App secret" : "Секретний ключ додатку",
-    "Host" : "Хост",
-    "Username" : "Ім'я користувача",
-    "Password" : "Пароль",
-    "Remote subfolder" : "Віддалений підкаталог",
-    "Secure ftps://" : "Захищений ftps://",
-    "Client ID" : "Ідентифікатор клієнта",
-    "Client secret" : "Ключ клієнта",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Регіон (опціонально для OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обов'язково для Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ім'я орендатора (обов'язково для OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Пароль (обов’язково для OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Назва сервісу (обов’язково для OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL підтвердження кінцевої точки (обов'язково для OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP запитів на секунду",
-    "Share" : "Поділитися",
-    "SMB / CIFS using OC login" : "SMB / CIFS з використанням логіна OC",
-    "Username as share" : "Ім'я для відкритого доступу",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Віддалений підкаталог",
     "Secure https://" : "Захищений https://",
-    "Public key" : "Відкритий ключ",
-    "Storage with id \"%i\" not found" : "Сховище з id \"%i\" не знайдено",
-    "Invalid mount point" : "Невірна точка монтування",
-    "Invalid storage backend \"%s\"" : "Невірне сховище \"%s\"",
-    "Access granted" : "Доступ дозволено",
-    "Error configuring Dropbox storage" : "Помилка при налаштуванні сховища Dropbox",
-    "Grant access" : "Дозволити доступ",
-    "Error configuring Google Drive storage" : "Помилка при налаштуванні сховища Google Drive",
-    "Personal" : "Особисте",
-    "System" : "Система",
-    "Enable encryption" : "Увімкнути шифрування",
-    "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
-    "(group)" : "(група)",
-    "Saved" : "Збережено",
-    "Generate keys" : "Створити ключі",
-    "Error generating key pair" : "Помилка створення ключової пари",
+    "Dropbox" : "Dropbox",
+    "Host" : "Хост",
+    "Secure ftps://" : "Захищений ftps://",
+    "Local" : "Локально",
+    "Location" : "Місце",
+    "ownCloud" : "ownCloud",
+    "Root" : "Батьківський каталог",
+    "Share" : "Поділитися",
+    "Username as share" : "Ім'я для відкритого доступу",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Примітка:</b>",
-    "and" : "і",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> \"%s\" не встановлено. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
@@ -73,9 +60,9 @@ OC.L10N.register(
     "Folder name" : "Ім'я теки",
     "Configuration" : "Налаштування",
     "Available for" : "Доступний для",
-    "Add storage" : "Додати сховище",
     "Advanced settings" : "Розширені налаштування",
     "Delete" : "Видалити",
+    "Add storage" : "Додати сховище",
     "Enable User External Storage" : "Активувати користувацькі зовнішні сховища",
     "Allow users to mount the following external storage" : "Дозволити користувачам монтувати наступні зовнішні сховища"
 },
diff --git a/apps/files_external/l10n/uk.json b/apps/files_external/l10n/uk.json
index bb7c337595..fe5c43a8f3 100644
--- a/apps/files_external/l10n/uk.json
+++ b/apps/files_external/l10n/uk.json
@@ -1,64 +1,51 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токенів. Перевірте правильність вашого секретного ключа та ключ додатка.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токена доступу. Перевірте правильність вашого секретного ключа та ключ додатка.",
-    "Please provide a valid Dropbox app key and secret." : "Будь ласка, надайте дійсний ключ та пароль Dropbox.",
     "Step 1 failed. Exception: %s" : "1-й крок невдалий. Виключення: %s",
     "Step 2 failed. Exception: %s" : "2-й крок невдалий. Виключення: %s",
     "External storage" : "Зовнішнє сховище",
-    "Local" : "Локально",
-    "Location" : "Місце",
+    "Storage with id \"%i\" not found" : "Сховище з id \"%i\" не знайдено",
+    "Invalid mount point" : "Невірна точка монтування",
+    "Invalid storage backend \"%s\"" : "Невірне сховище \"%s\"",
+    "Personal" : "Особисте",
+    "System" : "Система",
+    "Grant access" : "Дозволити доступ",
+    "Access granted" : "Доступ дозволено",
+    "Generate keys" : "Створити ключі",
+    "Error generating key pair" : "Помилка створення ключової пари",
+    "Enable encryption" : "Увімкнути шифрування",
+    "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
+    "(group)" : "(група)",
+    "Saved" : "Збережено",
+    "None" : "Жоден",
+    "App key" : "Ключ додатку",
+    "App secret" : "Секретний ключ додатку",
+    "Client ID" : "Ідентифікатор клієнта",
+    "Client secret" : "Ключ клієнта",
+    "Username" : "Ім'я користувача",
+    "Password" : "Пароль",
+    "API key" : "ключ API",
+    "Public key" : "Відкритий ключ",
     "Amazon S3" : "Amazon S3",
-    "Key" : "Ключ",
-    "Secret" : "Секрет",
     "Bucket" : "Кошик",
-    "Amazon S3 and compliant" : "Amazon S3 та сумісний",
-    "Access Key" : "Ключ доступу",
-    "Secret Key" : "Секретний ключ",
     "Hostname" : "Ім'я хоста",
     "Port" : "Порт",
     "Region" : "Регіон",
     "Enable SSL" : "Включити SSL",
     "Enable Path Style" : "Включити стиль шляху",
-    "App key" : "Ключ додатку",
-    "App secret" : "Секретний ключ додатку",
-    "Host" : "Хост",
-    "Username" : "Ім'я користувача",
-    "Password" : "Пароль",
-    "Remote subfolder" : "Віддалений підкаталог",
-    "Secure ftps://" : "Захищений ftps://",
-    "Client ID" : "Ідентифікатор клієнта",
-    "Client secret" : "Ключ клієнта",
-    "OpenStack Object Storage" : "OpenStack Object Storage",
-    "Region (optional for OpenStack Object Storage)" : "Регіон (опціонально для OpenStack Object Storage)",
-    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обов'язково для Rackspace Cloud Files)",
-    "Tenantname (required for OpenStack Object Storage)" : "Ім'я орендатора (обов'язково для OpenStack Object Storage)",
-    "Password (required for OpenStack Object Storage)" : "Пароль (обов’язково для OpenStack Object Storage)",
-    "Service Name (required for OpenStack Object Storage)" : "Назва сервісу (обов’язково для OpenStack Object Storage)",
-    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL підтвердження кінцевої точки (обов'язково для OpenStack Object Storage)",
-    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP запитів на секунду",
-    "Share" : "Поділитися",
-    "SMB / CIFS using OC login" : "SMB / CIFS з використанням логіна OC",
-    "Username as share" : "Ім'я для відкритого доступу",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "Віддалений підкаталог",
     "Secure https://" : "Захищений https://",
-    "Public key" : "Відкритий ключ",
-    "Storage with id \"%i\" not found" : "Сховище з id \"%i\" не знайдено",
-    "Invalid mount point" : "Невірна точка монтування",
-    "Invalid storage backend \"%s\"" : "Невірне сховище \"%s\"",
-    "Access granted" : "Доступ дозволено",
-    "Error configuring Dropbox storage" : "Помилка при налаштуванні сховища Dropbox",
-    "Grant access" : "Дозволити доступ",
-    "Error configuring Google Drive storage" : "Помилка при налаштуванні сховища Google Drive",
-    "Personal" : "Особисте",
-    "System" : "Система",
-    "Enable encryption" : "Увімкнути шифрування",
-    "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
-    "(group)" : "(група)",
-    "Saved" : "Збережено",
-    "Generate keys" : "Створити ключі",
-    "Error generating key pair" : "Помилка створення ключової пари",
+    "Dropbox" : "Dropbox",
+    "Host" : "Хост",
+    "Secure ftps://" : "Захищений ftps://",
+    "Local" : "Локально",
+    "Location" : "Місце",
+    "ownCloud" : "ownCloud",
+    "Root" : "Батьківський каталог",
+    "Share" : "Поділитися",
+    "Username as share" : "Ім'я для відкритого доступу",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
     "<b>Note:</b> " : "<b>Примітка:</b>",
-    "and" : "і",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> \"%s\" не встановлено. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
@@ -71,9 +58,9 @@
     "Folder name" : "Ім'я теки",
     "Configuration" : "Налаштування",
     "Available for" : "Доступний для",
-    "Add storage" : "Додати сховище",
     "Advanced settings" : "Розширені налаштування",
     "Delete" : "Видалити",
+    "Add storage" : "Додати сховище",
     "Enable User External Storage" : "Активувати користувацькі зовнішні сховища",
     "Allow users to mount the following external storage" : "Дозволити користувачам монтувати наступні зовнішні сховища"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
diff --git a/apps/files_external/l10n/ur_PK.js b/apps/files_external/l10n/ur_PK.js
index 1955460809..55c8ee1f1b 100644
--- a/apps/files_external/l10n/ur_PK.js
+++ b/apps/files_external/l10n/ur_PK.js
@@ -1,12 +1,12 @@
 OC.L10N.register(
     "files_external",
     {
-    "Location" : "مقام",
+    "Personal" : "شخصی",
     "Username" : "یوزر نیم",
     "Password" : "پاسورڈ",
-    "Share" : "تقسیم",
     "URL" : "یو ار ایل",
-    "Personal" : "شخصی",
+    "Location" : "مقام",
+    "Share" : "تقسیم",
     "Name" : "اسم",
     "Delete" : "حذف کریں"
 },
diff --git a/apps/files_external/l10n/ur_PK.json b/apps/files_external/l10n/ur_PK.json
index c4df8947bd..e8b9c79e1f 100644
--- a/apps/files_external/l10n/ur_PK.json
+++ b/apps/files_external/l10n/ur_PK.json
@@ -1,10 +1,10 @@
 { "translations": {
-    "Location" : "مقام",
+    "Personal" : "شخصی",
     "Username" : "یوزر نیم",
     "Password" : "پاسورڈ",
-    "Share" : "تقسیم",
     "URL" : "یو ار ایل",
-    "Personal" : "شخصی",
+    "Location" : "مقام",
+    "Share" : "تقسیم",
     "Name" : "اسم",
     "Delete" : "حذف کریں"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_external/l10n/vi.js b/apps/files_external/l10n/vi.js
index 9c9405ba2b..49c746851e 100644
--- a/apps/files_external/l10n/vi.js
+++ b/apps/files_external/l10n/vi.js
@@ -1,30 +1,28 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.",
-    "Please provide a valid Dropbox app key and secret." : "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.",
     "External storage" : "Lưu trữ ngoài",
-    "Location" : "Vị trí",
-    "Port" : "Cổng",
-    "Region" : "Vùng/miền",
-    "Host" : "Máy chủ",
+    "Personal" : "Cá nhân",
+    "Grant access" : "Cấp quyền truy cập",
+    "Access granted" : "Đã cấp quyền truy cập",
+    "Saved" : "Đã lưu",
+    "None" : "Không gì cả",
     "Username" : "Tên đăng nhập",
     "Password" : "Mật khẩu",
-    "Share" : "Chia sẻ",
+    "Port" : "Cổng",
+    "Region" : "Vùng/miền",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Đã cấp quyền truy cập",
-    "Error configuring Dropbox storage" : "Lỗi cấu hình lưu trữ Dropbox ",
-    "Grant access" : "Cấp quyền truy cập",
-    "Error configuring Google Drive storage" : "Lỗi cấu hình lưu trữ Google Drive",
-    "Personal" : "Cá nhân",
-    "Saved" : "Đã lưu",
+    "Host" : "Máy chủ",
+    "Location" : "Vị trí",
+    "ownCloud" : "ownCloud",
+    "Share" : "Chia sẻ",
     "Name" : "Tên",
     "External Storage" : "Lưu trữ ngoài",
     "Folder name" : "Tên thư mục",
     "Configuration" : "Cấu hình",
-    "Add storage" : "Thêm bộ nhớ",
     "Delete" : "Xóa",
+    "Add storage" : "Thêm bộ nhớ",
     "Enable User External Storage" : "Kích hoạt tính năng lưu trữ ngoài"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/vi.json b/apps/files_external/l10n/vi.json
index fa45495d07..4daddc7ae5 100644
--- a/apps/files_external/l10n/vi.json
+++ b/apps/files_external/l10n/vi.json
@@ -1,28 +1,26 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.",
-    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Yêu cầu tokens thất bại. Xác minh key và mã bí mật ứng dụng Dropbox của bạn là chính xác.",
-    "Please provide a valid Dropbox app key and secret." : "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.",
     "External storage" : "Lưu trữ ngoài",
-    "Location" : "Vị trí",
-    "Port" : "Cổng",
-    "Region" : "Vùng/miền",
-    "Host" : "Máy chủ",
+    "Personal" : "Cá nhân",
+    "Grant access" : "Cấp quyền truy cập",
+    "Access granted" : "Đã cấp quyền truy cập",
+    "Saved" : "Đã lưu",
+    "None" : "Không gì cả",
     "Username" : "Tên đăng nhập",
     "Password" : "Mật khẩu",
-    "Share" : "Chia sẻ",
+    "Port" : "Cổng",
+    "Region" : "Vùng/miền",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "Đã cấp quyền truy cập",
-    "Error configuring Dropbox storage" : "Lỗi cấu hình lưu trữ Dropbox ",
-    "Grant access" : "Cấp quyền truy cập",
-    "Error configuring Google Drive storage" : "Lỗi cấu hình lưu trữ Google Drive",
-    "Personal" : "Cá nhân",
-    "Saved" : "Đã lưu",
+    "Host" : "Máy chủ",
+    "Location" : "Vị trí",
+    "ownCloud" : "ownCloud",
+    "Share" : "Chia sẻ",
     "Name" : "Tên",
     "External Storage" : "Lưu trữ ngoài",
     "Folder name" : "Tên thư mục",
     "Configuration" : "Cấu hình",
-    "Add storage" : "Thêm bộ nhớ",
     "Delete" : "Xóa",
+    "Add storage" : "Thêm bộ nhớ",
     "Enable User External Storage" : "Kích hoạt tính năng lưu trữ ngoài"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js
index 0b2731fd91..535d945b02 100644
--- a/apps/files_external/l10n/zh_CN.js
+++ b/apps/files_external/l10n/zh_CN.js
@@ -1,38 +1,36 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "请提供有效的Dropbox应用key和secret",
     "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s",
     "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s",
     "External storage" : "外部存储",
-    "Local" : "本地",
-    "Location" : "地点",
+    "Personal" : "个人",
+    "System" : "系统",
+    "Grant access" : "授权",
+    "Access granted" : "权限已授予。",
+    "Enable encryption" : "启用加密",
+    "Saved" : "已保存",
+    "None" : "无",
+    "Username" : "用户名",
+    "Password" : "密码",
+    "API key" : "API密匙",
     "Amazon S3" : "Amazon S3",
-    "Amazon S3 and compliant" : "Amazon S3 和兼容协议",
-    "Access Key" : "访问密钥",
-    "Secret Key" : "秘钥",
     "Port" : "端口",
     "Region" : "地区",
     "Enable SSL" : "启用 SSL",
     "Enable Path Style" : "启用 Path Style",
-    "Host" : "主机",
-    "Username" : "用户名",
-    "Password" : "密码",
-    "Remote subfolder" : "远程子文件夹",
-    "Secure ftps://" : "安全 ftps://",
-    "OpenStack Object Storage" : "OpenStack 对象存储",
-    "Share" : "共享",
-    "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "远程子文件夹",
     "Secure https://" : "安全 https://",
-    "Access granted" : "权限已授予。",
-    "Error configuring Dropbox storage" : "配置Dropbox存储时出错",
-    "Grant access" : "授权",
-    "Error configuring Google Drive storage" : "配置Google Drive存储时出错",
-    "Personal" : "个人",
-    "System" : "系统",
-    "Enable encryption" : "启用加密",
-    "Saved" : "已保存",
+    "Host" : "主机",
+    "Secure ftps://" : "安全 ftps://",
+    "Local" : "本地",
+    "Location" : "地点",
+    "ownCloud" : "ownCloud",
+    "Root" : "根路径",
+    "Share" : "共享",
+    "OpenStack Object Storage" : "OpenStack 对象存储",
     "<b>Note:</b> " : "<b>注意：</b>",
     "Name" : "名称",
     "Storage type" : "存储类型",
@@ -41,8 +39,8 @@ OC.L10N.register(
     "Folder name" : "目录名称",
     "Configuration" : "配置",
     "Available for" : "可用于",
-    "Add storage" : "增加存储",
     "Delete" : "删除",
+    "Add storage" : "增加存储",
     "Enable User External Storage" : "启用用户外部存储",
     "Allow users to mount the following external storage" : "允许用户挂载以下外部存储"
 },
diff --git a/apps/files_external/l10n/zh_CN.json b/apps/files_external/l10n/zh_CN.json
index 6d84233226..ac75d680c7 100644
--- a/apps/files_external/l10n/zh_CN.json
+++ b/apps/files_external/l10n/zh_CN.json
@@ -1,36 +1,34 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "请提供有效的Dropbox应用key和secret",
     "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s",
     "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s",
     "External storage" : "外部存储",
-    "Local" : "本地",
-    "Location" : "地点",
+    "Personal" : "个人",
+    "System" : "系统",
+    "Grant access" : "授权",
+    "Access granted" : "权限已授予。",
+    "Enable encryption" : "启用加密",
+    "Saved" : "已保存",
+    "None" : "无",
+    "Username" : "用户名",
+    "Password" : "密码",
+    "API key" : "API密匙",
     "Amazon S3" : "Amazon S3",
-    "Amazon S3 and compliant" : "Amazon S3 和兼容协议",
-    "Access Key" : "访问密钥",
-    "Secret Key" : "秘钥",
     "Port" : "端口",
     "Region" : "地区",
     "Enable SSL" : "启用 SSL",
     "Enable Path Style" : "启用 Path Style",
-    "Host" : "主机",
-    "Username" : "用户名",
-    "Password" : "密码",
-    "Remote subfolder" : "远程子文件夹",
-    "Secure ftps://" : "安全 ftps://",
-    "OpenStack Object Storage" : "OpenStack 对象存储",
-    "Share" : "共享",
-    "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
+    "Remote subfolder" : "远程子文件夹",
     "Secure https://" : "安全 https://",
-    "Access granted" : "权限已授予。",
-    "Error configuring Dropbox storage" : "配置Dropbox存储时出错",
-    "Grant access" : "授权",
-    "Error configuring Google Drive storage" : "配置Google Drive存储时出错",
-    "Personal" : "个人",
-    "System" : "系统",
-    "Enable encryption" : "启用加密",
-    "Saved" : "已保存",
+    "Host" : "主机",
+    "Secure ftps://" : "安全 ftps://",
+    "Local" : "本地",
+    "Location" : "地点",
+    "ownCloud" : "ownCloud",
+    "Root" : "根路径",
+    "Share" : "共享",
+    "OpenStack Object Storage" : "OpenStack 对象存储",
     "<b>Note:</b> " : "<b>注意：</b>",
     "Name" : "名称",
     "Storage type" : "存储类型",
@@ -39,8 +37,8 @@
     "Folder name" : "目录名称",
     "Configuration" : "配置",
     "Available for" : "可用于",
-    "Add storage" : "增加存储",
     "Delete" : "删除",
+    "Add storage" : "增加存储",
     "Enable User External Storage" : "启用用户外部存储",
     "Allow users to mount the following external storage" : "允许用户挂载以下外部存储"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/l10n/zh_HK.js b/apps/files_external/l10n/zh_HK.js
index 9ad4b8a7bc..7a38dd7ffe 100644
--- a/apps/files_external/l10n/zh_HK.js
+++ b/apps/files_external/l10n/zh_HK.js
@@ -1,14 +1,16 @@
 OC.L10N.register(
     "files_external",
     {
-    "Port" : "連接埠",
-    "Host" : "主機",
-    "Username" : "用戶名稱",
-    "Password" : "密碼",
-    "Share" : "分享",
-    "URL" : "網址",
     "Personal" : "個人",
     "Saved" : "已儲存",
+    "None" : "空",
+    "Username" : "用戶名稱",
+    "Password" : "密碼",
+    "Port" : "連接埠",
+    "WebDAV" : "WebDAV",
+    "URL" : "網址",
+    "Host" : "主機",
+    "Share" : "分享",
     "Name" : "名稱",
     "Folder name" : "資料夾名稱",
     "Delete" : "刪除"
diff --git a/apps/files_external/l10n/zh_HK.json b/apps/files_external/l10n/zh_HK.json
index 955170d618..befeede4bb 100644
--- a/apps/files_external/l10n/zh_HK.json
+++ b/apps/files_external/l10n/zh_HK.json
@@ -1,12 +1,14 @@
 { "translations": {
-    "Port" : "連接埠",
-    "Host" : "主機",
-    "Username" : "用戶名稱",
-    "Password" : "密碼",
-    "Share" : "分享",
-    "URL" : "網址",
     "Personal" : "個人",
     "Saved" : "已儲存",
+    "None" : "空",
+    "Username" : "用戶名稱",
+    "Password" : "密碼",
+    "Port" : "連接埠",
+    "WebDAV" : "WebDAV",
+    "URL" : "網址",
+    "Host" : "主機",
+    "Share" : "分享",
     "Name" : "名稱",
     "Folder name" : "資料夾名稱",
     "Delete" : "刪除"
diff --git a/apps/files_external/l10n/zh_TW.js b/apps/files_external/l10n/zh_TW.js
index 22c213ad5c..e4e01cd2d5 100644
--- a/apps/files_external/l10n/zh_TW.js
+++ b/apps/files_external/l10n/zh_TW.js
@@ -1,29 +1,27 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "請提供有效的 Dropbox app key 和 app secret 。",
     "External storage" : "外部儲存",
-    "Local" : "本地",
-    "Location" : "地點",
+    "Personal" : "個人",
+    "System" : "系統",
+    "Grant access" : "允許存取",
+    "Access granted" : "允許存取",
+    "Saved" : "已儲存",
+    "None" : "無",
+    "Username" : "使用者名稱",
+    "Password" : "密碼",
+    "API key" : "API金鑰",
     "Amazon S3" : "Amazon S3",
-    "Key" : "鑰",
-    "Secret" : "密",
-    "Secret Key" : "密鑰",
     "Port" : "連接埠",
     "Region" : "地區",
     "Enable SSL" : "啟用 SSL",
-    "Host" : "主機",
-    "Username" : "使用者名稱",
-    "Password" : "密碼",
-    "Share" : "分享",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "允許存取",
-    "Error configuring Dropbox storage" : "設定 Dropbox 儲存時發生錯誤",
-    "Grant access" : "允許存取",
-    "Error configuring Google Drive storage" : "設定 Google Drive 儲存時發生錯誤",
-    "Personal" : "個人",
-    "System" : "系統",
-    "Saved" : "已儲存",
+    "Host" : "主機",
+    "Local" : "本地",
+    "Location" : "地點",
+    "ownCloud" : "ownCloud",
+    "Share" : "分享",
     "<b>Note:</b> " : "<b>警告:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告:</b> PHP 並未啓用 Curl 的支援，因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告</b>：PHP 並未啓用 FTP 的支援，因此無法掛載 %s，請洽您的系統管理員將其安裝並啓用。",
@@ -33,8 +31,8 @@ OC.L10N.register(
     "Folder name" : "資料夾名稱",
     "Configuration" : "設定",
     "Available for" : "可用的",
-    "Add storage" : "增加儲存區",
     "Delete" : "刪除",
+    "Add storage" : "增加儲存區",
     "Enable User External Storage" : "啓用使用者外部儲存",
     "Allow users to mount the following external storage" : "允許使用者自行掛載以下的外部儲存"
 },
diff --git a/apps/files_external/l10n/zh_TW.json b/apps/files_external/l10n/zh_TW.json
index 84d1abf182..1ed049bc07 100644
--- a/apps/files_external/l10n/zh_TW.json
+++ b/apps/files_external/l10n/zh_TW.json
@@ -1,27 +1,25 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "請提供有效的 Dropbox app key 和 app secret 。",
     "External storage" : "外部儲存",
-    "Local" : "本地",
-    "Location" : "地點",
+    "Personal" : "個人",
+    "System" : "系統",
+    "Grant access" : "允許存取",
+    "Access granted" : "允許存取",
+    "Saved" : "已儲存",
+    "None" : "無",
+    "Username" : "使用者名稱",
+    "Password" : "密碼",
+    "API key" : "API金鑰",
     "Amazon S3" : "Amazon S3",
-    "Key" : "鑰",
-    "Secret" : "密",
-    "Secret Key" : "密鑰",
     "Port" : "連接埠",
     "Region" : "地區",
     "Enable SSL" : "啟用 SSL",
-    "Host" : "主機",
-    "Username" : "使用者名稱",
-    "Password" : "密碼",
-    "Share" : "分享",
+    "WebDAV" : "WebDAV",
     "URL" : "URL",
-    "Access granted" : "允許存取",
-    "Error configuring Dropbox storage" : "設定 Dropbox 儲存時發生錯誤",
-    "Grant access" : "允許存取",
-    "Error configuring Google Drive storage" : "設定 Google Drive 儲存時發生錯誤",
-    "Personal" : "個人",
-    "System" : "系統",
-    "Saved" : "已儲存",
+    "Host" : "主機",
+    "Local" : "本地",
+    "Location" : "地點",
+    "ownCloud" : "ownCloud",
+    "Share" : "分享",
     "<b>Note:</b> " : "<b>警告:</b> ",
     "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告:</b> PHP 並未啓用 Curl 的支援，因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。",
     "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告</b>：PHP 並未啓用 FTP 的支援，因此無法掛載 %s，請洽您的系統管理員將其安裝並啓用。",
@@ -31,8 +29,8 @@
     "Folder name" : "資料夾名稱",
     "Configuration" : "設定",
     "Available for" : "可用的",
-    "Add storage" : "增加儲存區",
     "Delete" : "刪除",
+    "Add storage" : "增加儲存區",
     "Enable User External Storage" : "啓用使用者外部儲存",
     "Allow users to mount the following external storage" : "允許使用者自行掛載以下的外部儲存"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index fd98d26f83..7c6ac4cbdd 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -122,7 +122,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		$params['region'] = empty($params['region']) ? 'eu-west-1' : $params['region'];
 		$params['hostname'] = empty($params['hostname']) ? 's3.amazonaws.com' : $params['hostname'];
 		if (!isset($params['port']) || $params['port'] === '') {
-			$params['port'] = ($params['use_ssl'] === 'false') ? 80 : 443;
+			$params['port'] = ($params['use_ssl'] === false) ? 80 : 443;
 		}
 		$this->params = $params;
 	}
@@ -585,7 +585,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			return $this->connection;
 		}
 
-		$scheme = ($this->params['use_ssl'] === 'false') ? 'http' : 'https';
+		$scheme = ($this->params['use_ssl'] === false) ? 'http' : 'https';
 		$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
 
 		$this->connection = S3Client::factory(array(
diff --git a/apps/files_external/lib/auth/amazons3/accesskey.php b/apps/files_external/lib/auth/amazons3/accesskey.php
new file mode 100644
index 0000000000..9e3aab374b
--- /dev/null
+++ b/apps/files_external/lib/auth/amazons3/accesskey.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Auth\AmazonS3;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * Amazon S3 access key authentication
+ */
+class AccessKey extends AuthMechanism {
+
+	const SCHEME_AMAZONS3_ACCESSKEY = 'amazons3_accesskey';
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('amazons3::accesskey')
+			->setScheme(self::SCHEME_AMAZONS3_ACCESSKEY)
+			->setText($l->t('Access key'))
+			->addParameters([
+				(new DefinitionParameter('key', $l->t('Access key'))),
+				(new DefinitionParameter('secret', $l->t('Secret key')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+			]);
+	}
+
+}
diff --git a/apps/files_external/lib/auth/authmechanism.php b/apps/files_external/lib/auth/authmechanism.php
index 11d99bb330..ddc0c6a4dc 100644
--- a/apps/files_external/lib/auth/authmechanism.php
+++ b/apps/files_external/lib/auth/authmechanism.php
@@ -22,7 +22,7 @@
 namespace OCA\Files_External\Lib\Auth;
 
 use \OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_External\Lib\VisibilityTrait;
+use \OCA\Files_External\Lib\PermissionsTrait;
 use \OCA\Files_External\Lib\IdentifierTrait;
 use \OCA\Files_External\Lib\FrontendDefinitionTrait;
 use \OCA\Files_External\Lib\StorageModifierTrait;
@@ -40,7 +40,7 @@ use \OCA\Files_External\Lib\StorageModifierTrait;
  * scheme, which are provided from the authentication mechanism.
  *
  * This class uses the following traits:
- *  - VisibilityTrait
+ *  - PermissionsTrait
  *      Restrict usage to admin-only/none
  *  - FrontendDefinitionTrait
  *      Specify configuration parameters and other definitions
@@ -58,7 +58,7 @@ class AuthMechanism implements \JsonSerializable {
 	const SCHEME_PUBLICKEY = 'publickey';
 	const SCHEME_OPENSTACK = 'openstack';
 
-	use VisibilityTrait;
+	use PermissionsTrait;
 	use FrontendDefinitionTrait;
 	use StorageModifierTrait;
 	use IdentifierTrait;
diff --git a/apps/files_external/lib/auth/oauth1/oauth1.php b/apps/files_external/lib/auth/oauth1/oauth1.php
new file mode 100644
index 0000000000..3fb1b16aa6
--- /dev/null
+++ b/apps/files_external/lib/auth/oauth1/oauth1.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Auth\OAuth1;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * OAuth1 authentication
+ */
+class OAuth1 extends AuthMechanism {
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('oauth1::oauth1')
+			->setScheme(self::SCHEME_OAUTH1)
+			->setText($l->t('OAuth1'))
+			->addParameters([
+				(new DefinitionParameter('configured', 'configured'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+				(new DefinitionParameter('app_key', $l->t('App key'))),
+				(new DefinitionParameter('app_secret', $l->t('App secret')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+				(new DefinitionParameter('token', 'token'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+				(new DefinitionParameter('token_secret', 'token_secret'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+			])
+			->setCustomJs('oauth1')
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/auth/oauth2/oauth2.php b/apps/files_external/lib/auth/oauth2/oauth2.php
new file mode 100644
index 0000000000..73faa85a44
--- /dev/null
+++ b/apps/files_external/lib/auth/oauth2/oauth2.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Auth\OAuth2;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * OAuth2 authentication
+ */
+class OAuth2 extends AuthMechanism {
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('oauth2::oauth2')
+			->setScheme(self::SCHEME_OAUTH2)
+			->setText($l->t('OAuth2'))
+			->addParameters([
+				(new DefinitionParameter('configured', 'configured'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+				(new DefinitionParameter('client_id', $l->t('Client ID'))),
+				(new DefinitionParameter('client_secret', $l->t('Client secret')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+				(new DefinitionParameter('token', 'token'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+			])
+			->setCustomJs('oauth2')
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/auth/openstack/openstack.php b/apps/files_external/lib/auth/openstack/openstack.php
new file mode 100644
index 0000000000..faf356bcf2
--- /dev/null
+++ b/apps/files_external/lib/auth/openstack/openstack.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Auth\OpenStack;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * OpenStack Keystone authentication
+ */
+class OpenStack extends AuthMechanism {
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('openstack::openstack')
+			->setScheme(self::SCHEME_OPENSTACK)
+			->setText($l->t('OpenStack'))
+			->addParameters([
+				(new DefinitionParameter('user', $l->t('Username'))),
+				(new DefinitionParameter('password', $l->t('Password')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+				(new DefinitionParameter('tenant', $l->t('Tenant name'))),
+				(new DefinitionParameter('url', $l->t('Identity endpoint URL'))),
+			])
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/auth/openstack/rackspace.php b/apps/files_external/lib/auth/openstack/rackspace.php
new file mode 100644
index 0000000000..9268f3aad8
--- /dev/null
+++ b/apps/files_external/lib/auth/openstack/rackspace.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Auth\OpenStack;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+
+/**
+ * Rackspace authentication
+ */
+class Rackspace extends AuthMechanism {
+
+	public function __construct(IL10N $l) {
+		$this
+			->setIdentifier('openstack::rackspace')
+			->setScheme(self::SCHEME_OPENSTACK)
+			->setText($l->t('Rackspace'))
+			->addParameters([
+				(new DefinitionParameter('user', $l->t('Username'))),
+				(new DefinitionParameter('key', $l->t('API key')))
+					->setType(DefinitionParameter::VALUE_PASSWORD),
+			])
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/auth/publickey/rsa.php b/apps/files_external/lib/auth/publickey/rsa.php
new file mode 100644
index 0000000000..f40136dda0
--- /dev/null
+++ b/apps/files_external/lib/auth/publickey/rsa.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Auth\PublicKey;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Lib\StorageConfig;
+use \OCP\IConfig;
+use \phpseclib\Crypt\RSA as RSACrypt;
+
+/**
+ * RSA public key authentication
+ */
+class RSA extends AuthMechanism {
+
+	const CREATE_KEY_BITS = 1024;
+
+	/** @var IConfig */
+	private $config;
+
+	public function __construct(IL10N $l, IConfig $config) {
+		$this->config = $config;
+
+		$this
+			->setIdentifier('publickey::rsa')
+			->setScheme(self::SCHEME_PUBLICKEY)
+			->setText($l->t('RSA public key'))
+			->addParameters([
+				(new DefinitionParameter('user', $l->t('Username'))),
+				(new DefinitionParameter('public_key', $l->t('Public key'))),
+				(new DefinitionParameter('private_key', 'private_key'))
+					->setType(DefinitionParameter::VALUE_HIDDEN),
+			])
+			->setCustomJs('public_key')
+		;
+	}
+
+	public function manipulateStorageConfig(StorageConfig &$storage) {
+		$auth = new RSACrypt();
+		$auth->setPassword($this->config->getSystemValue('secret', ''));
+		if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
+			throw new \RuntimeException('unable to load private key');
+		}
+		$storage->setBackendOption('public_key_auth', $auth);
+	}
+
+	/**
+	 * Generate a keypair
+	 *
+	 * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey]
+	 */
+	public function createKey() {
+		$rsa = new RSACrypt();
+		$rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH);
+		$rsa->setPassword($this->config->getSystemValue('secret', ''));
+
+		return $rsa->createKey(self::CREATE_KEY_BITS);
+	}
+
+}
diff --git a/apps/files_external/lib/backend/amazons3.php b/apps/files_external/lib/backend/amazons3.php
new file mode 100644
index 0000000000..1cf62d7cb0
--- /dev/null
+++ b/apps/files_external/lib/backend/amazons3.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
+use \OCA\Files_External\Lib\Auth\AmazonS3\AccessKey;
+
+class AmazonS3 extends Backend {
+
+	use LegacyDependencyCheckPolyfill;
+
+	public function __construct(IL10N $l, AccessKey $legacyAuth) {
+		$this
+			->setIdentifier('amazons3')
+			->addIdentifierAlias('\OC\Files\Storage\AmazonS3') // legacy compat
+			->setStorageClass('\OC\Files\Storage\AmazonS3')
+			->setText($l->t('Amazon S3'))
+			->addParameters([
+				(new DefinitionParameter('bucket', $l->t('Bucket'))),
+				(new DefinitionParameter('hostname', $l->t('Hostname')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('port', $l->t('Port')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('region', $l->t('Region')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('use_ssl', $l->t('Enable SSL')))
+					->setType(DefinitionParameter::VALUE_BOOLEAN),
+				(new DefinitionParameter('use_path_style', $l->t('Enable Path Style')))
+					->setType(DefinitionParameter::VALUE_BOOLEAN),
+			])
+			->addAuthScheme(AccessKey::SCHEME_AMAZONS3_ACCESSKEY)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/backend/backend.php b/apps/files_external/lib/backend/backend.php
index 90d5d38ed9..2a2add3ac5 100644
--- a/apps/files_external/lib/backend/backend.php
+++ b/apps/files_external/lib/backend/backend.php
@@ -22,7 +22,7 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_External\Lib\VisibilityTrait;
+use \OCA\Files_External\Lib\PermissionsTrait;
 use \OCA\Files_External\Lib\FrontendDefinitionTrait;
 use \OCA\Files_External\Lib\PriorityTrait;
 use \OCA\Files_External\Lib\DependencyTrait;
@@ -43,7 +43,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  * scheme, which are provided from the authentication mechanism.
  *
  * This class uses the following traits:
- *  - VisibilityTrait
+ *  - PermissionsTrait
  *      Restrict usage to admin-only/none
  *  - FrontendDefinitionTrait
  *      Specify configuration parameters and other definitions
@@ -56,7 +56,7 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  */
 class Backend implements \JsonSerializable {
 
-	use VisibilityTrait;
+	use PermissionsTrait;
 	use FrontendDefinitionTrait;
 	use PriorityTrait;
 	use DependencyTrait;
diff --git a/apps/files_external/lib/backend/dav.php b/apps/files_external/lib/backend/dav.php
index 5ae6d12258..c4f446548e 100644
--- a/apps/files_external/lib/backend/dav.php
+++ b/apps/files_external/lib/backend/dav.php
@@ -26,11 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class DAV extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, Password $legacyAuth) {
 		$this
 			->setIdentifier('dav')
@@ -44,7 +47,6 @@ class DAV extends Backend {
 				(new DefinitionParameter('secure', $l->t('Secure https://')))
 					->setType(DefinitionParameter::VALUE_BOOLEAN),
 			])
-			->setDependencyCheck('\OC\Files\Storage\DAV::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/dropbox.php b/apps/files_external/lib/backend/dropbox.php
new file mode 100644
index 0000000000..3e595cb0a9
--- /dev/null
+++ b/apps/files_external/lib/backend/dropbox.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
+use \OCA\Files_External\Lib\Auth\OAuth1\OAuth1;
+
+class Dropbox extends Backend {
+
+	use LegacyDependencyCheckPolyfill;
+
+	public function __construct(IL10N $l, OAuth1 $legacyAuth) {
+		$this
+			->setIdentifier('dropbox')
+			->addIdentifierAlias('\OC\Files\Storage\Dropbox') // legacy compat
+			->setStorageClass('\OC\Files\Storage\Dropbox')
+			->setText($l->t('Dropbox'))
+			->addParameters([
+				// all parameters handled in OAuth1 mechanism
+			])
+			->addAuthScheme(AuthMechanism::SCHEME_OAUTH1)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/backend/ftp.php b/apps/files_external/lib/backend/ftp.php
index df6ca37679..1caf3a8fcb 100644
--- a/apps/files_external/lib/backend/ftp.php
+++ b/apps/files_external/lib/backend/ftp.php
@@ -26,11 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class FTP extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, Password $legacyAuth) {
 		$this
 			->setIdentifier('ftp')
@@ -44,7 +47,6 @@ class FTP extends Backend {
 				(new DefinitionParameter('secure', $l->t('Secure ftps://')))
 					->setType(DefinitionParameter::VALUE_BOOLEAN),
 			])
-			->setDependencyCheck('\OC\Files\Storage\FTP::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/google.php b/apps/files_external/lib/backend/google.php
new file mode 100644
index 0000000000..bc0b52c464
--- /dev/null
+++ b/apps/files_external/lib/backend/google.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
+use \OCA\Files_External\Lib\Auth\OAuth2\OAuth2;
+
+class Google extends Backend {
+
+	use LegacyDependencyCheckPolyfill;
+
+	public function __construct(IL10N $l, OAuth2 $legacyAuth) {
+		$this
+			->setIdentifier('googledrive')
+			->addIdentifierAlias('\OC\Files\Storage\Google') // legacy compat
+			->setStorageClass('\OC\Files\Storage\Google')
+			->setText($l->t('Google Drive'))
+			->addParameters([
+				// all parameters handled in OAuth2 mechanism
+			])
+			->addAuthScheme(AuthMechanism::SCHEME_OAUTH2)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/backend/legacybackend.php b/apps/files_external/lib/backend/legacybackend.php
index 0f60c2caa4..83a5b45940 100644
--- a/apps/files_external/lib/backend/legacybackend.php
+++ b/apps/files_external/lib/backend/legacybackend.php
@@ -24,12 +24,21 @@ namespace OCA\Files_External\Lib\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\Builtin;
+use \OCA\Files_External\Lib\MissingDependency;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 /**
  * Legacy compatibility for OC_Mount_Config::registerBackend()
  */
 class LegacyBackend extends Backend {
 
+	use LegacyDependencyCheckPolyfill {
+		LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies;
+	}
+
+	/** @var bool */
+	protected $hasDependencies = false;
+
 	/**
 	 * @param string $class
 	 * @param array $definition
@@ -78,8 +87,18 @@ class LegacyBackend extends Backend {
 			$this->setCustomJs($definition['custom']);
 		}
 		if (isset($definition['has_dependencies']) && $definition['has_dependencies']) {
-			$this->setDependencyCheck($class . '::checkDependencies');
+			$this->hasDependencies = true;
 		}
 	}
 
+	/**
+	 * @return MissingDependency[]
+	 */
+	public function checkDependencies() {
+		if ($this->hasDependencies) {
+			return $this->doCheckDependencies();
+		}
+		return [];
+	}
+
 }
diff --git a/apps/files_external/lib/backend/local.php b/apps/files_external/lib/backend/local.php
index a80b437fab..a6635491b6 100644
--- a/apps/files_external/lib/backend/local.php
+++ b/apps/files_external/lib/backend/local.php
@@ -39,7 +39,7 @@ class Local extends Backend {
 			->addParameters([
 				(new DefinitionParameter('datadir', $l->t('Location'))),
 			])
-			->setAllowedVisibility(BackendService::VISIBILITY_ADMIN)
+			->setAllowedPermissions(BackendService::USER_PERSONAL, BackendService::PERMISSION_NONE)
 			->setPriority(BackendService::PRIORITY_DEFAULT + 50)
 			->addAuthScheme(AuthMechanism::SCHEME_NULL)
 			->setLegacyAuthMechanism($legacyAuth)
diff --git a/apps/files_external/lib/backend/sftp.php b/apps/files_external/lib/backend/sftp.php
index dd0f5d8e2e..c0bcd27c54 100644
--- a/apps/files_external/lib/backend/sftp.php
+++ b/apps/files_external/lib/backend/sftp.php
@@ -43,6 +43,7 @@ class SFTP extends Backend {
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
 	}
diff --git a/apps/files_external/lib/backend/sftp_key.php b/apps/files_external/lib/backend/sftp_key.php
new file mode 100644
index 0000000000..6a75172026
--- /dev/null
+++ b/apps/files_external/lib/backend/sftp_key.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\Auth\PublicKey\RSA;
+
+class SFTP_Key extends Backend {
+
+	public function __construct(IL10N $l, RSA $legacyAuth) {
+		$this
+			->setIdentifier('\OC\Files\Storage\SFTP_Key')
+			->setStorageClass('\OC\Files\Storage\SFTP')
+			->setText($l->t('SFTP with secret key login [DEPRECATED]'))
+			->addParameters([
+				(new DefinitionParameter('host', $l->t('Host'))),
+				(new DefinitionParameter('root', $l->t('Remote subfolder')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+			])
+			->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
+			->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
+			->addAuthScheme(AuthMechanism::SCHEME_PUBLICKEY)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/backend/smb.php b/apps/files_external/lib/backend/smb.php
index dc15f6d3db..0613d3112e 100644
--- a/apps/files_external/lib/backend/smb.php
+++ b/apps/files_external/lib/backend/smb.php
@@ -26,11 +26,14 @@ use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class SMB extends Backend {
 
+	use LegacyDependencyCheckPolyfill;
+
 	public function __construct(IL10N $l, Password $legacyAuth) {
 		$this
 			->setIdentifier('smb')
@@ -45,7 +48,6 @@ class SMB extends Backend {
 				(new DefinitionParameter('domain', $l->t('Domain')))
 					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
 			])
-			->setDependencyCheck('\OC\Files\Storage\SMB::checkDependencies')
 			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
 			->setLegacyAuthMechanism($legacyAuth)
 		;
diff --git a/apps/files_external/lib/backend/smb_oc.php b/apps/files_external/lib/backend/smb_oc.php
new file mode 100644
index 0000000000..d21b0ddaf4
--- /dev/null
+++ b/apps/files_external/lib/backend/smb_oc.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\Auth\Password\SessionCredentials;
+use \OCA\Files_External\Lib\StorageConfig;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
+/**
+ * Deprecated SMB_OC class - use SMB with the password::sessioncredentials auth mechanism
+ */
+class SMB_OC extends Backend {
+
+	use LegacyDependencyCheckPolyfill;
+
+	public function __construct(IL10N $l, SessionCredentials $legacyAuth) {
+		$this
+			->setIdentifier('\OC\Files\Storage\SMB_OC')
+			->setStorageClass('\OC\Files\Storage\SMB')
+			->setText($l->t('SMB / CIFS using OC login [DEPRECATED]'))
+			->addParameters([
+				(new DefinitionParameter('host', $l->t('Host'))),
+				(new DefinitionParameter('username_as_share', $l->t('Username as share')))
+					->setType(DefinitionParameter::VALUE_BOOLEAN),
+				(new DefinitionParameter('share', $l->t('Share')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('root', $l->t('Remote subfolder')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+			])
+			->removeAllowedPermission(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
+			->removeAllowedPermission(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE)
+			->setPriority(BackendService::PRIORITY_DEFAULT - 10)
+			->addAuthScheme(AuthMechanism::SCHEME_PASSWORD)
+			->setLegacyAuthMechanism($legacyAuth)
+		;
+	}
+
+	public function manipulateStorageConfig(StorageConfig &$storage) {
+		$username_as_share = ($storage->getBackendOption('username_as_share') === true);
+
+		if ($username_as_share) {
+			$share = '/' . $storage->getBackendOption('user');
+			$storage->setBackendOption('share', $share);
+		}
+	}
+
+}
diff --git a/apps/files_external/lib/backend/swift.php b/apps/files_external/lib/backend/swift.php
new file mode 100644
index 0000000000..2e14855206
--- /dev/null
+++ b/apps/files_external/lib/backend/swift.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib\Backend;
+
+use \OCP\IL10N;
+use \OCA\Files_External\Lib\Backend\Backend;
+use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\Auth\AuthMechanism;
+use \OCA\Files_External\Service\BackendService;
+use \OCA\Files_External\Lib\Auth\OpenStack\OpenStack;
+use \OCA\Files_External\Lib\Auth\OpenStack\Rackspace;
+use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
+
+class Swift extends Backend {
+
+	use LegacyDependencyCheckPolyfill;
+
+	public function __construct(IL10N $l, OpenStack $openstackAuth, Rackspace $rackspaceAuth) {
+		$this
+			->setIdentifier('swift')
+			->addIdentifierAlias('\OC\Files\Storage\Swift') // legacy compat
+			->setStorageClass('\OC\Files\Storage\Swift')
+			->setText($l->t('OpenStack Object Storage'))
+			->addParameters([
+				(new DefinitionParameter('service_name', $l->t('Service name')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('region', $l->t('Region')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+				(new DefinitionParameter('bucket', $l->t('Bucket'))),
+				(new DefinitionParameter('timeout', $l->t('Request timeout (seconds)')))
+					->setFlag(DefinitionParameter::FLAG_OPTIONAL),
+			])
+			->addAuthScheme(AuthMechanism::SCHEME_OPENSTACK)
+			->setLegacyAuthMechanismCallback(function(array $params) use ($openstackAuth, $rackspaceAuth) {
+				if (isset($params['options']['key']) && $params['options']['key']) {
+					return $rackspaceAuth;
+				}
+				return $openstackAuth;
+			})
+		;
+	}
+
+}
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index b4c6867a26..2dc7de30a6 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -81,9 +81,7 @@ class OC_Mount_Config {
 	 * @param array $data
 	 */
 	public static function initMountPointsHook($data) {
-		self::addStorageIdToConfig(null);
 		if ($data['user']) {
-			self::addStorageIdToConfig($data['user']);
 			$user = \OC::$server->getUserManager()->get($data['user']);
 			if (!$user) {
 				\OC::$server->getLogger()->warning(
@@ -210,7 +208,6 @@ class OC_Mount_Config {
 			'users' => $storage->getApplicableUsers(),
 		];
 		$mountEntry['id'] = $storage->getId();
-		// $mountEntry['storage_id'] = null; // we don't store this!
 
 		return $mountEntry;
 	}
@@ -230,7 +227,9 @@ class OC_Mount_Config {
 				}
 			}
 		} else {
-			$input = str_replace('$user', $user, $input);
+			if (is_string($input)) {
+				$input = str_replace('$user', $user, $input);
+			}
 		}
 		return $input;
 	}
@@ -308,14 +307,6 @@ class OC_Mount_Config {
 			$file = $config->getSystemValue('mount_file', $datadir . '/mount.json');
 		}
 
-		foreach ($data as &$applicables) {
-			foreach ($applicables as &$mountPoints) {
-				foreach ($mountPoints as &$options) {
-					self::addStorageId($options);
-				}
-			}
-		}
-
 		$content = json_encode($data, JSON_PRETTY_PRINT);
 		@file_put_contents($file, $content);
 		@chmod($file, 0640);
@@ -490,60 +481,4 @@ class OC_Mount_Config {
 		);
 		return hash('md5', $data);
 	}
-
-	/**
-	 * Add storage id to the storage configurations that did not have any.
-	 *
-	 * @param string $user user for which to process storage configs
-	 */
-	private static function addStorageIdToConfig($user) {
-		$config = self::readData($user);
-
-		$needUpdate = false;
-		foreach ($config as &$applicables) {
-			foreach ($applicables as &$mountPoints) {
-				foreach ($mountPoints as &$options) {
-					$needUpdate |= !isset($options['storage_id']);
-				}
-			}
-		}
-
-		if ($needUpdate) {
-			self::writeData($user, $config);
-		}
-	}
-
-	/**
-	 * Get storage id from the numeric storage id and set
-	 * it into the given options argument. Only do this
-	 * if there was no storage id set yet.
-	 *
-	 * This might also fail if a storage wasn't fully configured yet
-	 * and couldn't be mounted, in which case this will simply return false.
-	 *
-	 * @param array $options storage options
-	 *
-	 * @return bool true if the storage id was added, false otherwise
-	 */
-	private static function addStorageId(&$options) {
-		if (isset($options['storage_id'])) {
-			return false;
-		}
-
-		$service = self::$app->getContainer()->query('OCA\Files_External\Service\BackendService');
-		$class = $service->getBackend($options['backend'])->getStorageClass();
-		try {
-			/** @var \OC\Files\Storage\Storage $storage */
-			$storage = new $class($options['options']);
-			// TODO: introduce StorageConfigException
-		} catch (\Exception $e) {
-			// storage might not be fully configured yet (ex: Dropbox)
-			// note that storage instances aren't supposed to open any connections
-			// in the constructor, so this exception is likely to be a config exception
-			return false;
-		}
-
-		$options['storage_id'] = $storage->getCache()->getNumericStorageId();
-		return true;
-	}
 }
diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php
index a15d9e06a5..a255a7b3d2 100644
--- a/apps/files_external/lib/config/configadapter.php
+++ b/apps/files_external/lib/config/configadapter.php
@@ -74,6 +74,9 @@ class ConfigAdapter implements IMountProvider {
 		$objectStore = $storage->getBackendOption('objectstore');
 		if ($objectStore) {
 			$objectClass = $objectStore['class'];
+			if (!is_subclass_of($objectClass, '\OCP\Files\ObjectStore\IObjectStore')) {
+				throw new \InvalidArgumentException('Invalid object store');
+			}
 			$storage->setBackendOption('objectstore', new $objectClass($objectStore));
 		}
 
diff --git a/apps/files_external/lib/definitionparameter.php b/apps/files_external/lib/definitionparameter.php
index 4b560908b6..7f883e5fad 100644
--- a/apps/files_external/lib/definitionparameter.php
+++ b/apps/files_external/lib/definitionparameter.php
@@ -154,22 +154,31 @@ class DefinitionParameter implements \JsonSerializable {
 
 	/**
 	 * Validate a parameter value against this
+	 * Convert type as necessary
 	 *
 	 * @param mixed $value Value to check
 	 * @return bool success
 	 */
-	public function validateValue($value) {
-		if ($this->getFlags() & self::FLAG_OPTIONAL) {
-			return true;
-		}
+	public function validateValue(&$value) {
+		$optional = $this->getFlags() & self::FLAG_OPTIONAL;
+
 		switch ($this->getType()) {
 		case self::VALUE_BOOLEAN:
 			if (!is_bool($value)) {
-				return false;
+				switch ($value) {
+				case 'true':
+					$value = true;
+					break;
+				case 'false':
+					$value = false;
+					break;
+				default:
+					return false;
+				}
 			}
 			break;
 		default:
-			if (empty($value)) {
+			if (!$value && !$optional) {
 				return false;
 			}
 			break;
diff --git a/apps/files_external/lib/dependencytrait.php b/apps/files_external/lib/dependencytrait.php
index 116421eab1..f0d6d6080e 100644
--- a/apps/files_external/lib/dependencytrait.php
+++ b/apps/files_external/lib/dependencytrait.php
@@ -28,58 +28,13 @@ use \OCA\Files_External\Lib\MissingDependency;
  */
 trait DependencyTrait {
 
-	/** @var callable|null dependency check */
-	private $dependencyCheck = null;
-
-	/**
-	 * @return bool
-	 */
-	public function hasDependencies() {
-		return !is_null($this->dependencyCheck);
-	}
-
-	/**
-	 * @param callable $dependencyCheck
-	 * @return self
-	 */
-	public function setDependencyCheck(callable $dependencyCheck) {
-		$this->dependencyCheck = $dependencyCheck;
-		return $this;
-	}
-
 	/**
 	 * Check if object is valid for use
 	 *
 	 * @return MissingDependency[] Unsatisfied dependencies
 	 */
 	public function checkDependencies() {
-		$ret = [];
-
-		if ($this->hasDependencies()) {
-			$result = call_user_func($this->dependencyCheck);
-			if ($result !== true) {
-				if (!is_array($result)) {
-					$result = [$result];
-				}
-				foreach ($result as $key => $value) {
-					if (!($value instanceof MissingDependency)) {
-						$module = null;
-						$message = null;
-						if (is_numeric($key)) {
-							$module = $value;
-						} else {
-							$module = $key;
-							$message = $value;
-						}
-						$value = new MissingDependency($module, $this);
-						$value->setMessage($message);
-					}
-					$ret[] = $value;
-				}
-			}
-		}
-
-		return $ret;
+		return []; // no dependencies by default
 	}
 
 }
diff --git a/apps/files_external/lib/frontenddefinitiontrait.php b/apps/files_external/lib/frontenddefinitiontrait.php
index 4b826372d2..a5fb1a3f62 100644
--- a/apps/files_external/lib/frontenddefinitiontrait.php
+++ b/apps/files_external/lib/frontenddefinitiontrait.php
@@ -134,12 +134,12 @@ trait FrontendDefinitionTrait {
 	 * @return bool
 	 */
 	public function validateStorageDefinition(StorageConfig $storage) {
-		$options = $storage->getBackendOptions();
 		foreach ($this->getParameters() as $name => $parameter) {
-			$value = isset($options[$name]) ? $options[$name] : null;
+			$value = $storage->getBackendOption($name);
 			if (!$parameter->validateValue($value)) {
 				return false;
 			}
+			$storage->setBackendOption($name, $value);
 		}
 		return true;
 	}
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index aeca17c4f4..f3631e53fa 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -45,11 +45,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 			$this->user=$params['user'];
 			$this->password=$params['password'];
 			if (isset($params['secure'])) {
-				if (is_string($params['secure'])) {
-					$this->secure = ($params['secure'] === 'true');
-				} else {
-					$this->secure = (bool)$params['secure'];
-				}
+				$this->secure = $params['secure'];
 			} else {
 				$this->secure = false;
 			}
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index e29b103624..94f954178c 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -248,8 +248,6 @@ class Google extends \OC\Files\Storage\Common {
 	}
 
 	public function opendir($path) {
-		// Remove leading and trailing slashes
-		$path = trim($path, '/');
 		$folder = $this->getDriveFile($path);
 		if ($folder) {
 			$files = array();
diff --git a/apps/files_external/lib/legacydependencycheckpolyfill.php b/apps/files_external/lib/legacydependencycheckpolyfill.php
new file mode 100644
index 0000000000..7bb137fb3e
--- /dev/null
+++ b/apps/files_external/lib/legacydependencycheckpolyfill.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib;
+
+use \OCA\Files_External\Lib\MissingDependency;
+
+/**
+ * Polyfill for checking dependencies using legacy Storage::checkDependencies()
+ */
+trait LegacyDependencyCheckPolyfill {
+
+	/**
+	 * @return string
+	 */
+	abstract public function getStorageClass();
+
+	/**
+	 * Check if object is valid for use
+	 *
+	 * @return MissingDependency[] Unsatisfied dependencies
+	 */
+	public function checkDependencies() {
+		$ret = [];
+
+		$result = call_user_func([$this->getStorageClass(), 'checkDependencies']);
+		if ($result !== true) {
+			if (!is_array($result)) {
+				$result = [$result];
+			}
+			foreach ($result as $key => $value) {
+				if (!($value instanceof MissingDependency)) {
+					$module = null;
+					$message = null;
+					if (is_numeric($key)) {
+						$module = $value;
+					} else {
+						$module = $key;
+						$message = $value;
+					}
+					$value = new MissingDependency($module, $this);
+					$value->setMessage($message);
+				}
+				$ret[] = $value;
+			}
+		}
+
+		return $ret;
+	}
+
+}
+
diff --git a/apps/files_external/lib/permissionstrait.php b/apps/files_external/lib/permissionstrait.php
new file mode 100644
index 0000000000..8509a01e42
--- /dev/null
+++ b/apps/files_external/lib/permissionstrait.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib;
+
+use \OCA\Files_External\Service\BackendService;
+
+/**
+ * Trait to implement backend and auth mechanism permissions
+ *
+ * For user type constants, see BackendService::USER_*
+ * For permission constants, see BackendService::PERMISSION_*
+ */
+trait PermissionsTrait {
+
+	/** @var array [user type => permissions] */
+	protected $permissions = [
+		BackendService::USER_PERSONAL => BackendService::PERMISSION_DEFAULT,
+		BackendService::USER_ADMIN => BackendService::PERMISSION_DEFAULT,
+	];
+
+	/** @var array [user type => allowed permissions] */
+	protected $allowedPermissions = [
+		BackendService::USER_PERSONAL => BackendService::PERMISSION_DEFAULT,
+		BackendService::USER_ADMIN => BackendService::PERMISSION_DEFAULT,
+	];
+
+	/**
+	 * @param string $userType
+	 * @return int
+	 */
+	public function getPermissions($userType) {
+		if (isset($this->permissions[$userType])) {
+			return $this->permissions[$userType];
+		}
+		return BackendService::PERMISSION_NONE;
+	}
+
+	/**
+	 * Check if the user type has permission
+	 *
+	 * @param string $userType
+	 * @param int $permission
+	 * @return bool
+	 */
+	public function isPermitted($userType, $permission) {
+		if ($this->getPermissions($userType) & $permission) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permissions
+	 * @return self
+	 */
+	public function setPermissions($userType, $permissions) {
+		$this->permissions[$userType] = $permissions;
+		$this->allowedPermissions[$userType] =
+			$this->getAllowedPermissions($userType) | $permissions;
+		return $this;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function addPermission($userType, $permission) {
+		return $this->setPermissions($userType,
+			$this->getPermissions($userType) | $permission
+		);
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function removePermission($userType, $permission) {
+		return $this->setPermissions($userType,
+			$this->getPermissions($userType) & ~$permission
+		);
+	}
+
+	/**
+	 * @param string $userType
+	 * @return int
+	 */
+	public function getAllowedPermissions($userType) {
+		if (isset($this->allowedPermissions[$userType])) {
+			return $this->allowedPermissions[$userType];
+		}
+		return BackendService::PERMISSION_NONE;
+	}
+
+	/**
+	 * Check if the user type has an allowed permission
+	 *
+	 * @param string $userType
+	 * @param int $permission
+	 * @return bool
+	 */
+	public function isAllowedPermitted($userType, $permission) {
+		if ($this->getAllowedPermissions($userType) & $permission) {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permissions
+	 * @return self
+	 */
+	public function setAllowedPermissions($userType, $permissions) {
+		$this->allowedPermissions[$userType] = $permissions;
+		$this->permissions[$userType] =
+			$this->getPermissions($userType) & $permissions;
+		return $this;
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function addAllowedPermission($userType, $permission) {
+		return $this->setAllowedPermissions($userType,
+			$this->getAllowedPermissions($userType) | $permission
+		);
+	}
+
+	/**
+	 * @param string $userType
+	 * @param int $permission
+	 * @return self
+	 */
+	public function removeAllowedPermission($userType, $permission) {
+		return $this->setAllowedPermissions($userType,
+			$this->getAllowedPermissions($userType) & ~$permission
+		);
+	}
+
+}
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index 7f921b5342..921e7283c6 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -40,10 +40,11 @@ use phpseclib\Net\SFTP\Stream;
 class SFTP extends \OC\Files\Storage\Common {
 	private $host;
 	private $user;
-	private $password;
 	private $root;
 	private $port = 22;
 
+	private $auth;
+
 	/**
 	* @var SFTP
 	*/
@@ -73,8 +74,15 @@ class SFTP extends \OC\Files\Storage\Common {
 		}
 
 		$this->user = $params['user'];
-		$this->password
-			= isset($params['password']) ? $params['password'] : '';
+
+		if (isset($params['public_key_auth'])) {
+			$this->auth = $params['public_key_auth'];
+		} elseif (isset($params['password'])) {
+			$this->auth = $params['password'];
+		} else {
+			throw new \UnexpectedValueException('no authentication parameters specified');
+		}
+
 		$this->root
 			= isset($params['root']) ? $this->cleanPath($params['root']) : '/';
 
@@ -112,7 +120,7 @@ class SFTP extends \OC\Files\Storage\Common {
 			$this->writeHostKeys($hostKeys);
 		}
 
-		if (!$this->client->login($this->user, $this->password)) {
+		if (!$this->client->login($this->user, $this->auth)) {
 			throw new \Exception('Login failed');
 		}
 		return $this->client;
@@ -125,7 +133,6 @@ class SFTP extends \OC\Files\Storage\Common {
 		if (
 			!isset($this->host)
 			|| !isset($this->user)
-			|| !isset($this->password)
 		) {
 			return false;
 		}
diff --git a/apps/files_external/lib/sftp_key.php b/apps/files_external/lib/sftp_key.php
deleted file mode 100644
index a193b32367..0000000000
--- a/apps/files_external/lib/sftp_key.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/**
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Ross Nicoll <jrn@jrn.me.uk>
- *
- * @copyright Copyright (c) 2015, 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\Storage;
-
-use phpseclib\Crypt\RSA;
-
-class SFTP_Key extends \OC\Files\Storage\SFTP {
-	private $publicKey;
-	private $privateKey;
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function __construct($params) {
-		parent::__construct($params);
-		$this->publicKey = $params['public_key'];
-		$this->privateKey = $params['private_key'];
-	}
-
-	/**
-	 * Returns the connection.
-	 *
-	 * @return \phpseclib\Net\SFTP connected client instance
-	 * @throws \Exception when the connection failed
-	 */
-	public function getConnection() {
-		if (!is_null($this->client)) {
-			return $this->client;
-		}
-
-		$hostKeys = $this->readHostKeys();
-		$this->client = new \phpseclib\Net\SFTP($this->getHost());
-
-		// The SSH Host Key MUST be verified before login().
-		$currentHostKey = $this->client->getServerPublicHostKey();
-		if (array_key_exists($this->getHost(), $hostKeys)) {
-			if ($hostKeys[$this->getHost()] !== $currentHostKey) {
-				throw new \Exception('Host public key does not match known key');
-			}
-		} else {
-			$hostKeys[$this->getHost()] = $currentHostKey;
-			$this->writeHostKeys($hostKeys);
-		}
-
-		$key = $this->getPrivateKey();
-		if (is_null($key)) {
-			throw new \Exception('Secret key could not be loaded');
-		}
-		if (!$this->client->login($this->getUser(), $key)) {
-			throw new \Exception('Login failed');
-		}
-		return $this->client;
-	}
-
-	/**
-	 * Returns the private key to be used for authentication to the remote server.
-	 *
-	 * @return RSA instance or null in case of a failure to load the key.
-	 */
-	private function getPrivateKey() {
-		$key = new RSA();
-		$key->setPassword(\OC::$server->getConfig()->getSystemValue('secret', ''));
-		if (!$key->loadKey($this->privateKey)) {
-			// Should this exception rather than return null?
-			return null;
-		}
-		return $key;
-	}
-
-	/**
-	 * Throws an exception if the provided host name/address is invalid (cannot be resolved
-	 * and is not an IPv4 address).
-	 *
-	 * @return true; never returns in case of a problem, this return value is used just to
-	 * make unit tests happy.
-	 */
-	public function assertHostAddressValid($hostname) {
-		// TODO: Should handle IPv6 addresses too
-		if (!preg_match('/^\d+\.\d+\.\d+\.\d+$/', $hostname) && gethostbyname($hostname) === $hostname) {
-			// Hostname is not an IPv4 address and cannot be resolved via DNS
-			throw new \InvalidArgumentException('Cannot resolve hostname.');
-		}
-		return true;
-	}
-
-	/**
-	 * Throws an exception if the provided port number is invalid (cannot be resolved
-	 * and is not an IPv4 address).
-	 *
-	 * @return true; never returns in case of a problem, this return value is used just to
-	 * make unit tests happy.
-	 */
-	public function assertPortNumberValid($port) {
-		if (!preg_match('/^\d+$/', $port)) {
-			throw new \InvalidArgumentException('Port number must be a number.');
-		}
-		if ($port < 0 || $port > 65535) {
-			throw new \InvalidArgumentException('Port number must be between 0 and 65535 inclusive.');
-		}
-		return true;
-	}
-
-	/**
-	 * Replaces anything that's not an alphanumeric character or "." in a hostname
-	 * with "_", to make it safe for use as part of a file name.
-	 */
-	protected function sanitizeHostName($name) {
-		return preg_replace('/[^\d\w\._]/', '_', $name);
-	}
-
-	/**
-	 * Replaces anything that's not an alphanumeric character or "_" in a username
-	 * with "_", to make it safe for use as part of a file name.
-	 */
-	protected function sanitizeUserName($name) {
-		return preg_replace('/[^\d\w_]/', '_', $name);
-	}
-
-	public function test() {
-
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		$host = $this->getHost();
-		if (empty($host)) {
-			\OC::$server->getLogger()->warning('Hostname has not been specified');
-			return false;
-		}
-		// FIXME: Use as expression in empty once PHP 5.4 support is dropped
-		$user = $this->getUser();
-		if (empty($user)) {
-			\OC::$server->getLogger()->warning('Username has not been specified');
-			return false;
-		}
-		if (!isset($this->privateKey)) {
-			\OC::$server->getLogger()->warning('Private key was missing from the request');
-			return false;
-		}
-
-		// Sanity check the host
-		$hostParts = explode(':', $this->getHost());
-		try {
-			if (count($hostParts) == 1) {
-				$hostname = $hostParts[0];
-				$this->assertHostAddressValid($hostname);
-			} else if (count($hostParts) == 2) {
-				$hostname = $hostParts[0];
-				$this->assertHostAddressValid($hostname);
-				$this->assertPortNumberValid($hostParts[1]);
-			} else {
-				throw new \Exception('Host connection string is invalid.');
-			}
-		} catch(\Exception $e) {
-			\OC::$server->getLogger()->warning($e->getMessage());
-			return false;
-		}
-
-		// Validate the key
-		$key = $this->getPrivateKey();
-		if (is_null($key)) {
-			\OC::$server->getLogger()->warning('Secret key could not be loaded');
-			return false;
-		}
-
-		try {
-			if ($this->getConnection()->nlist() === false) {
-				return false;
-			}
-		} catch(\Exception $e) {
-			// We should be throwing a more specific error, so we're not just catching
-			// Exception here
-			\OC::$server->getLogger()->warning($e->getMessage());
-			return false;
-		}
-
-		// Save the key somewhere it can easily be extracted later
-		if (\OC::$server->getUserSession()->getUser()) {
-			$view = new \OC\Files\View('/'.\OC::$server->getUserSession()->getUser()->getUId().'/files_external/sftp_keys');
-			if (!$view->is_dir('')) {
-				if (!$view->mkdir('')) {
-					\OC::$server->getLogger()->warning('Could not create secret key directory.');
-					return false;
-				}
-			}
-			$key_filename = $this->sanitizeUserName($this->getUser()).'@'.$this->sanitizeHostName($hostname).'.pub';
-			$key_file = $view->fopen($key_filename, "w");
-			if ($key_file) {
-				fwrite($key_file, $this->publicKey);
-				fclose($key_file);
-			} else {
-				\OC::$server->getLogger()->warning('Could not write secret key file.');
-			}
-		}
-
-		return true;
-	}
-}
diff --git a/apps/files_external/lib/smb_oc.php b/apps/files_external/lib/smb_oc.php
deleted file mode 100644
index 52b73c46ff..0000000000
--- a/apps/files_external/lib/smb_oc.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Robin Appelman <icewind@owncloud.com>
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- *
- * @copyright Copyright (c) 2015, 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\Storage;
-
-
-use Icewind\SMB\Exception\AccessDeniedException;
-use Icewind\SMB\Exception\Exception;
-use Icewind\SMB\Server;
-
-class SMB_OC extends SMB {
-	private $username_as_share;
-
-	/**
-	 * @param array $params
-	 * @throws \Exception
-	 */
-	public function __construct($params) {
-		if (isset($params['host'])) {
-			$host = $params['host'];
-			$this->username_as_share = ($params['username_as_share'] === 'true');
-
-			// dummy credentials, unused, to satisfy constructor
-			$user = 'foo';
-			$password = 'bar';
-			if (\OC::$server->getSession()->exists('smb-credentials')) {
-				$params_auth = json_decode(\OC::$server->getCrypto()->decrypt(\OC::$server->getSession()->get('smb-credentials')), true);
-				$user = \OC::$server->getSession()->get('loginname');
-				$password = $params_auth['password'];
-			} else {
-				// assume we are testing from the admin section
-			}
-
-			$root = isset($params['root']) ? $params['root'] : '/';
-			$share = '';
-
-			if ($this->username_as_share) {
-				$share = '/' . $user;
-			} elseif (isset($params['share'])) {
-				$share = $params['share'];
-			} else {
-				throw new \Exception();
-			}
-			parent::__construct(array(
-				"user" => $user,
-				"password" => $password,
-				"host" => $host,
-				"share" => $share,
-				"root" => $root
-			));
-		} else {
-			throw new \Exception();
-		}
-	}
-
-
-	/**
-	 * Intercepts the user credentials on login and stores them
-	 * encrypted inside the session if SMB_OC storage is enabled.
-	 * @param array $params
-	 */
-	public static function login($params) {
-		$mountpoints = \OC_Mount_Config::getAbsoluteMountPoints($params['uid']);
-		$mountpointClasses = array();
-		foreach($mountpoints as $mountpoint) {
-			$mountpointClasses[$mountpoint['class']] = true;
-		}
-		if(isset($mountpointClasses['\OC\Files\Storage\SMB_OC'])) {
-			\OC::$server->getSession()->set('smb-credentials', \OC::$server->getCrypto()->encrypt(json_encode($params)));
-		}
-	}
-
-	/**
-	 * @param string $path
-	 * @return boolean
-	 */
-	public function isSharable($path) {
-		return false;
-	}
-
-	/**
-	 * @param bool $isPersonal
-	 * @return bool
-	 */
-	public function test($isPersonal = true) {
-		if ($isPersonal) {
-			if ($this->stat('')) {
-				return true;
-			}
-			return false;
-		} else {
-			$server = new Server($this->server->getHost(), '', '');
-
-			try {
-				$server->listShares();
-				return true;
-			} catch (AccessDeniedException $e) {
-				// expected due to anonymous login
-				return true;
-			} catch (Exception $e) {
-				return false;
-			}
-		}
-	}
-}
diff --git a/apps/files_external/lib/visibilitytrait.php b/apps/files_external/lib/visibilitytrait.php
deleted file mode 100644
index dfd2d323ca..0000000000
--- a/apps/files_external/lib/visibilitytrait.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- * @author Robin McCorkell <rmccorkell@karoshi.org.uk>
- *
- * @copyright Copyright (c) 2015, 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 OCA\Files_External\Lib;
-
-use \OCA\Files_External\Service\BackendService;
-
-/**
- * Trait to implement visibility mechanics for a configuration class
- *
- * The standard visibility defines which users/groups can use or see the
- * object. The allowed visibility defines the maximum visibility allowed to be
- * set on the object. The standard visibility is often set dynamically by
- * stored configuration parameters that can be modified by the administrator,
- * while the allowed visibility is set directly by the object and cannot be
- * modified by the administrator.
- */
-trait VisibilityTrait {
-
-	/** @var int visibility */
-	protected $visibility = BackendService::VISIBILITY_DEFAULT;
-
-	/** @var int allowed visibilities */
-	protected $allowedVisibility = BackendService::VISIBILITY_DEFAULT;
-
-	/**
-	 * @return int
-	 */
-	public function getVisibility() {
-		return $this->visibility;
-	}
-
-	/**
-	 * Check if the backend is visible for a user type
-	 *
-	 * @param int $visibility
-	 * @return bool
-	 */
-	public function isVisibleFor($visibility) {
-		if ($this->visibility & $visibility) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function setVisibility($visibility) {
-		$this->visibility = $visibility;
-		$this->allowedVisibility |= $visibility;
-		return $this;
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function addVisibility($visibility) {
-		return $this->setVisibility($this->visibility | $visibility);
-	}
-
-	/**
-	 * @param int $visibility
-	 * @return self
-	 */
-	public function removeVisibility($visibility) {
-		return $this->setVisibility($this->visibility & ~$visibility);
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getAllowedVisibility() {
-		return $this->allowedVisibility;
-	}
-
-	/**
-	 * Check if the backend is allowed to be visible for a user type
-	 *
-	 * @param int $allowedVisibility
-	 * @return bool
-	 */
-	public function isAllowedVisibleFor($allowedVisibility) {
-		if ($this->allowedVisibility & $allowedVisibility) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function setAllowedVisibility($allowedVisibility) {
-		$this->allowedVisibility = $allowedVisibility;
-		$this->visibility &= $allowedVisibility;
-		return $this;
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function addAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility | $allowedVisibility);
-	}
-
-	/**
-	 * @param int $allowedVisibility
-	 * @return self
-	 */
-	public function removeAllowedVisibility($allowedVisibility) {
-		return $this->setAllowedVisibility($this->allowedVisibility & ~$allowedVisibility);
-	}
-
-}
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 8717d91d4f..d47f983b35 100644
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -34,8 +34,12 @@ $userStoragesService = $appContainer->query('OCA\Files_external\Service\UserStor
 OCP\Util::addScript('files_external', 'settings');
 OCP\Util::addStyle('files_external', 'settings');
 
-$backends = $backendService->getBackendsVisibleFor(BackendService::VISIBILITY_PERSONAL);
-$authMechanisms = $backendService->getAuthMechanismsVisibleFor(BackendService::VISIBILITY_PERSONAL);
+$backends = array_filter($backendService->getAvailableBackends(), function($backend) {
+	return $backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE);
+});
+$authMechanisms = array_filter($backendService->getAuthMechanisms(), function($authMechanism) {
+	return $authMechanism->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE);
+});
 foreach ($backends as $backend) {
 	if ($backend->getCustomJs()) {
 		\OCP\Util::addScript('files_external', $backend->getCustomJs());
diff --git a/apps/files_external/service/backendservice.php b/apps/files_external/service/backendservice.php
index 382834b4c1..70cb929166 100644
--- a/apps/files_external/service/backendservice.php
+++ b/apps/files_external/service/backendservice.php
@@ -31,13 +31,17 @@ use \OCA\Files_External\Lib\Auth\AuthMechanism;
  */
 class BackendService {
 
-	/** Visibility constants for VisibilityTrait */
-	const VISIBILITY_NONE = 0;
-	const VISIBILITY_PERSONAL = 1;
-	const VISIBILITY_ADMIN = 2;
-	//const VISIBILITY_ALIENS = 4;
+	/** Permission constants for PermissionsTrait */
+	const PERMISSION_NONE = 0;
+	const PERMISSION_MOUNT = 1;
+	const PERMISSION_CREATE = 2;
+	const PERMISSION_MODIFY = 4;
 
-	const VISIBILITY_DEFAULT = 3; // PERSONAL | ADMIN
+	const PERMISSION_DEFAULT = 7; // MOUNT | CREATE | MODIFY
+
+	/** User contants */
+	const USER_ADMIN = 'admin';
+	const USER_PERSONAL = 'personal';
 
 	/** Priority constants for PriorityTrait */
 	const PRIORITY_DEFAULT = 100;
@@ -81,7 +85,7 @@ class BackendService {
 	 */
 	public function registerBackend(Backend $backend) {
 		if (!$this->isAllowedUserBackend($backend)) {
-			$backend->removeVisibility(BackendService::VISIBILITY_PERSONAL);
+			$backend->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT);
 		}
 		foreach ($backend->getIdentifierAliases() as $alias) {
 			$this->backends[$alias] = $backend;
@@ -103,7 +107,7 @@ class BackendService {
 	 */
 	public function registerAuthMechanism(AuthMechanism $authMech) {
 		if (!$this->isAllowedAuthMechanism($authMech)) {
-			$authMech->removeVisibility(BackendService::VISIBILITY_PERSONAL);
+			$authMech->removePermission(self::USER_PERSONAL, self::PERMISSION_CREATE | self::PERMISSION_MOUNT);
 		}
 		foreach ($authMech->getIdentifierAliases() as $alias) {
 			$this->authMechanisms[$alias] = $authMech;
@@ -144,30 +148,6 @@ class BackendService {
 		});
 	}
 
-	/**
-	 * Get backends visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return Backend[]
-	 */
-	public function getBackendsVisibleFor($visibleFor) {
-		return array_filter($this->getAvailableBackends(), function($backend) use ($visibleFor) {
-			return $backend->isVisibleFor($visibleFor);
-		});
-	}
-
-	/**
-	 * Get backends allowed to be visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return Backend[]
-	 */
-	public function getBackendsAllowedVisibleFor($visibleFor) {
-		return array_filter($this->getAvailableBackends(), function($backend) use ($visibleFor) {
-			return $backend->isAllowedVisibleFor($visibleFor);
-		});
-	}
-
 	/**
 	 * @param string $identifier
 	 * @return Backend|null
@@ -205,31 +185,6 @@ class BackendService {
 		});
 	}
 
-	/**
-	 * Get authentication mechanisms visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return AuthMechanism[]
-	 */
-	public function getAuthMechanismsVisibleFor($visibleFor) {
-		return array_filter($this->getAuthMechanisms(), function($authMechanism) use ($visibleFor) {
-			return $authMechanism->isVisibleFor($visibleFor);
-		});
-	}
-
-	/**
-	 * Get authentication mechanisms allowed to be visible for $visibleFor
-	 *
-	 * @param int $visibleFor
-	 * @return AuthMechanism[]
-	 */
-	public function getAuthMechanismsAllowedVisibleFor($visibleFor) {
-		return array_filter($this->getAuthMechanisms(), function($authMechanism) use ($visibleFor) {
-			return $authMechanism->isAllowedVisibleFor($visibleFor);
-		});
-	}
-
-
 	/**
 	 * @param string $identifier
 	 * @return AuthMechanism|null
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 282ac8f2db..703f277d84 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -118,6 +118,8 @@ abstract class StoragesService {
 			$applicableGroups[] = $applicable;
 			$storageConfig->setApplicableGroups($applicableGroups);
 		}
+
+
 		return $storageConfig;
 	}
 
@@ -170,7 +172,7 @@ abstract class StoragesService {
 
 					// the root mount point is in the format "/$user/files/the/mount/point"
 					// we remove the "/$user/files" prefix
-					$parts = explode('/', trim($rootMountPath, '/'), 3);
+					$parts = explode('/', ltrim($rootMountPath, '/'), 3);
 					if (count($parts) < 3) {
 						// something went wrong, skip
 						\OCP\Util::writeLog(
@@ -181,7 +183,7 @@ abstract class StoragesService {
 						continue;
 					}
 
-					$relativeMountPath = $parts[2];
+					$relativeMountPath = rtrim($parts[2], '/');
 
 					// note: we cannot do this after the loop because the decrypted config
 					// options might be needed for the config hash
@@ -238,6 +240,12 @@ abstract class StoragesService {
 			$this->setRealStorageIds($storages, $storagesWithConfigHash);
 		}
 
+		// convert parameter values
+		foreach ($storages as $storage) {
+			$storage->getBackend()->validateStorageDefinition($storage);
+			$storage->getAuthMechanism()->validateStorageDefinition($storage);
+		}
+
 		return $storages;
 	}
 
@@ -464,10 +472,14 @@ abstract class StoragesService {
 		if (!isset($allStorages[$id])) {
 			throw new NotFoundException('Storage with id "' . $id . '" not found');
 		}
-
 		$oldStorage = $allStorages[$id];
-		$allStorages[$id] = $updatedStorage;
 
+		// ensure objectstore is persistent
+		if ($objectstore = $oldStorage->getBackendOption('objectstore')) {
+			$updatedStorage->setBackendOption('objectstore', $objectstore);
+		}
+
+		$allStorages[$id] = $updatedStorage;
 		$this->writeConfig($allStorages);
 
 		$this->triggerChangeHooks($oldStorage, $updatedStorage);
diff --git a/apps/files_external/service/userglobalstoragesservice.php b/apps/files_external/service/userglobalstoragesservice.php
index 7852041955..c59652d057 100644
--- a/apps/files_external/service/userglobalstoragesservice.php
+++ b/apps/files_external/service/userglobalstoragesservice.php
@@ -76,20 +76,25 @@ class UserGlobalStoragesService extends GlobalStoragesService {
 		$data = parent::readLegacyConfig();
 		$userId = $this->getUser()->getUID();
 
+		// don't use array_filter() with ARRAY_FILTER_USE_KEY, it's PHP 5.6+
 		if (isset($data[\OC_Mount_Config::MOUNT_TYPE_USER])) {
-			$data[\OC_Mount_Config::MOUNT_TYPE_USER] = array_filter(
-				$data[\OC_Mount_Config::MOUNT_TYPE_USER], function($key) use ($userId) {
-					return (strtolower($key) === strtolower($userId) || $key === 'all');
-				}, ARRAY_FILTER_USE_KEY
-			);
+			$newData = [];
+			foreach ($data[\OC_Mount_Config::MOUNT_TYPE_USER] as $key => $value) {
+				if (strtolower($key) === strtolower($userId) || $key === 'all') {
+					$newData[$key] = $value;
+				}
+			}
+			$data[\OC_Mount_Config::MOUNT_TYPE_USER] = $newData;
 		}
 
 		if (isset($data[\OC_Mount_Config::MOUNT_TYPE_GROUP])) {
-			$data[\OC_Mount_Config::MOUNT_TYPE_GROUP] = array_filter(
-				$data[\OC_Mount_Config::MOUNT_TYPE_GROUP], function($key) use ($userId) {
-					return ($this->groupManager->isInGroup($userId, $key));
-				}, ARRAY_FILTER_USE_KEY
-			);
+			$newData = [];
+			foreach ($data[\OC_Mount_Config::MOUNT_TYPE_GROUP] as $key => $value) {
+				if ($this->groupManager->isInGroup($userId, $key)) {
+					$newData[$key] = $value;
+				}
+			}
+			$data[\OC_Mount_Config::MOUNT_TYPE_GROUP] = $newData;
 		}
 
 		return $data;
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 29c0553158..840f1325fb 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -41,8 +41,12 @@ OCP\Util::addStyle('files_external', 'settings');
 \OC_Util::addVendorScript('select2/select2');
 \OC_Util::addVendorStyle('select2/select2');
 
-$backends = $backendService->getBackendsVisibleFor(BackendService::VISIBILITY_ADMIN);
-$authMechanisms = $backendService->getAuthMechanismsVisibleFor(BackendService::VISIBILITY_ADMIN);
+$backends = array_filter($backendService->getAvailableBackends(), function($backend) {
+	return $backend->isPermitted(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE);
+});
+$authMechanisms = array_filter($backendService->getAuthMechanisms(), function($authMechanism) {
+	return $authMechanism->isPermitted(BackendService::USER_ADMIN, BackendService::PERMISSION_CREATE);
+});
 foreach ($backends as $backend) {
 	if ($backend->getCustomJs()) {
 		\OCP\Util::addScript('files_external', $backend->getCustomJs());
@@ -54,13 +58,19 @@ foreach ($authMechanisms as $authMechanism) {
 	}
 }
 
+$userBackends = array_filter($backendService->getAvailableBackends(), function($backend) {
+	return $backend->isAllowedPermitted(
+		BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT
+	);
+});
+
 $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('encryptionEnabled', \OC::$server->getEncryptionManager()->isEnabled());
 $tmpl->assign('isAdminPage', true);
 $tmpl->assign('storages', $globalStoragesService->getAllStorages());
 $tmpl->assign('backends', $backends);
 $tmpl->assign('authMechanisms', $authMechanisms);
-$tmpl->assign('userBackends', $backendService->getBackendsAllowedVisibleFor(BackendService::VISIBILITY_PERSONAL));
+$tmpl->assign('userBackends', $userBackends);
 $tmpl->assign('dependencies', OC_Mount_Config::dependencyMessage($backendService->getBackends()));
 $tmpl->assign('allowUserMounting', $backendService->isUserMountingAllowed());
 return $tmpl->fetchPage();
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 611c5807a5..63a3a19de2 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -27,7 +27,7 @@
 				<input type="checkbox"
 					<?php if (!empty($classes)): ?> class="<?php p(implode(' ', $classes)); ?>"<?php endif; ?>
 					data-parameter="<?php p($parameter->getName()); ?>"
-				 	<?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
+				 	<?php if ($value === true): ?> checked="checked"<?php endif; ?>
 				/>
 				<?php p($placeholder); ?>
 			</label>
@@ -197,7 +197,7 @@
 		<p id="userMountingBackends"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
 			<?php p($l->t('Allow users to mount the following external storage')); ?><br />
 			<?php $i = 0; foreach ($_['userBackends'] as $backend): ?>
-				<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isVisibleFor(BackendService::VISIBILITY_PERSONAL)) print_unescaped(' checked="checked"'); ?> />
+				<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($backend->getIdentifier()); ?>" <?php if ($backend->isPermitted(BackendService::USER_PERSONAL, BackendService::PERMISSION_MOUNT)) print_unescaped(' checked="checked"'); ?> />
 				<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend->getText()); ?></label> <br />
 				<?php $i++; ?>
 			<?php endforeach; ?>
diff --git a/apps/files_external/tests/backend/legacybackendtest.php b/apps/files_external/tests/backend/legacybackendtest.php
index 44cb16a498..d57810de29 100644
--- a/apps/files_external/tests/backend/legacybackendtest.php
+++ b/apps/files_external/tests/backend/legacybackendtest.php
@@ -23,15 +23,25 @@ namespace OCA\Files_External\Tests\Backend;
 
 use \OCA\Files_External\Lib\Backend\LegacyBackend;
 use \OCA\Files_External\Lib\DefinitionParameter;
+use \OCA\Files_External\Lib\MissingDependency;
 
 class LegacyBackendTest extends \Test\TestCase {
 
+	/**
+	 * @return MissingDependency[]
+	 */
+	public static function checkDependencies() {
+		return [
+			(new MissingDependency('abc'))->setMessage('foobar')
+		];
+	}
+
 	public function testConstructor() {
 		$auth = $this->getMockBuilder('\OCA\Files_External\Lib\Auth\Builtin')
 			->disableOriginalConstructor()
 			->getMock();
 
-		$class = '\OC\Files\Storage\SMB';
+		$class = '\OCA\Files_External\Tests\Backend\LegacyBackendTest';
 		$definition = [
 			'configuration' => [
 				'textfield' => 'Text field',
@@ -49,14 +59,18 @@ class LegacyBackendTest extends \Test\TestCase {
 
 		$backend = new LegacyBackend($class, $definition, $auth);
 
-		$this->assertEquals('\OC\Files\Storage\SMB', $backend->getStorageClass());
+		$this->assertEquals('\OCA\Files_External\Tests\Backend\LegacyBackendTest', $backend->getStorageClass());
 		$this->assertEquals('Backend text', $backend->getText());
 		$this->assertEquals(123, $backend->getPriority());
 		$this->assertEquals('foo/bar.js', $backend->getCustomJs());
-		$this->assertEquals(true, $backend->hasDependencies());
 		$this->assertArrayHasKey('builtin', $backend->getAuthSchemes());
 		$this->assertEquals($auth, $backend->getLegacyAuthMechanism());
 
+		$dependencies = $backend->checkDependencies();
+		$this->assertCount(1, $dependencies);
+		$this->assertEquals('abc', $dependencies[0]->getDependency());
+		$this->assertEquals('foobar', $dependencies[0]->getMessage());
+
 		$parameters = $backend->getParameters();
 		$this->assertEquals('Text field', $parameters['textfield']->getText());
 		$this->assertEquals(DefinitionParameter::VALUE_TEXT, $parameters['textfield']->getType());
@@ -78,4 +92,22 @@ class LegacyBackendTest extends \Test\TestCase {
 		$this->assertEquals(DefinitionParameter::FLAG_OPTIONAL, $parameters['optionalpassword']->getFlags());
 	}
 
+	public function testNoDependencies() {
+		$auth = $this->getMockBuilder('\OCA\Files_External\Lib\Auth\Builtin')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$class = '\OCA\Files_External\Tests\Backend\LegacyBackendTest';
+		$definition = [
+			'configuration' => [
+			],
+			'backend' => 'Backend text',
+		];
+
+		$backend = new LegacyBackend($class, $definition, $auth);
+
+		$dependencies = $backend->checkDependencies();
+		$this->assertCount(0, $dependencies);
+	}
+
 }
diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php
index 2b0ee7a14e..c43761f3bc 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/controller/storagescontrollertest.php
@@ -75,10 +75,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
+		$authMech->method('isPermitted')
+			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -114,10 +116,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
+		$authMech->method('isPermitted')
+			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(1);
@@ -245,10 +249,12 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->willReturn(true);
+		$authMech->method('isPermitted')
+			->willReturn(true);
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn(true);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$storageConfig = new StorageConfig(255);
@@ -332,12 +338,14 @@ abstract class StoragesControllerTest extends \Test\TestCase {
 		$backend = $this->getBackendMock();
 		$backend->method('validateStorage')
 			->willReturn($backendValidate);
-		$backend->method('isVisibleFor')
+		$backend->method('isPermitted')
 			->willReturn(true);
 
 		$authMech = $this->getAuthMechMock();
 		$authMech->method('validateStorage')
 			->will($this->returnValue($authMechValidate));
+		$authMech->method('isPermitted')
+			->willReturn(true);
 
 		$storageConfig = new StorageConfig();
 		$storageConfig->setMountPoint('mount');
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php
index 9f1a8df8d2..b61174b079 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/userstoragescontrollertest.php
@@ -49,15 +49,21 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 	}
 
 	public function testAddOrUpdateStorageDisallowedBackend() {
-		$backend = $this->getBackendMock();
-		$backend->method('isVisibleFor')
-			->with(BackendService::VISIBILITY_PERSONAL)
+		$backend1 = $this->getBackendMock();
+		$backend1->expects($this->once())
+			->method('isPermitted')
+			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE)
+			->willReturn(false);
+		$backend2 = $this->getBackendMock();
+		$backend2->expects($this->once())
+			->method('isPermitted')
+			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_MODIFY)
 			->willReturn(false);
 		$authMech = $this->getAuthMechMock();
 
 		$storageConfig = new StorageConfig(1);
 		$storageConfig->setMountPoint('mount');
-		$storageConfig->setBackend($backend);
+		$storageConfig->setBackend($backend1);
 		$storageConfig->setAuthMechanism($authMech);
 		$storageConfig->setBackendOptions([]);
 
@@ -82,6 +88,8 @@ class UserStoragesControllerTest extends StoragesControllerTest {
 
 		$this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus());
 
+		$storageConfig->setBackend($backend2);
+
 		$response = $this->controller->update(
 			1,
 			'mount',
diff --git a/apps/files_external/tests/definitionparameterttest.php b/apps/files_external/tests/definitionparameterttest.php
index 6be0050869..22e0b84225 100644
--- a/apps/files_external/tests/definitionparameterttest.php
+++ b/apps/files_external/tests/definitionparameterttest.php
@@ -49,6 +49,9 @@ class DefinitionParameterTest extends \Test\TestCase {
 
 			[Param::VALUE_BOOLEAN, Param::FLAG_NONE, false, true],
 			[Param::VALUE_BOOLEAN, Param::FLAG_NONE, 123, false],
+			// conversion from string to boolean
+			[Param::VALUE_BOOLEAN, Param::FLAG_NONE, 'false', true, false],
+			[Param::VALUE_BOOLEAN, Param::FLAG_NONE, 'true', true, true],
 
 			[Param::VALUE_PASSWORD, Param::FLAG_NONE, 'foobar', true],
 			[Param::VALUE_PASSWORD, Param::FLAG_NONE, '', false],
@@ -60,11 +63,14 @@ class DefinitionParameterTest extends \Test\TestCase {
 	/**
 	 * @dataProvider validateValueProvider
 	 */
-	public function testValidateValue($type, $flags, $value, $success) {
+	public function testValidateValue($type, $flags, $value, $success, $expectedValue = null) {
 		$param = new Param('foo', 'bar');
 		$param->setType($type);
 		$param->setFlags($flags);
 
 		$this->assertEquals($success, $param->validateValue($value));
+		if (isset($expectedValue)) {
+			$this->assertEquals($expectedValue, $value);
+		}
 	}
 }
diff --git a/apps/files_external/tests/frontenddefinitiontraittest.php b/apps/files_external/tests/frontenddefinitiontraittest.php
index 871a87d4c5..d92d02b985 100644
--- a/apps/files_external/tests/frontenddefinitiontraittest.php
+++ b/apps/files_external/tests/frontenddefinitiontraittest.php
@@ -70,9 +70,11 @@ class FrontendDefinitionTraitTest extends \Test\TestCase {
 		$storageConfig = $this->getMockBuilder('\OCA\Files_External\Lib\StorageConfig')
 			->disableOriginalConstructor()
 			->getMock();
-		$storageConfig->expects($this->once())
-			->method('getBackendOptions')
-			->willReturn([]);
+		$storageConfig->expects($this->any())
+			->method('getBackendOption')
+			->willReturn(null);
+		$storageConfig->expects($this->any())
+			->method('setBackendOption');
 
 		$trait = $this->getMockForTrait('\OCA\Files_External\Lib\FrontendDefinitionTrait');
 		$trait->setText('test');
@@ -80,4 +82,35 @@ class FrontendDefinitionTraitTest extends \Test\TestCase {
 
 		$this->assertEquals($expectedSuccess, $trait->validateStorageDefinition($storageConfig));
 	}
+
+	public function testValidateStorageSet() {
+		$param = $this->getMockBuilder('\OCA\Files_External\Lib\DefinitionParameter')
+			->disableOriginalConstructor()
+			->getMock();
+		$param->method('getName')
+			->willReturn('param');
+		$param->expects($this->once())
+			->method('validateValue')
+			->will($this->returnCallback(function(&$value) {
+				$value = 'foobar';
+				return true;
+			}));
+
+		$storageConfig = $this->getMockBuilder('\OCA\Files_External\Lib\StorageConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$storageConfig->expects($this->once())
+			->method('getBackendOption')
+			->with('param')
+			->willReturn('barfoo');
+		$storageConfig->expects($this->once())
+			->method('setBackendOption')
+			->with('param', 'foobar');
+
+		$trait = $this->getMockForTrait('\OCA\Files_External\Lib\FrontendDefinitionTrait');
+		$trait->setText('test');
+		$trait->addParameter($param);
+
+		$this->assertEquals(true, $trait->validateStorageDefinition($storageConfig));
+	}
 }
diff --git a/apps/files_external/tests/dependencytraittest.php b/apps/files_external/tests/legacydependencycheckpolyfilltest.php
similarity index 69%
rename from apps/files_external/tests/dependencytraittest.php
rename to apps/files_external/tests/legacydependencycheckpolyfilltest.php
index 5706d97053..49d825d77a 100644
--- a/apps/files_external/tests/dependencytraittest.php
+++ b/apps/files_external/tests/legacydependencycheckpolyfilltest.php
@@ -23,16 +23,23 @@ namespace OCA\Files_External\Tests;
 
 use \OCA\Files_External\Lib\MissingDependency;
 
-class DependencyTraitTest extends \Test\TestCase {
+class LegacyDependencyCheckPolyfillTest extends \Test\TestCase {
+
+	/**
+	 * @return MissingDependency[]
+	 */
+	public static function checkDependencies() {
+		return [
+			(new MissingDependency('dependency'))->setMessage('missing dependency'),
+			(new MissingDependency('program'))->setMessage('cannot find program'),
+		];
+	}
 
 	public function testCheckDependencies() {
-		$trait = $this->getMockForTrait('\OCA\Files_External\Lib\DependencyTrait');
-		$trait->setDependencyCheck(function() {
-			return [
-				(new MissingDependency('dependency'))->setMessage('missing dependency'),
-				(new MissingDependency('program'))->setMessage('cannot find program'),
-			];
-		});
+		$trait = $this->getMockForTrait('\OCA\Files_External\Lib\LegacyDependencyCheckPolyfill');
+		$trait->expects($this->once())
+			->method('getStorageClass')
+			->willReturn('\OCA\Files_External\Tests\LegacyDependencyCheckPolyfillTest');
 
 		$dependencies = $trait->checkDependencies();
 		$this->assertCount(2, $dependencies);
diff --git a/apps/files_external/tests/service/backendservicetest.php b/apps/files_external/tests/service/backendservicetest.php
index 08f6b9bf98..b37b5e9b46 100644
--- a/apps/files_external/tests/service/backendservicetest.php
+++ b/apps/files_external/tests/service/backendservicetest.php
@@ -83,11 +83,11 @@ class BackendServiceTest extends \Test\TestCase {
 
 		$backendAllowed = $this->getBackendMock('\User\Mount\Allowed');
 		$backendAllowed->expects($this->never())
-			->method('removeVisibility');
+			->method('removePermission');
 		$backendNotAllowed = $this->getBackendMock('\User\Mount\NotAllowed');
 		$backendNotAllowed->expects($this->once())
-			->method('removeVisibility')
-			->with(BackendService::VISIBILITY_PERSONAL);
+			->method('removePermission')
+			->with(BackendService::USER_PERSONAL, BackendService::PERMISSION_CREATE | BackendService::PERMISSION_MOUNT);
 
 		$backendAlias = $this->getMockBuilder('\OCA\Files_External\Lib\Backend\Backend')
 			->disableOriginalConstructor()
@@ -126,27 +126,5 @@ class BackendServiceTest extends \Test\TestCase {
 		$this->assertArrayNotHasKey('identifier:\Backend\NotAvailable', $availableBackends);
 	}
 
-	public function testGetUserBackends() {
-		$service = new BackendService($this->config, $this->l10n);
-
-		$backendAllowed = $this->getBackendMock('\User\Mount\Allowed');
-		$backendAllowed->expects($this->once())
-			->method('isVisibleFor')
-			->with(BackendService::VISIBILITY_PERSONAL)
-			->will($this->returnValue(true));
-		$backendNotAllowed = $this->getBackendMock('\User\Mount\NotAllowed');
-		$backendNotAllowed->expects($this->once())
-			->method('isVisibleFor')
-			->with(BackendService::VISIBILITY_PERSONAL)
-			->will($this->returnValue(false));
-
-		$service->registerBackend($backendAllowed);
-		$service->registerBackend($backendNotAllowed);
-
-		$userBackends = $service->getBackendsVisibleFor(BackendService::VISIBILITY_PERSONAL);
-		$this->assertArrayHasKey('identifier:\User\Mount\Allowed', $userBackends);
-		$this->assertArrayNotHasKey('identifier:\User\Mount\NotAllowed', $userBackends);
-	}
-
 }
 
diff --git a/apps/files_external/tests/service/globalstoragesservicetest.php b/apps/files_external/tests/service/globalstoragesservicetest.php
index 05585d2c06..94c34c221f 100644
--- a/apps/files_external/tests/service/globalstoragesservicetest.php
+++ b/apps/files_external/tests/service/globalstoragesservicetest.php
@@ -789,6 +789,13 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
 
 		file_put_contents($configFile, json_encode($json));
 
+		$this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB')
+			->expects($this->exactly(4))
+			->method('validateStorageDefinition');
+		$this->backendService->getAuthMechanism('identifier:\Auth\Mechanism')
+			->expects($this->exactly(4))
+			->method('validateStorageDefinition');
+
 		$allStorages = $this->service->getAllStorages();
 
 		$this->assertCount(4, $allStorages);
@@ -907,4 +914,32 @@ class GlobalStoragesServiceTest extends StoragesServiceTest {
 		$this->assertEquals('identifier:\Auth\Mechanism', $storage2->getAuthMechanism()->getIdentifier());
 	}
 
+	public function testReadEmptyMountPoint() {
+		$configFile = $this->dataDir . '/mount.json';
+
+		$json = [
+			'user' => [
+				'user1' => [
+					'/$user/files/' => [
+						'backend' => 'identifier:\OCA\Files_External\Lib\Backend\SFTP',
+						'authMechanism' => 'identifier:\Auth\Mechanism',
+						'options' => [],
+						'mountOptions' => [],
+					],
+				]
+			]
+		];
+
+		file_put_contents($configFile, json_encode($json));
+
+		$allStorages = $this->service->getAllStorages();
+
+		$this->assertCount(1, $allStorages);
+
+		$storage1 = $allStorages[1];
+
+		$this->assertEquals('/', $storage1->getMountPoint());
+	}
+
+
 }
diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/service/userglobalstoragesservicetest.php
index 49a0245384..b9e2c08c93 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/service/userglobalstoragesservicetest.php
@@ -212,4 +212,9 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		$this->assertTrue(true);
 	}
 
+	public function testReadEmptyMountPoint() {
+		// we don't test this here
+		$this->assertTrue(true);
+	}
+
 }
diff --git a/apps/files_sharing/ajax/external.php b/apps/files_sharing/ajax/external.php
index d26a64d3ae..66cfd8e9d1 100644
--- a/apps/files_sharing/ajax/external.php
+++ b/apps/files_sharing/ajax/external.php
@@ -52,6 +52,7 @@ $externalManager = new \OCA\Files_Sharing\External\Manager(
 		\OC\Files\Filesystem::getMountManager(),
 		\OC\Files\Filesystem::getLoader(),
 		\OC::$server->getHTTPHelper(),
+		\OC::$server->getNotificationManager(),
 		\OC::$server->getUserSession()->getUser()->getUID()
 );
 
diff --git a/apps/files_sharing/api/local.php b/apps/files_sharing/api/local.php
index eb0e0e0d84..61b8b47d2d 100644
--- a/apps/files_sharing/api/local.php
+++ b/apps/files_sharing/api/local.php
@@ -258,6 +258,7 @@ class Local {
 		$itemSource = self::getFileId($path);
 		$itemSourceName = $itemSource;
 		$itemType = self::getItemType($path);
+		$expirationDate = null;
 
 		if($itemSource === null) {
 			return new \OC_OCS_Result(null, 404, "wrong path, file/folder doesn't exist.");
@@ -286,6 +287,14 @@ class Local {
 				// read, create, update (7) if public upload is enabled or
 				// read (1) if public upload is disabled
 				$permissions = $publicUpload === 'true' ? 7 : 1;
+
+				// Get the expiration date
+				try {
+					$expirationDate = isset($_POST['expireDate']) ? self::parseDate($_POST['expireDate']) : null;
+				} catch (\Exception $e) {
+					return new \OC_OCS_Result(null, 404, 'Invalid Date. Format must be YYYY-MM-DD.');
+				}
+
 				break;
 			default:
 				return new \OC_OCS_Result(null, 400, "unknown share type");
@@ -302,10 +311,15 @@ class Local {
 					$shareType,
 					$shareWith,
 					$permissions,
-					$itemSourceName
-					);
+					$itemSourceName,
+					$expirationDate
+			);
 		} catch (HintException $e) {
-			return new \OC_OCS_Result(null, 400, $e->getHint());
+			if ($e->getCode() === 0) {
+				return new \OC_OCS_Result(null, 400, $e->getHint());
+			} else {
+				return new \OC_OCS_Result(null, $e->getCode(), $e->getHint());
+			}
 		} catch (\Exception $e) {
 			return new \OC_OCS_Result(null, 403, $e->getMessage());
 		}
@@ -332,6 +346,10 @@ class Local {
 					}
 				}
 			}
+
+			$data['permissions'] = $share['permissions'];
+			$data['expiration'] = $share['expiration'];
+
 			return new \OC_OCS_Result($data);
 		} else {
 			return new \OC_OCS_Result(null, 404, "couldn't share file");
@@ -537,6 +555,30 @@ class Local {
 		}
 	}
 
+	/**
+	 * Make sure that the passed date is valid ISO 8601
+	 * So YYYY-MM-DD
+	 * If not throw an exception
+	 *
+	 * @param string $expireDate
+	 *
+	 * @throws \Exception
+	 * @return \DateTime
+	 */
+	private static function parseDate($expireDate) {
+		if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $expireDate) === 0) {
+			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+		}
+
+		$date = new \DateTime($expireDate);
+
+		if ($date === false) {
+			throw new \Exception('Invalid date. Format must be YYYY-MM-DD');
+		}
+
+		return $date;
+	}
+
 	/**
 	 * get file ID from a given path
 	 * @param string $path
diff --git a/apps/files_sharing/api/remote.php b/apps/files_sharing/api/remote.php
index f6cb0a29d8..0f6d2dc265 100644
--- a/apps/files_sharing/api/remote.php
+++ b/apps/files_sharing/api/remote.php
@@ -38,6 +38,7 @@ class Remote {
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
 			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
 			\OC_User::getUser()
 		);
 
@@ -56,6 +57,7 @@ class Remote {
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
 			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
 			\OC_User::getUser()
 		);
 
@@ -78,6 +80,7 @@ class Remote {
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
 			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
 			\OC_User::getUser()
 		);
 
@@ -87,5 +90,4 @@ class Remote {
 
 		return new \OC_OCS_Result(null, 404, "wrong share ID, share doesn't exist.");
 	}
-
 }
diff --git a/apps/files_sharing/api/server2server.php b/apps/files_sharing/api/server2server.php
index 4328e3830b..6ecaea2053 100644
--- a/apps/files_sharing/api/server2server.php
+++ b/apps/files_sharing/api/server2server.php
@@ -70,6 +70,7 @@ class Server2Server {
 					\OC\Files\Filesystem::getMountManager(),
 					\OC\Files\Filesystem::getLoader(),
 					\OC::$server->getHTTPHelper(),
+					\OC::$server->getNotificationManager(),
 					$shareWith
 				);
 
@@ -82,6 +83,28 @@ class Server2Server {
 					Activity::FILES_SHARING_APP, Activity::SUBJECT_REMOTE_SHARE_RECEIVED, array($user, trim($name, '/')), '', array(),
 					'', '', $shareWith, Activity::TYPE_REMOTE_SHARE, Activity::PRIORITY_LOW);
 
+				$urlGenerator = \OC::$server->getURLGenerator();
+
+				$notificationManager = \OC::$server->getNotificationManager();
+				$notification = $notificationManager->createNotification();
+				$notification->setApp('files_sharing')
+					->setUser($shareWith)
+					->setTimestamp(time())
+					->setObject('remote_share', $remoteId)
+					->setSubject('remote_share', [$user, trim($name, '/')]);
+
+				$acceptAction = $notification->createAction();
+				$acceptAction->setLabel('accept')
+					->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/' . $remoteId), 'POST');
+				$declineAction = $notification->createAction();
+				$declineAction->setLabel('decline')
+					->setLink($urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/remote_shares/' . $remoteId), 'DELETE');
+
+				$notification->addAction($acceptAction)
+					->addAction($declineAction);
+
+				$notificationManager->notify($notification);
+
 				return new \OC_OCS_Result();
 			} catch (\Exception $e) {
 				\OCP\Util::writeLog('files_sharing', 'server can not add remote share, ' . $e->getMessage(), \OCP\Util::ERROR);
diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
new file mode 100644
index 0000000000..924a9dd1cd
--- /dev/null
+++ b/apps/files_sharing/api/sharees.php
@@ -0,0 +1,409 @@
+<?php
+/**
+ * @author Roeland Jago Douma <roeland@famdouma.nl>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_Sharing\API;
+
+use OCP\Contacts\IManager;
+use OCP\IGroup;
+use OCP\IGroupManager;
+use OCP\ILogger;
+use OCP\IRequest;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\IConfig;
+use OCP\IUserSession;
+use OCP\IURLGenerator;
+use OCP\Share;
+
+class Sharees {
+
+	/** @var IGroupManager */
+	protected $groupManager;
+
+	/** @var IUserManager */
+	protected $userManager;
+
+	/** @var IManager */
+	protected $contactsManager;
+
+	/** @var IConfig */
+	protected $config;
+
+	/** @var IUserSession */
+	protected $userSession;
+
+	/** @var IRequest */
+	protected $request;
+
+	/** @var IURLGenerator */
+	protected $urlGenerator;
+
+	/** @var ILogger */
+	protected $logger;
+
+	/** @var bool */
+	protected $shareWithGroupOnly = false;
+
+	/** @var int */
+	protected $offset = 0;
+
+	/** @var int */
+	protected $limit = 10;
+
+	/** @var array */
+	protected $result = [
+		'exact' => [
+			'users' => [],
+			'groups' => [],
+			'remotes' => [],
+		],
+		'users' => [],
+		'groups' => [],
+		'remotes' => [],
+	];
+
+	protected $reachedEndFor = [];
+
+	/**
+	 * @param IGroupManager $groupManager
+	 * @param IUserManager $userManager
+	 * @param IManager $contactsManager
+	 * @param IConfig $config
+	 * @param IUserSession $userSession
+	 * @param IURLGenerator $urlGenerator
+	 * @param IRequest $request
+	 * @param ILogger $logger
+	 */
+	public function __construct(IGroupManager $groupManager,
+								IUserManager $userManager,
+								IManager $contactsManager,
+								IConfig $config,
+								IUserSession $userSession,
+								IURLGenerator $urlGenerator,
+								IRequest $request,
+								ILogger $logger) {
+		$this->groupManager = $groupManager;
+		$this->userManager = $userManager;
+		$this->contactsManager = $contactsManager;
+		$this->config = $config;
+		$this->userSession = $userSession;
+		$this->urlGenerator = $urlGenerator;
+		$this->request = $request;
+		$this->logger = $logger;
+	}
+
+	/**
+	 * @param string $search
+	 */
+	protected function getUsers($search) {
+		$this->result['users'] = $this->result['exact']['users'] = $users = [];
+
+		if ($this->shareWithGroupOnly) {
+			// Search in all the groups this user is part of
+			$userGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
+			foreach ($userGroups as $userGroup) {
+				$usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $this->limit, $this->offset);
+				foreach ($usersTmp as $uid => $userDisplayName) {
+					$users[$uid] = $userDisplayName;
+				}
+			}
+		} else {
+			// Search in all users
+			$usersTmp = $this->userManager->searchDisplayName($search, $this->limit, $this->offset);
+
+			foreach ($usersTmp as $user) {
+				$users[$user->getUID()] = $user->getDisplayName();
+			}
+		}
+
+		if (sizeof($users) < $this->limit) {
+			$this->reachedEndFor[] = 'users';
+		}
+
+		$foundUserById = false;
+		foreach ($users as $uid => $userDisplayName) {
+			if (strtolower($uid) === $search || strtolower($userDisplayName) === $search) {
+				if (strtolower($uid) === $search) {
+					$foundUserById = true;
+				}
+				$this->result['exact']['users'][] = [
+					'label' => $userDisplayName,
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_USER,
+						'shareWith' => $uid,
+					],
+				];
+			} else {
+				$this->result['users'][] = [
+					'label' => $userDisplayName,
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_USER,
+						'shareWith' => $uid,
+					],
+				];
+			}
+		}
+
+		if ($this->offset === 0 && !$foundUserById) {
+			// On page one we try if the search result has a direct hit on the
+			// user id and if so, we add that to the exact match list
+			$user = $this->userManager->get($search);
+			if ($user instanceof IUser) {
+				array_push($this->result['exact']['users'], [
+					'label' => $user->getDisplayName(),
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_USER,
+						'shareWith' => $user->getUID(),
+					],
+				]);
+			}
+		}
+	}
+
+	/**
+	 * @param string $search
+	 */
+	protected function getGroups($search) {
+		$this->result['groups'] = $this->result['exact']['groups'] = [];
+
+		$groups = $this->groupManager->search($search, $this->limit, $this->offset);
+		$groups = array_map(function (IGroup $group) { return $group->getGID(); }, $groups);
+
+		if (sizeof($groups) < $this->limit) {
+			$this->reachedEndFor[] = 'groups';
+		}
+
+		$userGroups =  [];
+		if (!empty($groups) && $this->shareWithGroupOnly) {
+			// Intersect all the groups that match with the groups this user is a member of
+			$userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
+			$userGroups = array_map(function (IGroup $group) { return $group->getGID(); }, $userGroups);
+			$groups = array_intersect($groups, $userGroups);
+		}
+
+		foreach ($groups as $gid) {
+			if (strtolower($gid) === $search) {
+				$this->result['exact']['groups'][] = [
+					'label' => $search,
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_GROUP,
+						'shareWith' => $search,
+					],
+				];
+			} else {
+				$this->result['groups'][] = [
+					'label' => $gid,
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_GROUP,
+						'shareWith' => $gid,
+					],
+				];
+			}
+		}
+
+		if ($this->offset === 0 && empty($this->result['exact']['groups'])) {
+			// On page one we try if the search result has a direct hit on the
+			// user id and if so, we add that to the exact match list
+			$group = $this->groupManager->get($search);
+			if ($group instanceof IGroup && (!$this->shareWithGroupOnly || in_array($group->getGID(), $userGroups))) {
+				array_push($this->result['exact']['groups'], [
+					'label' => $group->getGID(),
+					'value' => [
+						'shareType' => Share::SHARE_TYPE_GROUP,
+						'shareWith' => $group->getGID(),
+					],
+				]);
+			}
+		}
+	}
+
+	/**
+	 * @param string $search
+	 * @return array possible sharees
+	 */
+	protected function getRemote($search) {
+		$this->result['remotes'] = [];
+
+		// Search in contacts
+		//@todo Pagination missing
+		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
+		$foundRemoteById = false;
+		foreach ($addressBookContacts as $contact) {
+			if (isset($contact['CLOUD'])) {
+				foreach ($contact['CLOUD'] as $cloudId) {
+					if (strtolower($contact['FN']) === $search || strtolower($cloudId) === $search) {
+						if (strtolower($cloudId) === $search) {
+							$foundRemoteById = true;
+						}
+						$this->result['exact']['remotes'][] = [
+							'label' => $contact['FN'],
+							'value' => [
+								'shareType' => Share::SHARE_TYPE_REMOTE,
+								'shareWith' => $cloudId,
+							],
+						];
+					} else {
+						$this->result['remotes'][] = [
+							'label' => $contact['FN'],
+							'value' => [
+								'shareType' => Share::SHARE_TYPE_REMOTE,
+								'shareWith' => $cloudId,
+							],
+						];
+					}
+				}
+			}
+		}
+
+		if (!$foundRemoteById && substr_count($search, '@') >= 1 && substr_count($search, ' ') === 0 && $this->offset === 0) {
+			$this->result['exact']['remotes'][] = [
+				'label' => $search,
+				'value' => [
+					'shareType' => Share::SHARE_TYPE_REMOTE,
+					'shareWith' => $search,
+				],
+			];
+		}
+
+		$this->reachedEndFor[] = 'remotes';
+	}
+
+	/**
+	 * @return \OC_OCS_Result
+	 */
+	public function search() {
+		$search = isset($_GET['search']) ? (string) $_GET['search'] : '';
+		$itemType = isset($_GET['itemType']) ? (string) $_GET['itemType'] : null;
+		$page = !empty($_GET['page']) ? max(1, (int) $_GET['page']) : 1;
+		$perPage = !empty($_GET['perPage']) ? max(1, (int) $_GET['perPage']) : 200;
+
+		$shareTypes = [
+			Share::SHARE_TYPE_USER,
+			Share::SHARE_TYPE_GROUP,
+			Share::SHARE_TYPE_REMOTE,
+		];
+		if (isset($_GET['shareType']) && is_array($_GET['shareType'])) {
+			$shareTypes = array_intersect($shareTypes, $_GET['shareType']);
+			sort($shareTypes);
+
+		} else if (isset($_GET['shareType']) && is_numeric($_GET['shareType'])) {
+			$shareTypes = array_intersect($shareTypes, [(int) $_GET['shareType']]);
+			sort($shareTypes);
+		}
+
+		if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes) && !$this->isRemoteSharingAllowed($itemType)) {
+			// Remove remote shares from type array, because it is not allowed.
+			$shareTypes = array_diff($shareTypes, [Share::SHARE_TYPE_REMOTE]);
+		}
+
+		$this->shareWithGroupOnly = $this->config->getAppValue('core', 'shareapi_only_share_with_group_members', 'no') === 'yes';
+		$this->limit = (int) $perPage;
+		$this->offset = $perPage * ($page - 1);
+
+		return $this->searchSharees(strtolower($search), $itemType, $shareTypes, $page, $perPage);
+	}
+
+	/**
+	 * Method to get out the static call for better testing
+	 *
+	 * @param string $itemType
+	 * @return bool
+	 */
+	protected function isRemoteSharingAllowed($itemType) {
+		try {
+			$backend = Share::getBackend($itemType);
+			return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE);
+		} catch (\Exception $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * Testable search function that does not need globals
+	 *
+	 * @param string $search
+	 * @param string $itemType
+	 * @param array $shareTypes
+	 * @param int $page
+	 * @param int $perPage
+	 * @return \OC_OCS_Result
+	 */
+	protected function searchSharees($search, $itemType, array $shareTypes, $page, $perPage) {
+		// Verify arguments
+		if ($itemType === null) {
+			return new \OC_OCS_Result(null, 400, 'missing itemType');
+		}
+
+		// Get users
+		if (in_array(Share::SHARE_TYPE_USER, $shareTypes)) {
+			$this->getUsers($search);
+		}
+
+		// Get groups
+		if (in_array(Share::SHARE_TYPE_GROUP, $shareTypes)) {
+			$this->getGroups($search);
+		}
+
+		// Get remote
+		if (in_array(Share::SHARE_TYPE_REMOTE, $shareTypes)) {
+			$this->getRemote($search);
+		}
+
+		$response = new \OC_OCS_Result($this->result);
+		$response->setItemsPerPage($perPage);
+
+		if (sizeof($this->reachedEndFor) < 3) {
+			$response->addHeader('Link', $this->getPaginationLink($page, [
+				'search' => $search,
+				'itemType' => $itemType,
+				'shareType' => $shareTypes,
+				'perPage' => $perPage,
+			]));
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Generates a bunch of pagination links for the current page
+	 *
+	 * @param int $page Current page
+	 * @param array $params Parameters for the URL
+	 * @return string
+	 */
+	protected function getPaginationLink($page, array $params) {
+		if ($this->isV2()) {
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v2.php/apps/files_sharing/api/v1/sharees') . '?';
+		} else {
+			$url = $this->urlGenerator->getAbsoluteURL('/ocs/v1.php/apps/files_sharing/api/v1/sharees') . '?';
+		}
+		$params['page'] = $page + 1;
+		$link = '<' . $url . http_build_query($params) . '>; rel="next"';
+
+		return $link;
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isV2() {
+		return $this->request->getScriptName() === '/ocs/v2.php';
+	}
+}
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 9000fafd8d..20f1b046d3 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -58,10 +58,6 @@ $application->setupPropagation();
 \OCP\Util::addScript('files_sharing', 'external');
 \OCP\Util::addStyle('files_sharing', 'sharetabview');
 
-// FIXME: registering a job here will cause additional useless SQL queries
-// when the route is not cron.php, needs a better way
-\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob');
-
 \OC::$server->getActivityManager()->registerExtension(function() {
 		return new \OCA\Files_Sharing\Activity(
 			\OC::$server->query('L10NFactory'),
@@ -107,3 +103,10 @@ if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') {
 		}
 	}
 }
+
+$manager = \OC::$server->getNotificationManager();
+$manager->registerNotifier(function() {
+	return new \OCA\Files_Sharing\Notifier(
+		\OC::$server->getL10NFactory()
+	);
+});
diff --git a/apps/files_sharing/appinfo/application.php b/apps/files_sharing/appinfo/application.php
index 2fe9019d54..d0dcadb77e 100644
--- a/apps/files_sharing/appinfo/application.php
+++ b/apps/files_sharing/appinfo/application.php
@@ -62,7 +62,8 @@ class Application extends App {
 				$c->query('AppName'),
 				$c->query('Request'),
 				$c->query('IsIncomingShareEnabled'),
-				$c->query('ExternalManager')
+				$c->query('ExternalManager'),
+				$c->query('HttpClientService')
 			);
 		});
 
@@ -78,6 +79,9 @@ class Application extends App {
 		$container->registerService('UserManager', function (SimpleContainer $c) use ($server) {
 			return $server->getUserManager();
 		});
+		$container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
+			return $server->getHTTPClientService();
+		});
 		$container->registerService('IsIncomingShareEnabled', function (SimpleContainer $c) {
 			return Helper::isIncomingServer2serverShareEnabled();
 		});
@@ -89,6 +93,7 @@ class Application extends App {
 				\OC\Files\Filesystem::getMountManager(),
 				\OC\Files\Filesystem::getLoader(),
 				$server->getHTTPHelper(),
+				$server->getNotificationManager(),
 				$uid
 			);
 		});
diff --git a/apps/files_sharing/appinfo/install.php b/apps/files_sharing/appinfo/install.php
new file mode 100644
index 0000000000..f076a17e44
--- /dev/null
+++ b/apps/files_sharing/appinfo/install.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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/>
+ *
+ */
+
+\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob');
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 1e99267a43..375124cb73 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -33,7 +33,14 @@ $application = new Application();
 $application->registerRoutes($this, [
 	'resources' => [
 		'ExternalShares' => ['url' => '/api/externalShares'],
-	]
+	],
+	'routes' => [
+		[
+			'name' => 'externalShares#testRemote',
+			'url' => '/testremote',
+			'verb' => 'GET'
+		],
+	],
 ]);
 
 /** @var $this \OCP\Route\IRouter */
@@ -50,8 +57,6 @@ $this->create('sharing_external_shareinfo', '/shareinfo')
 	->actionInclude('files_sharing/ajax/shareinfo.php');
 $this->create('sharing_external_add', '/external')
 	->actionInclude('files_sharing/ajax/external.php');
-$this->create('sharing_external_test_remote', '/testremote')
-	->actionInclude('files_sharing/ajax/testremote.php');
 
 // OCS API
 
@@ -97,3 +102,16 @@ API::register('delete',
 		array('\OCA\Files_Sharing\API\Remote', 'declineShare'),
 		'files_sharing');
 
+$sharees = new \OCA\Files_Sharing\API\Sharees(\OC::$server->getGroupManager(),
+                                              \OC::$server->getUserManager(),
+                                              \OC::$server->getContactsManager(),
+                                              \OC::$server->getConfig(),
+                                              \OC::$server->getUserSession(),
+                                              \OC::$server->getURLGenerator(),
+                                              \OC::$server->getRequest(),
+                                              \OC::$server->getLogger());
+
+API::register('get',
+		'/apps/files_sharing/api/v1/sharees',
+		[$sharees, 'search'],
+		'files_sharing', API::USER_AUTH);
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index e98b60ea36..66b8b78cac 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -28,3 +28,4 @@ if (version_compare($installedVersion, '0.6.0', '<')) {
 	$m->addAcceptRow();
 }
 
+\OC::$server->getJobList()->add('OCA\Files_sharing\Lib\DeleteOrphanedSharesJob');
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index b616048743..844f6a91ac 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.6.2
+0.6.3
diff --git a/apps/files_sharing/css/settings-personal.css b/apps/files_sharing/css/settings-personal.css
index c9af6c08c4..f53365c937 100644
--- a/apps/files_sharing/css/settings-personal.css
+++ b/apps/files_sharing/css/settings-personal.css
@@ -4,6 +4,7 @@
 
 #fileSharingSettings xmp {
 	margin-top: 0;
+	white-space: pre-wrap;
 }
 
 [class^="social-"], [class*=" social-"] {
diff --git a/apps/files_sharing/js/settings-personal.js b/apps/files_sharing/js/settings-personal.js
index 1c7aea0b9d..14a9b7bbfa 100644
--- a/apps/files_sharing/js/settings-personal.js
+++ b/apps/files_sharing/js/settings-personal.js
@@ -12,4 +12,8 @@ $(document).ready(function() {
 		}
 	});
 
+	$('#oca-files-sharing-add-to-your-website').click(function() {
+		$('#oca-files-sharing-add-to-your-website-expanded').slideDown();
+	});
+
 });
diff --git a/apps/files_sharing/l10n/af_ZA.js b/apps/files_sharing/l10n/af_ZA.js
index 4a732284a8..4e05c59835 100644
--- a/apps/files_sharing/l10n/af_ZA.js
+++ b/apps/files_sharing/l10n/af_ZA.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Kanseleer",
-    "Share" : "Deel",
     "Password" : "Wagwoord"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/af_ZA.json b/apps/files_sharing/l10n/af_ZA.json
index 9ee5e10493..1e959e1544 100644
--- a/apps/files_sharing/l10n/af_ZA.json
+++ b/apps/files_sharing/l10n/af_ZA.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "Kanseleer",
-    "Share" : "Deel",
     "Password" : "Wagwoord"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ar.js b/apps/files_sharing/l10n/ar.js
index b507d91a2b..376526356d 100644
--- a/apps/files_sharing/l10n/ar.js
+++ b/apps/files_sharing/l10n/ar.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "إلغاء",
-    "Share" : "شارك",
     "Shared by" : "تم مشاركتها بواسطة",
+    "Sharing" : "مشاركة",
     "A file or folder has been <strong>shared</strong>" : "ملف أو مجلد تم </strong>مشاركته<strong> ",
     "You shared %1$s with %2$s" : "شاركت %1$s مع %2$s",
     "You shared %1$s with group %2$s" : "أنت شاركت %1$s مع مجموعة %2$s",
diff --git a/apps/files_sharing/l10n/ar.json b/apps/files_sharing/l10n/ar.json
index 046413c3fb..e8590b931d 100644
--- a/apps/files_sharing/l10n/ar.json
+++ b/apps/files_sharing/l10n/ar.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Cancel" : "إلغاء",
-    "Share" : "شارك",
     "Shared by" : "تم مشاركتها بواسطة",
+    "Sharing" : "مشاركة",
     "A file or folder has been <strong>shared</strong>" : "ملف أو مجلد تم </strong>مشاركته<strong> ",
     "You shared %1$s with %2$s" : "شاركت %1$s مع %2$s",
     "You shared %1$s with group %2$s" : "أنت شاركت %1$s مع مجموعة %2$s",
diff --git a/apps/files_sharing/l10n/ast.js b/apps/files_sharing/l10n/ast.js
index bded7e785d..9ba12962bd 100644
--- a/apps/files_sharing/l10n/ast.js
+++ b/apps/files_sharing/l10n/ast.js
@@ -14,8 +14,8 @@ OC.L10N.register(
     "Cancel" : "Encaboxar",
     "Add remote share" : "Amestar compartición remota",
     "Invalid ownCloud url" : "Url ownCloud inválida",
-    "Share" : "Compartir",
     "Shared by" : "Compartíos por",
+    "Sharing" : "Compartiendo",
     "A file or folder has been <strong>shared</strong>" : "<strong>Compartióse</strong> un ficheru o direutoriu",
     "You shared %1$s with %2$s" : "Compartisti %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Compartisti %1$s col grupu %2$s",
diff --git a/apps/files_sharing/l10n/ast.json b/apps/files_sharing/l10n/ast.json
index af8f98cf2b..52cd9b9013 100644
--- a/apps/files_sharing/l10n/ast.json
+++ b/apps/files_sharing/l10n/ast.json
@@ -12,8 +12,8 @@
     "Cancel" : "Encaboxar",
     "Add remote share" : "Amestar compartición remota",
     "Invalid ownCloud url" : "Url ownCloud inválida",
-    "Share" : "Compartir",
     "Shared by" : "Compartíos por",
+    "Sharing" : "Compartiendo",
     "A file or folder has been <strong>shared</strong>" : "<strong>Compartióse</strong> un ficheru o direutoriu",
     "You shared %1$s with %2$s" : "Compartisti %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Compartisti %1$s col grupu %2$s",
diff --git a/apps/files_sharing/l10n/az.js b/apps/files_sharing/l10n/az.js
index 7c8b2f812f..72fdda3ca9 100644
--- a/apps/files_sharing/l10n/az.js
+++ b/apps/files_sharing/l10n/az.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Siz bu qovluğun içinə yükləyə bilərsiniz",
     "No ownCloud installation (7 or higher) found at {remote}" : "Yüklənmiş (7 yada yuxarı) ownCloud {uzaq} unvanında tapılmadı ",
     "Invalid ownCloud url" : "Yalnış ownCloud url-i",
-    "Share" : "Yayımla",
     "Shared by" : "Tərəfindən yayımlanıb",
+    "Sharing" : "Paylaşılır",
     "A file or folder has been <strong>shared</strong>" : "Fayl və ya direktoriya <strong>yayımlandı</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Fayl yada qovluq ünvanından yayımlandı <strong>digər serverə</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Ümumi paylaşılmış fayl yada qovluq <strong>endirilmişdir</strong>",
diff --git a/apps/files_sharing/l10n/az.json b/apps/files_sharing/l10n/az.json
index 4de0b9df5c..4e595220b6 100644
--- a/apps/files_sharing/l10n/az.json
+++ b/apps/files_sharing/l10n/az.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Siz bu qovluğun içinə yükləyə bilərsiniz",
     "No ownCloud installation (7 or higher) found at {remote}" : "Yüklənmiş (7 yada yuxarı) ownCloud {uzaq} unvanında tapılmadı ",
     "Invalid ownCloud url" : "Yalnış ownCloud url-i",
-    "Share" : "Yayımla",
     "Shared by" : "Tərəfindən yayımlanıb",
+    "Sharing" : "Paylaşılır",
     "A file or folder has been <strong>shared</strong>" : "Fayl və ya direktoriya <strong>yayımlandı</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Fayl yada qovluq ünvanından yayımlandı <strong>digər serverə</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Ümumi paylaşılmış fayl yada qovluq <strong>endirilmişdir</strong>",
diff --git a/apps/files_sharing/l10n/bg_BG.js b/apps/files_sharing/l10n/bg_BG.js
index 2f8cfed5a9..4a7ec23b8e 100644
--- a/apps/files_sharing/l10n/bg_BG.js
+++ b/apps/files_sharing/l10n/bg_BG.js
@@ -23,8 +23,8 @@ OC.L10N.register(
     "Add remote share" : "Добави прикачена папка",
     "No ownCloud installation (7 or higher) found at {remote}" : "Не е открита ownCloud ( 7 или по-висока ) инсталация на {remote}.",
     "Invalid ownCloud url" : "Невалиден ownCloud интернет адрес.",
-    "Share" : "Сподели",
     "Shared by" : "Споделено от",
+    "Sharing" : "Споделяне",
     "A file or folder has been <strong>shared</strong>" : "Файл или папка беше <strong>споделен/а</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Файл или папка е споделен от  <strong>друг сървър</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Публично споделен файл или папка е  <strong>изтеглен</strong>",
diff --git a/apps/files_sharing/l10n/bg_BG.json b/apps/files_sharing/l10n/bg_BG.json
index ec8a686ca0..b15438e837 100644
--- a/apps/files_sharing/l10n/bg_BG.json
+++ b/apps/files_sharing/l10n/bg_BG.json
@@ -21,8 +21,8 @@
     "Add remote share" : "Добави прикачена папка",
     "No ownCloud installation (7 or higher) found at {remote}" : "Не е открита ownCloud ( 7 или по-висока ) инсталация на {remote}.",
     "Invalid ownCloud url" : "Невалиден ownCloud интернет адрес.",
-    "Share" : "Сподели",
     "Shared by" : "Споделено от",
+    "Sharing" : "Споделяне",
     "A file or folder has been <strong>shared</strong>" : "Файл или папка беше <strong>споделен/а</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Файл или папка е споделен от  <strong>друг сървър</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Публично споделен файл или папка е  <strong>изтеглен</strong>",
diff --git a/apps/files_sharing/l10n/bn_BD.js b/apps/files_sharing/l10n/bn_BD.js
index 310e67347f..a318f0dacb 100644
--- a/apps/files_sharing/l10n/bn_BD.js
+++ b/apps/files_sharing/l10n/bn_BD.js
@@ -9,8 +9,8 @@ OC.L10N.register(
     "Remote share" : "দুরবর্তী ভাগাভাগি",
     "Cancel" : "বাতিল",
     "Invalid ownCloud url" : "অবৈধ ওউনক্লাউড url",
-    "Share" : "ভাগাভাগি কর",
     "Shared by" : "যাদের মাঝে ভাগাভাগি করা হয়েছে",
+    "Sharing" : "ভাগাভাগিরত",
     "A file or folder has been <strong>shared</strong>" : "একটি ফাইল বা ফোলডার <strong>ভাগাভাগি</strong> করা হয়েছে",
     "You shared %1$s with %2$s" : "আপনি %1$sকে %2$sএর সাথে ভাগাভাগি করেছেন",
     "You shared %1$s with group %2$s" : "আপনি %1$s কে %2$s দলের সাথে ভাগাভাগি করেছেন",
diff --git a/apps/files_sharing/l10n/bn_BD.json b/apps/files_sharing/l10n/bn_BD.json
index d1186dff98..028c22277b 100644
--- a/apps/files_sharing/l10n/bn_BD.json
+++ b/apps/files_sharing/l10n/bn_BD.json
@@ -7,8 +7,8 @@
     "Remote share" : "দুরবর্তী ভাগাভাগি",
     "Cancel" : "বাতিল",
     "Invalid ownCloud url" : "অবৈধ ওউনক্লাউড url",
-    "Share" : "ভাগাভাগি কর",
     "Shared by" : "যাদের মাঝে ভাগাভাগি করা হয়েছে",
+    "Sharing" : "ভাগাভাগিরত",
     "A file or folder has been <strong>shared</strong>" : "একটি ফাইল বা ফোলডার <strong>ভাগাভাগি</strong> করা হয়েছে",
     "You shared %1$s with %2$s" : "আপনি %1$sকে %2$sএর সাথে ভাগাভাগি করেছেন",
     "You shared %1$s with group %2$s" : "আপনি %1$s কে %2$s দলের সাথে ভাগাভাগি করেছেন",
diff --git a/apps/files_sharing/l10n/bn_IN.js b/apps/files_sharing/l10n/bn_IN.js
index f6d8367d9a..2270e72e68 100644
--- a/apps/files_sharing/l10n/bn_IN.js
+++ b/apps/files_sharing/l10n/bn_IN.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "বাতিল করা",
-    "Share" : "শেয়ার",
     "A file or folder has been <strong>shared</strong>" : "ফাইল অথবা ফোল্ডার <strong>শেয়ার করা হয়েছে</strong>",
     "You shared %1$s with %2$s" : "আপনি %1$s শেয়ার করছেন %2$s এর সাথে",
     "You shared %1$s with group %2$s" : "আপনি %1$s কে %2$s গ্রুপের সাথে শেয়ার করেছেন",
diff --git a/apps/files_sharing/l10n/bn_IN.json b/apps/files_sharing/l10n/bn_IN.json
index bffa2a243a..1c285d0899 100644
--- a/apps/files_sharing/l10n/bn_IN.json
+++ b/apps/files_sharing/l10n/bn_IN.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "বাতিল করা",
-    "Share" : "শেয়ার",
     "A file or folder has been <strong>shared</strong>" : "ফাইল অথবা ফোল্ডার <strong>শেয়ার করা হয়েছে</strong>",
     "You shared %1$s with %2$s" : "আপনি %1$s শেয়ার করছেন %2$s এর সাথে",
     "You shared %1$s with group %2$s" : "আপনি %1$s কে %2$s গ্রুপের সাথে শেয়ার করেছেন",
diff --git a/apps/files_sharing/l10n/bs.js b/apps/files_sharing/l10n/bs.js
index 1a0e62a930..ce2917b50b 100644
--- a/apps/files_sharing/l10n/bs.js
+++ b/apps/files_sharing/l10n/bs.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Odustani",
-    "Share" : "Dijeli",
     "Shared by" : "Dijeli",
+    "Sharing" : "Dijeljenje",
     "Password" : "Lozinka",
     "Name" : "Ime",
     "Download" : "Preuzmite"
diff --git a/apps/files_sharing/l10n/bs.json b/apps/files_sharing/l10n/bs.json
index ea6c7082e2..ad6237b816 100644
--- a/apps/files_sharing/l10n/bs.json
+++ b/apps/files_sharing/l10n/bs.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Cancel" : "Odustani",
-    "Share" : "Dijeli",
     "Shared by" : "Dijeli",
+    "Sharing" : "Dijeljenje",
     "Password" : "Lozinka",
     "Name" : "Ime",
     "Download" : "Preuzmite"
diff --git a/apps/files_sharing/l10n/ca.js b/apps/files_sharing/l10n/ca.js
index cf9aff4c2f..403aaa8769 100644
--- a/apps/files_sharing/l10n/ca.js
+++ b/apps/files_sharing/l10n/ca.js
@@ -13,8 +13,8 @@ OC.L10N.register(
     "Cancel" : "Cancel·la",
     "Add remote share" : "Afegeix compartició remota",
     "Invalid ownCloud url" : "La url d'ownCloud no és vàlida",
-    "Share" : "Comparteix",
     "Shared by" : "Compartit per",
+    "Sharing" : "Compartir",
     "A file or folder has been <strong>shared</strong>" : "S'ha <strong>compartit</strong> un fitxer o una carpeta",
     "You shared %1$s with %2$s" : "Has compartit %1$s amb %2$s",
     "You shared %1$s with group %2$s" : "has compartit %1$s amb el grup %2$s",
@@ -36,6 +36,7 @@ OC.L10N.register(
     "Add to your ownCloud" : "Afegiu a ownCloud",
     "Download" : "Baixa",
     "Download %s" : "Baixa %s",
-    "Direct link" : "Enllaç directe"
+    "Direct link" : "Enllaç directe",
+    "Open documentation" : "Obre la documentació"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json
index 6811276527..c0aa500d2a 100644
--- a/apps/files_sharing/l10n/ca.json
+++ b/apps/files_sharing/l10n/ca.json
@@ -11,8 +11,8 @@
     "Cancel" : "Cancel·la",
     "Add remote share" : "Afegeix compartició remota",
     "Invalid ownCloud url" : "La url d'ownCloud no és vàlida",
-    "Share" : "Comparteix",
     "Shared by" : "Compartit per",
+    "Sharing" : "Compartir",
     "A file or folder has been <strong>shared</strong>" : "S'ha <strong>compartit</strong> un fitxer o una carpeta",
     "You shared %1$s with %2$s" : "Has compartit %1$s amb %2$s",
     "You shared %1$s with group %2$s" : "has compartit %1$s amb el grup %2$s",
@@ -34,6 +34,7 @@
     "Add to your ownCloud" : "Afegiu a ownCloud",
     "Download" : "Baixa",
     "Download %s" : "Baixa %s",
-    "Direct link" : "Enllaç directe"
+    "Direct link" : "Enllaç directe",
+    "Open documentation" : "Obre la documentació"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index dc15a19e52..bb8480e2a3 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Můžete nahrávat do tohoto adresáře",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nebyla nalezena instalace ownCloud (7 nebo vyšší) na {remote}",
     "Invalid ownCloud url" : "Neplatná ownCloud url",
-    "Share" : "Sdílet",
     "Shared by" : "Sdílí",
+    "Sharing" : "Sdílení",
     "A file or folder has been <strong>shared</strong>" : "Soubor nebo složka byla <strong>nasdílena</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Soubor nebo složka byla nasdílena z <strong>jiného serveru</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Byl <strong>stažen</strong> veřejně sdílený soubor nebo adresář",
@@ -41,6 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
     "Shares" : "Sdílení",
+    "You received %s as a remote share from %s" : "Obdrželi jste %s nově nasdílená vzdáleně od %s ",
+    "Accept" : "Přijmout",
+    "Decline" : "Zamítnout",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID",
     "This share is password-protected" : "Toto sdílení je chráněno heslem",
@@ -66,7 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "Sdružený cloud",
     "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:",
     "Share it:" : "Sdílet:",
-    "Add it to your website:" : "Přidat na svou webovou stránku:",
+    "Add to your website" : "Přidat na svou webovou stránku",
     "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud",
     "HTML Code:" : "HTML kód:"
 },
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index 8533ee053c..677e982b6b 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Můžete nahrávat do tohoto adresáře",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nebyla nalezena instalace ownCloud (7 nebo vyšší) na {remote}",
     "Invalid ownCloud url" : "Neplatná ownCloud url",
-    "Share" : "Sdílet",
     "Shared by" : "Sdílí",
+    "Sharing" : "Sdílení",
     "A file or folder has been <strong>shared</strong>" : "Soubor nebo složka byla <strong>nasdílena</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Soubor nebo složka byla nasdílena z <strong>jiného serveru</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Byl <strong>stažen</strong> veřejně sdílený soubor nebo adresář",
@@ -39,6 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s s vámi sdílí %1$s",
     "You shared %1$s via link" : "Sdílíte %1$s přes odkaz",
     "Shares" : "Sdílení",
+    "You received %s as a remote share from %s" : "Obdrželi jste %s nově nasdílená vzdáleně od %s ",
+    "Accept" : "Přijmout",
+    "Decline" : "Zamítnout",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID, více na %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Sdílej se mnou pomocí mého #ownCloud sdruženého cloud ID",
     "This share is password-protected" : "Toto sdílení je chráněno heslem",
@@ -64,7 +67,7 @@
     "Federated Cloud" : "Sdružený cloud",
     "Your Federated Cloud ID:" : "Vaše sdružené cloud ID:",
     "Share it:" : "Sdílet:",
-    "Add it to your website:" : "Přidat na svou webovou stránku:",
+    "Add to your website" : "Přidat na svou webovou stránku",
     "Share with me via ownCloud" : "Sdíleno se mnou přes ownCloud",
     "HTML Code:" : "HTML kód:"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_sharing/l10n/cy_GB.js b/apps/files_sharing/l10n/cy_GB.js
index 015052cbae..1a8addf172 100644
--- a/apps/files_sharing/l10n/cy_GB.js
+++ b/apps/files_sharing/l10n/cy_GB.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Diddymu",
-    "Share" : "Rhannu",
     "Shared by" : "Rhannwyd gan",
     "Password" : "Cyfrinair",
     "Name" : "Enw",
diff --git a/apps/files_sharing/l10n/cy_GB.json b/apps/files_sharing/l10n/cy_GB.json
index dad1349960..9eebc50be7 100644
--- a/apps/files_sharing/l10n/cy_GB.json
+++ b/apps/files_sharing/l10n/cy_GB.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "Diddymu",
-    "Share" : "Rhannu",
     "Shared by" : "Rhannwyd gan",
     "Password" : "Cyfrinair",
     "Name" : "Enw",
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index a7cfb0a652..87595f6cc5 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Du kan overføre til denne mappe",
     "No ownCloud installation (7 or higher) found at {remote}" : "Der er ingen ownCloud-installation (7 eller højere) på {remote}",
     "Invalid ownCloud url" : "Ugyldig ownCloud-URL",
-    "Share" : "Del",
     "Shared by" : "Delt af",
+    "Sharing" : "Deling",
     "A file or folder has been <strong>shared</strong>" : "En fil eller mappe er blevet <strong>delt</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe blev delt fra <strong>en anden server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "En offentligt delt fil eller mappe blev <strong>hentet</strong>",
@@ -41,6 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
+    "You received %s as a remote share from %s" : "Du modtog %s som et ekstern deling fra %s",
+    "Accept" : "Acceptér",
+    "Decline" : "Afvis",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Delingen er beskyttet af kodeord",
@@ -66,7 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Din Federated Cloud ID:",
     "Share it:" : "Del:",
-    "Add it to your website:" : "Tilføj den til din hjemmeside:",
+    "Add to your website" : "Tilføj til dit websted",
     "Share with me via ownCloud" : "Del med mig gennem ownCloud",
     "HTML Code:" : "HTMLkode:"
 },
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index d18cf79275..c9ac959da2 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Du kan overføre til denne mappe",
     "No ownCloud installation (7 or higher) found at {remote}" : "Der er ingen ownCloud-installation (7 eller højere) på {remote}",
     "Invalid ownCloud url" : "Ugyldig ownCloud-URL",
-    "Share" : "Del",
     "Shared by" : "Delt af",
+    "Sharing" : "Deling",
     "A file or folder has been <strong>shared</strong>" : "En fil eller mappe er blevet <strong>delt</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe blev delt fra <strong>en anden server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "En offentligt delt fil eller mappe blev <strong>hentet</strong>",
@@ -39,6 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s delt %1$s med dig",
     "You shared %1$s via link" : "Du delte %1$s via link",
     "Shares" : "Delt",
+    "You received %s as a remote share from %s" : "Du modtog %s som et ekstern deling fra %s",
+    "Accept" : "Acceptér",
+    "Decline" : "Afvis",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med mig gennem min #ownCloud Federated Cloud ID, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med mig gennem min #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Delingen er beskyttet af kodeord",
@@ -64,7 +67,7 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Din Federated Cloud ID:",
     "Share it:" : "Del:",
-    "Add it to your website:" : "Tilføj den til din hjemmeside:",
+    "Add to your website" : "Tilføj til dit websted",
     "Share with me via ownCloud" : "Del med mig gennem ownCloud",
     "HTML Code:" : "HTMLkode:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 21cba85c2f..973aa0f15a 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Du kannst in diesen Ordner hochladen",
     "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden",
     "Invalid ownCloud url" : "Ungültige OwnCloud-URL",
-    "Share" : "Teilen",
     "Shared by" : "Geteilt von ",
+    "Sharing" : "Teilen",
     "A file or folder has been <strong>shared</strong>" : "Eine Datei oder ein Ordner wurde <strong>geteilt</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
     "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt",
     "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben",
     "Shares" : "Freigaben",
+    "Accept" : "Ok",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID",
     "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
@@ -66,7 +67,6 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
     "Share it:" : "Zum Teilen:",
-    "Add it to your website:" : "Zum Hinzufügen zu Deiner Website:",
     "Share with me via ownCloud" : "Teile mit mir über ownCloud",
     "HTML Code:" : "HTML-Code:"
 },
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index b465569337..5526be3b6b 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Du kannst in diesen Ordner hochladen",
     "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden",
     "Invalid ownCloud url" : "Ungültige OwnCloud-URL",
-    "Share" : "Teilen",
     "Shared by" : "Geteilt von ",
+    "Sharing" : "Teilen",
     "A file or folder has been <strong>shared</strong>" : "Eine Datei oder ein Ordner wurde <strong>geteilt</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
     "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s hat %1$s mit Dir geteilt",
     "You shared %1$s via link" : "Du hast %1$s über einen Link freigegeben",
     "Shares" : "Freigaben",
+    "Accept" : "Ok",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Teile mit mir über meine #ownCloud Federated-Cloud-ID",
     "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
@@ -64,7 +65,6 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Deine Federated-Cloud-ID:",
     "Share it:" : "Zum Teilen:",
-    "Add it to your website:" : "Zum Hinzufügen zu Deiner Website:",
     "Share with me via ownCloud" : "Teile mit mir über ownCloud",
     "HTML Code:" : "HTML-Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/de_AT.js b/apps/files_sharing/l10n/de_AT.js
index cf1e3f9b32..36a67ecac2 100644
--- a/apps/files_sharing/l10n/de_AT.js
+++ b/apps/files_sharing/l10n/de_AT.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Abbrechen",
-    "Share" : "Freigeben",
     "A file or folder has been <strong>shared</strong>" : "Eine Datei oder ein Ordner wurde <strong>geteilt</strong>",
     "You shared %1$s with %2$s" : "du teilst %1$s mit %2$s",
     "You shared %1$s with group %2$s" : "Du teilst %1$s mit der Gruppe %2$s",
diff --git a/apps/files_sharing/l10n/de_AT.json b/apps/files_sharing/l10n/de_AT.json
index fda07e557a..fe0cfb4eed 100644
--- a/apps/files_sharing/l10n/de_AT.json
+++ b/apps/files_sharing/l10n/de_AT.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "Abbrechen",
-    "Share" : "Freigeben",
     "A file or folder has been <strong>shared</strong>" : "Eine Datei oder ein Ordner wurde <strong>geteilt</strong>",
     "You shared %1$s with %2$s" : "du teilst %1$s mit %2$s",
     "You shared %1$s with group %2$s" : "Du teilst %1$s mit der Gruppe %2$s",
diff --git a/apps/files_sharing/l10n/de_CH.js b/apps/files_sharing/l10n/de_CH.js
deleted file mode 100644
index 2cdb3d47c6..0000000000
--- a/apps/files_sharing/l10n/de_CH.js
+++ /dev/null
@@ -1,17 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "Cancel" : "Abbrechen",
-    "Shared by" : "Geteilt von",
-    "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
-    "Password" : "Passwort",
-    "Name" : "Name",
-    "Sorry, this link doesn’t seem to work anymore." : "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
-    "Reasons might be:" : "Gründe könnten sein:",
-    "the item was removed" : "Das Element wurde entfernt",
-    "the link expired" : "Der Link ist abgelaufen",
-    "sharing is disabled" : "Teilen ist deaktiviert",
-    "For more info, please ask the person who sent this link." : "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
-    "Download" : "Herunterladen"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de_CH.json b/apps/files_sharing/l10n/de_CH.json
deleted file mode 100644
index a161e06bae..0000000000
--- a/apps/files_sharing/l10n/de_CH.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{ "translations": {
-    "Cancel" : "Abbrechen",
-    "Shared by" : "Geteilt von",
-    "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
-    "Password" : "Passwort",
-    "Name" : "Name",
-    "Sorry, this link doesn’t seem to work anymore." : "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
-    "Reasons might be:" : "Gründe könnten sein:",
-    "the item was removed" : "Das Element wurde entfernt",
-    "the link expired" : "Der Link ist abgelaufen",
-    "sharing is disabled" : "Teilen ist deaktiviert",
-    "For more info, please ask the person who sent this link." : "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
-    "Download" : "Herunterladen"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index 1a6e334f58..47243b8f81 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Sie können in diesen Ordner hochladen",
     "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden",
     "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse",
-    "Share" : "Teilen",
     "Shared by" : "Geteilt von",
+    "Sharing" : "Teilen",
     "A file or folder has been <strong>shared</strong>" : "Eine Datei oder ein Ordner wurde <strong>geteilt</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
     "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
     "You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt",
     "Shares" : "Geteiltes",
+    "Accept" : "Akzeptieren",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID",
     "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
@@ -66,7 +67,6 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:",
     "Share it:" : "Zum Teilen:",
-    "Add it to your website:" : "Zum Hinzufügen zu Ihrer Website:",
     "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud",
     "HTML Code:" : "HTML-Code:"
 },
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index 4101c5834f..b63286de48 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Sie können in diesen Ordner hochladen",
     "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden",
     "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse",
-    "Share" : "Teilen",
     "Shared by" : "Geteilt von",
+    "Sharing" : "Teilen",
     "A file or folder has been <strong>shared</strong>" : "Eine Datei oder ein Ordner wurde <strong>geteilt</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Eine Datei oder ein Ordner wurde von <strong>einem anderen Server</strong> geteilt",
     "A public shared file or folder was <strong>downloaded</strong>" : "Eine öffentliche geteilte Datei oder ein öffentlicher geteilter Ordner wurde <strong>heruntergeladen</strong>",
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s hat %1$s mit Ihnen geteilt",
     "You shared %1$s via link" : "Sie haben %1$s über einen Link geteilt",
     "Shares" : "Geteiltes",
+    "Accept" : "Akzeptieren",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID, siehe %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Teilen Sie mit mir über meine #ownCloud Federated-Cloud-ID",
     "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
@@ -64,7 +65,6 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Ihre Federated-Cloud-ID:",
     "Share it:" : "Zum Teilen:",
-    "Add it to your website:" : "Zum Hinzufügen zu Ihrer Website:",
     "Share with me via ownCloud" : "Teilen Sie mit mir über ownCloud",
     "HTML Code:" : "HTML-Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 01effb3f91..ef68842477 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Μπορείτε να μεταφορτώσετε σε αυτόν τον φάκελο",
     "No ownCloud installation (7 or higher) found at {remote}" : "Δεν βρέθηκε εγκατάστση ownCloud (7 ή νεώτερη) στο {remote}",
     "Invalid ownCloud url" : "Άκυρη url ownCloud ",
-    "Share" : "Διαμοιράστε",
     "Shared by" : "Διαμοιράστηκε από",
+    "Sharing" : "Διαμοιρασμός",
     "A file or folder has been <strong>shared</strong>" : "Ένα αρχείο ή φάκελος <strong>διαμοιράστηκε</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Ένα αρχείο ή φάκελος διαμοιράστηκε από <strong>έναν άλλο διακομιστή</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Ένα δημόσια διαμοιρασμένο αρχείο ή φάκελος <strong>ελήφθη</strong>",
@@ -41,6 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
+    "You received %s as a remote share from %s" : "Λάβατε το %s ως απομακρυσμένο διαμοιρασμό από %s",
+    "Accept" : "Αποδοχή",
+    "Decline" : "Απόρριψη",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου",
     "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
@@ -66,7 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "Federated σύννεφο",
     "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:",
     "Share it:" : "Μοιραστείτε το:",
-    "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:",
+    "Add to your website" : "Προσθήκη στην ιστοσελίδα σας",
     "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ",
     "HTML Code:" : "Κώδικας HTML:"
 },
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index aee0ccb29a..829ff61cea 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Μπορείτε να μεταφορτώσετε σε αυτόν τον φάκελο",
     "No ownCloud installation (7 or higher) found at {remote}" : "Δεν βρέθηκε εγκατάστση ownCloud (7 ή νεώτερη) στο {remote}",
     "Invalid ownCloud url" : "Άκυρη url ownCloud ",
-    "Share" : "Διαμοιράστε",
     "Shared by" : "Διαμοιράστηκε από",
+    "Sharing" : "Διαμοιρασμός",
     "A file or folder has been <strong>shared</strong>" : "Ένα αρχείο ή φάκελος <strong>διαμοιράστηκε</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Ένα αρχείο ή φάκελος διαμοιράστηκε από <strong>έναν άλλο διακομιστή</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Ένα δημόσια διαμοιρασμένο αρχείο ή φάκελος <strong>ελήφθη</strong>",
@@ -39,6 +39,9 @@
     "%2$s shared %1$s with you" : "Ο %2$s διαμοιράστηκε το %1$s με εσάς",
     "You shared %1$s via link" : "Μοιραστήκατε το %1$s μέσω συνδέσμου",
     "Shares" : "Κοινόχρηστοι φάκελοι",
+    "You received %s as a remote share from %s" : "Λάβατε το %s ως απομακρυσμένο διαμοιρασμό από %s",
+    "Accept" : "Αποδοχή",
+    "Decline" : "Απόρριψη",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου, δείτε %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Διαμοιρασμός με εμένα μέσω του #ownCloud Federated Cloud ID μου",
     "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
@@ -64,7 +67,7 @@
     "Federated Cloud" : "Federated σύννεφο",
     "Your Federated Cloud ID:" : "Το ID σας στο Federated Cloud:",
     "Share it:" : "Μοιραστείτε το:",
-    "Add it to your website:" : "Προσθέστε το στην ιστοσελίδα σας:",
+    "Add to your website" : "Προσθήκη στην ιστοσελίδα σας",
     "Share with me via ownCloud" : "Διαμοιρασμός με εμένα μέσω του ",
     "HTML Code:" : "Κώδικας HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js
index 0053f64b03..424fe74308 100644
--- a/apps/files_sharing/l10n/en_GB.js
+++ b/apps/files_sharing/l10n/en_GB.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "You can upload into this folder",
     "No ownCloud installation (7 or higher) found at {remote}" : "No ownCloud installation (7 or higher) found at {remote}",
     "Invalid ownCloud url" : "Invalid ownCloud URL",
-    "Share" : "Share",
     "Shared by" : "Shared by",
+    "Sharing" : "Sharing",
     "A file or folder has been <strong>shared</strong>" : "A file or folder has been <strong>shared</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "A file or folder was shared from <strong>another server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "A public shared file or folder was <strong>downloaded</strong>",
@@ -40,6 +40,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s shared %1$s with you",
     "You shared %1$s via link" : "You shared %1$s via link",
     "Shares" : "Shares",
+    "Accept" : "Accept",
     "This share is password-protected" : "This share is password-protected",
     "The password is wrong. Try again." : "The password is wrong. Try again.",
     "Password" : "Password",
diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json
index 70f137fc70..4e41be946d 100644
--- a/apps/files_sharing/l10n/en_GB.json
+++ b/apps/files_sharing/l10n/en_GB.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "You can upload into this folder",
     "No ownCloud installation (7 or higher) found at {remote}" : "No ownCloud installation (7 or higher) found at {remote}",
     "Invalid ownCloud url" : "Invalid ownCloud URL",
-    "Share" : "Share",
     "Shared by" : "Shared by",
+    "Sharing" : "Sharing",
     "A file or folder has been <strong>shared</strong>" : "A file or folder has been <strong>shared</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "A file or folder was shared from <strong>another server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "A public shared file or folder was <strong>downloaded</strong>",
@@ -38,6 +38,7 @@
     "%2$s shared %1$s with you" : "%2$s shared %1$s with you",
     "You shared %1$s via link" : "You shared %1$s via link",
     "Shares" : "Shares",
+    "Accept" : "Accept",
     "This share is password-protected" : "This share is password-protected",
     "The password is wrong. Try again." : "The password is wrong. Try again.",
     "Password" : "Password",
diff --git a/apps/files_sharing/l10n/eo.js b/apps/files_sharing/l10n/eo.js
index ae96dbda69..ef90077414 100644
--- a/apps/files_sharing/l10n/eo.js
+++ b/apps/files_sharing/l10n/eo.js
@@ -13,8 +13,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Vi povas alŝuti en ĉi tiun dosierujon",
     "No ownCloud installation (7 or higher) found at {remote}" : "Ne troviĝis instalo de ownCloud (7 aŭ pli alta) ĉe {remote}",
     "Invalid ownCloud url" : "Nevalidas URL de ownCloud",
-    "Share" : "Kunhavigi",
     "Shared by" : "Kunhavigita de",
+    "Sharing" : "Kunhavigo",
     "A file or folder has been <strong>shared</strong>" : "Dosiero aŭ dosierujo <strong>kunhaviĝis</strong>",
     "%1$s unshared %2$s from you" : "%1$s malkunhavigis %2$s el vi",
     "Public shared folder %1$s was downloaded" : "La publika kunhavata dosierujo %1$s elŝutiĝis",
@@ -23,6 +23,7 @@ OC.L10N.register(
     "You shared %1$s with group %2$s" : "Vi kunhavigis %1$s kun la grupo %2$s",
     "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi",
     "You shared %1$s via link" : "Vi kunhavigis %1$s per ligilo",
+    "Accept" : "Akcepti",
     "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto",
     "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.",
     "Password" : "Pasvorto",
diff --git a/apps/files_sharing/l10n/eo.json b/apps/files_sharing/l10n/eo.json
index 9bbc26d711..cc648a7c60 100644
--- a/apps/files_sharing/l10n/eo.json
+++ b/apps/files_sharing/l10n/eo.json
@@ -11,8 +11,8 @@
     "You can upload into this folder" : "Vi povas alŝuti en ĉi tiun dosierujon",
     "No ownCloud installation (7 or higher) found at {remote}" : "Ne troviĝis instalo de ownCloud (7 aŭ pli alta) ĉe {remote}",
     "Invalid ownCloud url" : "Nevalidas URL de ownCloud",
-    "Share" : "Kunhavigi",
     "Shared by" : "Kunhavigita de",
+    "Sharing" : "Kunhavigo",
     "A file or folder has been <strong>shared</strong>" : "Dosiero aŭ dosierujo <strong>kunhaviĝis</strong>",
     "%1$s unshared %2$s from you" : "%1$s malkunhavigis %2$s el vi",
     "Public shared folder %1$s was downloaded" : "La publika kunhavata dosierujo %1$s elŝutiĝis",
@@ -21,6 +21,7 @@
     "You shared %1$s with group %2$s" : "Vi kunhavigis %1$s kun la grupo %2$s",
     "%2$s shared %1$s with you" : "%2$s kunhavigis %1$s kun vi",
     "You shared %1$s via link" : "Vi kunhavigis %1$s per ligilo",
+    "Accept" : "Akcepti",
     "This share is password-protected" : "Ĉi tiu kunhavigo estas protektata per pasvorto",
     "The password is wrong. Try again." : "La pasvorto malĝustas. Provu denove.",
     "Password" : "Pasvorto",
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index a7dd3ca570..ca1e8c430d 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Usted puede cargar en esta carpeta",
     "No ownCloud installation (7 or higher) found at {remote}" : "No se encontró una instalación de ownCloud (7 o mayor) en {remote}",
     "Invalid ownCloud url" : "URL de ownCloud inválida",
-    "Share" : "Compartir",
     "Shared by" : "Compartido por",
+    "Sharing" : "Compartiendo",
     "A file or folder has been <strong>shared</strong>" : "Se ha <strong>compartido</strong> un archivo o carpeta",
     "A file or folder was shared from <strong>another server</strong>" : "Se ha compartido un archivo o carpeta desde <strong>otro servidor</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Ha sido <strong>descargado</strong> un archivo (o carpeta) compartido públicamente",
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
     "You shared %1$s via link" : "Ha compartido %1$s vía enlace",
     "Shares" : "Compartidos",
+    "Accept" : "Aceptar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud",
     "This share is password-protected" : "Este elemento compartido está protegido por contraseña",
@@ -66,7 +67,7 @@ OC.L10N.register(
     "Federated Cloud" : "Nube Federada",
     "Your Federated Cloud ID:" : "Su ID Nube Federada:",
     "Share it:" : "Compartir:",
-    "Add it to your website:" : "Agregarlo a su sitio de internet:",
+    "Add to your website" : "Añadir a su Website",
     "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud",
     "HTML Code:" : "Código HTML:"
 },
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index b79640abc0..4b300e1227 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Usted puede cargar en esta carpeta",
     "No ownCloud installation (7 or higher) found at {remote}" : "No se encontró una instalación de ownCloud (7 o mayor) en {remote}",
     "Invalid ownCloud url" : "URL de ownCloud inválida",
-    "Share" : "Compartir",
     "Shared by" : "Compartido por",
+    "Sharing" : "Compartiendo",
     "A file or folder has been <strong>shared</strong>" : "Se ha <strong>compartido</strong> un archivo o carpeta",
     "A file or folder was shared from <strong>another server</strong>" : "Se ha compartido un archivo o carpeta desde <strong>otro servidor</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Ha sido <strong>descargado</strong> un archivo (o carpeta) compartido públicamente",
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con usted",
     "You shared %1$s via link" : "Ha compartido %1$s vía enlace",
     "Shares" : "Compartidos",
+    "Accept" : "Aceptar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud, ver %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartirlo conmigo a través de mi ID Nube Federada #ownCloud",
     "This share is password-protected" : "Este elemento compartido está protegido por contraseña",
@@ -64,7 +65,7 @@
     "Federated Cloud" : "Nube Federada",
     "Your Federated Cloud ID:" : "Su ID Nube Federada:",
     "Share it:" : "Compartir:",
-    "Add it to your website:" : "Agregarlo a su sitio de internet:",
+    "Add to your website" : "Añadir a su Website",
     "Share with me via ownCloud" : "Compartirlo conmigo vía OwnCloud",
     "HTML Code:" : "Código HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/es_AR.js b/apps/files_sharing/l10n/es_AR.js
index ef591d93ab..fac8b35750 100644
--- a/apps/files_sharing/l10n/es_AR.js
+++ b/apps/files_sharing/l10n/es_AR.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Cancelar",
-    "Share" : "Compartir",
     "Shared by" : "Compartido por",
+    "Sharing" : "Compartiendo",
     "A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta ha sido <strong>compartido</strong>",
     "You shared %1$s with %2$s" : "Has compartido %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Has compartido %1$s en el grupo %2$s",
diff --git a/apps/files_sharing/l10n/es_AR.json b/apps/files_sharing/l10n/es_AR.json
index 3940b3b1fe..6a7316bff8 100644
--- a/apps/files_sharing/l10n/es_AR.json
+++ b/apps/files_sharing/l10n/es_AR.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Cancel" : "Cancelar",
-    "Share" : "Compartir",
     "Shared by" : "Compartido por",
+    "Sharing" : "Compartiendo",
     "A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta ha sido <strong>compartido</strong>",
     "You shared %1$s with %2$s" : "Has compartido %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Has compartido %1$s en el grupo %2$s",
diff --git a/apps/files_sharing/l10n/es_CL.js b/apps/files_sharing/l10n/es_CL.js
index 1078f8d164..792d5a3cad 100644
--- a/apps/files_sharing/l10n/es_CL.js
+++ b/apps/files_sharing/l10n/es_CL.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Cancelar",
-    "Share" : "Compartir",
     "A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta ha sido <strong>compartido</strong>",
     "You shared %1$s with %2$s" : "Ha compartido %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Has compartido %1$s con el grupo %2$s",
diff --git a/apps/files_sharing/l10n/es_CL.json b/apps/files_sharing/l10n/es_CL.json
index 66e917b896..28f3056023 100644
--- a/apps/files_sharing/l10n/es_CL.json
+++ b/apps/files_sharing/l10n/es_CL.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "Cancelar",
-    "Share" : "Compartir",
     "A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta ha sido <strong>compartido</strong>",
     "You shared %1$s with %2$s" : "Ha compartido %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Has compartido %1$s con el grupo %2$s",
diff --git a/apps/files_sharing/l10n/es_CR.js b/apps/files_sharing/l10n/es_CR.js
deleted file mode 100644
index 38387ee860..0000000000
--- a/apps/files_sharing/l10n/es_CR.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta has sido <strong>compartido</strong>",
-    "You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
-    "You shared %1$s with group %2$s" : "Usted compartió %1$s con el grupo %2$s",
-    "%2$s shared %1$s with you" : "%2$s compartió %1$s con usted",
-    "You shared %1$s via link" : "Usted compartió %1$s con un vínculo",
-    "Shares" : "Compartidos"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es_CR.json b/apps/files_sharing/l10n/es_CR.json
deleted file mode 100644
index 6a92ddc55b..0000000000
--- a/apps/files_sharing/l10n/es_CR.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "A file or folder has been <strong>shared</strong>" : "Un archivo o carpeta has sido <strong>compartido</strong>",
-    "You shared %1$s with %2$s" : "Usted compartió %1$s con %2$s",
-    "You shared %1$s with group %2$s" : "Usted compartió %1$s con el grupo %2$s",
-    "%2$s shared %1$s with you" : "%2$s compartió %1$s con usted",
-    "You shared %1$s via link" : "Usted compartió %1$s con un vínculo",
-    "Shares" : "Compartidos"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/es_MX.js b/apps/files_sharing/l10n/es_MX.js
index adf4b823ef..9c287312e8 100644
--- a/apps/files_sharing/l10n/es_MX.js
+++ b/apps/files_sharing/l10n/es_MX.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Cancelar",
-    "Share" : "Compartir",
     "Shared by" : "Compartido por",
+    "Sharing" : "Compartiendo",
     "This share is password-protected" : "Este elemento compartido esta protegido por contraseña",
     "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.",
     "Password" : "Contraseña",
diff --git a/apps/files_sharing/l10n/es_MX.json b/apps/files_sharing/l10n/es_MX.json
index 17f0560152..26f064e346 100644
--- a/apps/files_sharing/l10n/es_MX.json
+++ b/apps/files_sharing/l10n/es_MX.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Cancel" : "Cancelar",
-    "Share" : "Compartir",
     "Shared by" : "Compartido por",
+    "Sharing" : "Compartiendo",
     "This share is password-protected" : "Este elemento compartido esta protegido por contraseña",
     "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.",
     "Password" : "Contraseña",
diff --git a/apps/files_sharing/l10n/es_PY.js b/apps/files_sharing/l10n/es_PY.js
deleted file mode 100644
index ca83052f99..0000000000
--- a/apps/files_sharing/l10n/es_PY.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "A file or folder has been <strong>shared</strong>" : "Se ha <strong>compartido</strong> un archivo o carpeta",
-    "You shared %1$s with %2$s" : "Ha compartido %1$s con %2$s",
-    "You shared %1$s with group %2$s" : "Ha compartido %1$s con el grupo %2$s",
-    "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con tigo",
-    "You shared %1$s via link" : "Ha compartido %1$s via enlace",
-    "Shares" : "Compartidos"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es_PY.json b/apps/files_sharing/l10n/es_PY.json
deleted file mode 100644
index ca21de5caa..0000000000
--- a/apps/files_sharing/l10n/es_PY.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "A file or folder has been <strong>shared</strong>" : "Se ha <strong>compartido</strong> un archivo o carpeta",
-    "You shared %1$s with %2$s" : "Ha compartido %1$s con %2$s",
-    "You shared %1$s with group %2$s" : "Ha compartido %1$s con el grupo %2$s",
-    "%2$s shared %1$s with you" : "%2$s ha compartido %1$s con tigo",
-    "You shared %1$s via link" : "Ha compartido %1$s via enlace",
-    "Shares" : "Compartidos"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js
index aa6dde2d7b..ada0a54816 100644
--- a/apps/files_sharing/l10n/et_EE.js
+++ b/apps/files_sharing/l10n/et_EE.js
@@ -4,28 +4,34 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "Serverist serverisse jagamine pole antud serveris lubatud",
     "The mountpoint name contains invalid characters." : "Ühenduspunkti nimes on vigaseid märke.",
     "Invalid or untrusted SSL certificate" : "Vigane või tundmatu SSL sertifikaat",
+    "Storage not valid" : "Andmehoidla pole korrektne",
     "Couldn't add remote share" : "Ei suutnud lisada kaugjagamist",
     "Shared with you" : "Sinuga jagatud",
     "Shared with others" : "Teistega jagatud",
     "Shared by link" : "Jagatud lingiga",
     "Nothing shared with you yet" : "Sinuga pole veel midagi jagatud",
+    "Files and folders others share with you will show up here" : "Siin näidatakse faile ja kaustasid, mida teised on sulle jaganud",
     "Nothing shared yet" : "Midagi pole veel jagatud",
+    "Files and folders you share will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa oled teistega jaganud",
     "No shared links" : "Jagatud linke pole",
+    "Files and folders you share by link will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa jagad lingiga",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soovid lisata kaugjagamise {name} asukohast {owner}@{remote}?",
     "Remote share" : "Kaugjagamine",
     "Remote share password" : "Kaugjagamise parool",
     "Cancel" : "Loobu",
     "Add remote share" : "Lisa kaugjagamine",
     "You can upload into this folder" : "Sa saad sellesse kausta faile üles laadida",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Saidilt {remote} ei leitud ownCloudi (7 või uuem) ",
     "Invalid ownCloud url" : "Vigane ownCloud url",
-    "Share" : "Jaga",
     "Shared by" : "Jagas",
+    "Sharing" : "Jagamine",
     "A file or folder has been <strong>shared</strong>" : "Fail või kataloog on <strong>jagatud</strong>",
     "You shared %1$s with %2$s" : "Jagasid %1$s  %2$s kasutajaga",
     "You shared %1$s with group %2$s" : "Jagasid %1$s %2$s grupiga",
     "%2$s shared %1$s with you" : "%2$s jagas sinuga %1$s",
     "You shared %1$s via link" : "Jagasid %1$s lingiga",
     "Shares" : "Jagamised",
+    "Accept" : "Nõustu",
     "This share is password-protected" : "See jagamine on parooliga kaitstud",
     "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.",
     "Password" : "Parool",
@@ -46,7 +52,6 @@ OC.L10N.register(
     "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse",
     "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest",
     "Share it:" : "Jaga seda:",
-    "Add it to your website:" : "Lisa see oma veebisaidile:",
     "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga",
     "HTML Code:" : "HTML kood:"
 },
diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json
index 0f0c3c492d..afa7fc6884 100644
--- a/apps/files_sharing/l10n/et_EE.json
+++ b/apps/files_sharing/l10n/et_EE.json
@@ -2,28 +2,34 @@
     "Server to server sharing is not enabled on this server" : "Serverist serverisse jagamine pole antud serveris lubatud",
     "The mountpoint name contains invalid characters." : "Ühenduspunkti nimes on vigaseid märke.",
     "Invalid or untrusted SSL certificate" : "Vigane või tundmatu SSL sertifikaat",
+    "Storage not valid" : "Andmehoidla pole korrektne",
     "Couldn't add remote share" : "Ei suutnud lisada kaugjagamist",
     "Shared with you" : "Sinuga jagatud",
     "Shared with others" : "Teistega jagatud",
     "Shared by link" : "Jagatud lingiga",
     "Nothing shared with you yet" : "Sinuga pole veel midagi jagatud",
+    "Files and folders others share with you will show up here" : "Siin näidatakse faile ja kaustasid, mida teised on sulle jaganud",
     "Nothing shared yet" : "Midagi pole veel jagatud",
+    "Files and folders you share will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa oled teistega jaganud",
     "No shared links" : "Jagatud linke pole",
+    "Files and folders you share by link will show up here" : "Siin kuvatakse faile ja kaustasid, mida sa jagad lingiga",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soovid lisata kaugjagamise {name} asukohast {owner}@{remote}?",
     "Remote share" : "Kaugjagamine",
     "Remote share password" : "Kaugjagamise parool",
     "Cancel" : "Loobu",
     "Add remote share" : "Lisa kaugjagamine",
     "You can upload into this folder" : "Sa saad sellesse kausta faile üles laadida",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Saidilt {remote} ei leitud ownCloudi (7 või uuem) ",
     "Invalid ownCloud url" : "Vigane ownCloud url",
-    "Share" : "Jaga",
     "Shared by" : "Jagas",
+    "Sharing" : "Jagamine",
     "A file or folder has been <strong>shared</strong>" : "Fail või kataloog on <strong>jagatud</strong>",
     "You shared %1$s with %2$s" : "Jagasid %1$s  %2$s kasutajaga",
     "You shared %1$s with group %2$s" : "Jagasid %1$s %2$s grupiga",
     "%2$s shared %1$s with you" : "%2$s jagas sinuga %1$s",
     "You shared %1$s via link" : "Jagasid %1$s lingiga",
     "Shares" : "Jagamised",
+    "Accept" : "Nõustu",
     "This share is password-protected" : "See jagamine on parooliga kaitstud",
     "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.",
     "Password" : "Parool",
@@ -44,7 +50,6 @@
     "Allow users on this server to send shares to other servers" : "Luba selle serveri kasutajatel saata faile teistesse serveritesse",
     "Allow users on this server to receive shares from other servers" : "Luba selle serveri kasutajatel võtta vastu jagamisi teistest serveritest",
     "Share it:" : "Jaga seda:",
-    "Add it to your website:" : "Lisa see oma veebisaidile:",
     "Share with me via ownCloud" : "Jaga minuga läbi ownCloudiga",
     "HTML Code:" : "HTML kood:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js
index 12a8b3d534..69a5e42cb4 100644
--- a/apps/files_sharing/l10n/eu.js
+++ b/apps/files_sharing/l10n/eu.js
@@ -22,8 +22,8 @@ OC.L10N.register(
     "Add remote share" : "Gehitu urrutiko parte hartzea",
     "No ownCloud installation (7 or higher) found at {remote}" : "Ez da ownClouden instalaziorik (7 edo haundiago) aurkitu {remote}n",
     "Invalid ownCloud url" : "ownCloud url baliogabea",
-    "Share" : "Partekatu",
     "Shared by" : "Honek elkarbanatuta",
+    "Sharing" : "Partekatzea",
     "A file or folder has been <strong>shared</strong>" : "Fitxategia edo karpeta <strong>konpartitu</strong> da",
     "A file or folder was shared from <strong>another server</strong>" : "Fitxategia edo karpeta konpartitu da <strong>beste zerbitzari batetatik</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Publikoki partekatutako fitxategi edo karpeta bat <strong>deskargatu da</strong>",
diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json
index 533828717d..e7890855cd 100644
--- a/apps/files_sharing/l10n/eu.json
+++ b/apps/files_sharing/l10n/eu.json
@@ -20,8 +20,8 @@
     "Add remote share" : "Gehitu urrutiko parte hartzea",
     "No ownCloud installation (7 or higher) found at {remote}" : "Ez da ownClouden instalaziorik (7 edo haundiago) aurkitu {remote}n",
     "Invalid ownCloud url" : "ownCloud url baliogabea",
-    "Share" : "Partekatu",
     "Shared by" : "Honek elkarbanatuta",
+    "Sharing" : "Partekatzea",
     "A file or folder has been <strong>shared</strong>" : "Fitxategia edo karpeta <strong>konpartitu</strong> da",
     "A file or folder was shared from <strong>another server</strong>" : "Fitxategia edo karpeta konpartitu da <strong>beste zerbitzari batetatik</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Publikoki partekatutako fitxategi edo karpeta bat <strong>deskargatu da</strong>",
diff --git a/apps/files_sharing/l10n/eu_ES.js b/apps/files_sharing/l10n/eu_ES.js
deleted file mode 100644
index 240f018155..0000000000
--- a/apps/files_sharing/l10n/eu_ES.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "Cancel" : "Ezeztatu",
-    "Download" : "Deskargatu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/eu_ES.json b/apps/files_sharing/l10n/eu_ES.json
deleted file mode 100644
index 9adbb2b818..0000000000
--- a/apps/files_sharing/l10n/eu_ES.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Cancel" : "Ezeztatu",
-    "Download" : "Deskargatu"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fa.js b/apps/files_sharing/l10n/fa.js
index 72171ac1d6..5376ad45ca 100644
--- a/apps/files_sharing/l10n/fa.js
+++ b/apps/files_sharing/l10n/fa.js
@@ -13,8 +13,8 @@ OC.L10N.register(
     "Cancel" : "منصرف شدن",
     "Add remote share" : "افزودن اشتراک از راه دور",
     "Invalid ownCloud url" : "آدرس نمونه ownCloud  غیر معتبر است",
-    "Share" : "اشتراک‌گذاری",
     "Shared by" : "اشتراک گذاشته شده به وسیله",
+    "Sharing" : "اشتراک گذاری",
     "A file or folder has been <strong>shared</strong>" : "فایل یا پوشه ای به <strong>اشتراک</strong> گذاشته شد",
     "You shared %1$s with %2$s" : "شما %1$s را با %2$s به اشتراک گذاشتید",
     "You shared %1$s with group %2$s" : "شما %1$s را با گروه %2$s به اشتراک گذاشتید",
diff --git a/apps/files_sharing/l10n/fa.json b/apps/files_sharing/l10n/fa.json
index 6537bb2225..13778338f4 100644
--- a/apps/files_sharing/l10n/fa.json
+++ b/apps/files_sharing/l10n/fa.json
@@ -11,8 +11,8 @@
     "Cancel" : "منصرف شدن",
     "Add remote share" : "افزودن اشتراک از راه دور",
     "Invalid ownCloud url" : "آدرس نمونه ownCloud  غیر معتبر است",
-    "Share" : "اشتراک‌گذاری",
     "Shared by" : "اشتراک گذاشته شده به وسیله",
+    "Sharing" : "اشتراک گذاری",
     "A file or folder has been <strong>shared</strong>" : "فایل یا پوشه ای به <strong>اشتراک</strong> گذاشته شد",
     "You shared %1$s with %2$s" : "شما %1$s را با %2$s به اشتراک گذاشتید",
     "You shared %1$s with group %2$s" : "شما %1$s را با گروه %2$s به اشتراک گذاشتید",
diff --git a/apps/files_sharing/l10n/fi.js b/apps/files_sharing/l10n/fi.js
deleted file mode 100644
index 1f1bf5377b..0000000000
--- a/apps/files_sharing/l10n/fi.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "Cancel" : "Peruuta",
-    "Password" : "Salasana"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/fi.json b/apps/files_sharing/l10n/fi.json
deleted file mode 100644
index a80ddde0fe..0000000000
--- a/apps/files_sharing/l10n/fi.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Cancel" : "Peruuta",
-    "Password" : "Salasana"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index 0e1beda5af..396c478553 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Voit lähettää tiedostoja tähän kansioon",
     "No ownCloud installation (7 or higher) found at {remote}" : "ownCloud-asennusta (versiota 7 tai uudempaa) ei löytynyt osoitteesta {remote}",
     "Invalid ownCloud url" : "Virheellinen ownCloud-osoite",
-    "Share" : "Jaa",
     "Shared by" : "Jakanut",
+    "Sharing" : "Jakaminen",
     "A file or folder has been <strong>shared</strong>" : "Tiedosto tai kansio on <strong>jaettu</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Tiedosto tai kansio jaettiin <strong>toiselta palvelimelta</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Julkisesti jaettu tiedosto tai kansio <strong>ladattiin</strong>",
@@ -41,6 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
+    "You received %s as a remote share from %s" : "Sait etäjaon %s käyttäjältä %s",
+    "Accept" : "Hyväksy",
+    "Decline" : "Kieltäydy",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta",
     "This share is password-protected" : "Tämä jako on suojattu salasanalla",
@@ -66,7 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "Federoitu pilvi",
     "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:",
     "Share it:" : "Jaa se:",
-    "Add it to your website:" : "Lisää verkkosivustollesi:",
+    "Add to your website" : "Lisää verkkosivuillesi",
     "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta",
     "HTML Code:" : "HTML-koodi:"
 },
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index 5f87c38f32..56d64c0e84 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Voit lähettää tiedostoja tähän kansioon",
     "No ownCloud installation (7 or higher) found at {remote}" : "ownCloud-asennusta (versiota 7 tai uudempaa) ei löytynyt osoitteesta {remote}",
     "Invalid ownCloud url" : "Virheellinen ownCloud-osoite",
-    "Share" : "Jaa",
     "Shared by" : "Jakanut",
+    "Sharing" : "Jakaminen",
     "A file or folder has been <strong>shared</strong>" : "Tiedosto tai kansio on <strong>jaettu</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Tiedosto tai kansio jaettiin <strong>toiselta palvelimelta</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Julkisesti jaettu tiedosto tai kansio <strong>ladattiin</strong>",
@@ -39,6 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s jakoi kohteen %1$s kanssasi",
     "You shared %1$s via link" : "Jaoit kohteen %1$s linkin kautta",
     "Shares" : "Jaot",
+    "You received %s as a remote share from %s" : "Sait etäjaon %s käyttäjältä %s",
+    "Accept" : "Hyväksy",
+    "Decline" : "Kieltäydy",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta, katso %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Jaa kanssani käyttäen #ownCloud ja federoitua pilvitunnistetta",
     "This share is password-protected" : "Tämä jako on suojattu salasanalla",
@@ -64,7 +67,7 @@
     "Federated Cloud" : "Federoitu pilvi",
     "Your Federated Cloud ID:" : "Federoidun pilvesi tunniste:",
     "Share it:" : "Jaa se:",
-    "Add it to your website:" : "Lisää verkkosivustollesi:",
+    "Add to your website" : "Lisää verkkosivuillesi",
     "Share with me via ownCloud" : "Jaa kanssani ownCloudin kautta",
     "HTML Code:" : "HTML-koodi:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 0a8a19ed14..a59409e008 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Vous pouvez téléverser dans ce dossier",
     "No ownCloud installation (7 or higher) found at {remote}" : "Aucune installation ownCloud (7 ou supérieur) trouvée sur {remote}",
     "Invalid ownCloud url" : "URL ownCloud non valide",
-    "Share" : "Partager",
     "Shared by" : "Partagé par",
+    "Sharing" : "Partage",
     "A file or folder has been <strong>shared</strong>" : "Un fichier ou un répertoire a été <strong>partagé</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Un fichier ou un répertoire a été partagé depuis <strong>un autre serveur</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Un fichier ou un répertoire partagé publiquement a été <strong>téléchargé</strong>",
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Shares" : "Partages",
+    "Accept" : "Accepter",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud",
     "This share is password-protected" : "Ce partage est protégé par un mot de passe",
@@ -66,7 +67,7 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :",
     "Share it:" : "Partager :",
-    "Add it to your website:" : "Ajouter à votre site web :",
+    "Add to your website" : "Ajouter à votre site web",
     "Share with me via ownCloud" : "Partagez avec moi via ownCloud",
     "HTML Code:" : "Code HTML :"
 },
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 15ddb2d418..0bb6f2b1b9 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Vous pouvez téléverser dans ce dossier",
     "No ownCloud installation (7 or higher) found at {remote}" : "Aucune installation ownCloud (7 ou supérieur) trouvée sur {remote}",
     "Invalid ownCloud url" : "URL ownCloud non valide",
-    "Share" : "Partager",
     "Shared by" : "Partagé par",
+    "Sharing" : "Partage",
     "A file or folder has been <strong>shared</strong>" : "Un fichier ou un répertoire a été <strong>partagé</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Un fichier ou un répertoire a été partagé depuis <strong>un autre serveur</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Un fichier ou un répertoire partagé publiquement a été <strong>téléchargé</strong>",
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s a partagé %1$s avec vous",
     "You shared %1$s via link" : "Vous avez partagé %1$s par lien public",
     "Shares" : "Partages",
+    "Accept" : "Accepter",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Partagez avec moi grâce à mon identifiant Federated Cloud #owncloud",
     "This share is password-protected" : "Ce partage est protégé par un mot de passe",
@@ -64,7 +65,7 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Votre identifiant Federated Cloud :",
     "Share it:" : "Partager :",
-    "Add it to your website:" : "Ajouter à votre site web :",
+    "Add to your website" : "Ajouter à votre site web",
     "Share with me via ownCloud" : "Partagez avec moi via ownCloud",
     "HTML Code:" : "Code HTML :"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js
index 40694fc0d3..f2a2d528ff 100644
--- a/apps/files_sharing/l10n/gl.js
+++ b/apps/files_sharing/l10n/gl.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Pode envialo a este cartafol",
     "No ownCloud installation (7 or higher) found at {remote}" : "Non se atopa unha instalación de ownCloud (7 ou superior) en {remote}",
     "Invalid ownCloud url" : "URL incorrecto do ownCloud",
-    "Share" : "Compartir",
     "Shared by" : "Compartido por",
+    "Sharing" : "Compartindo",
     "A file or folder has been <strong>shared</strong>" : "<strong>Compartiuse</strong> un ficheiro ou cartafol",
     "A file or folder was shared from <strong>another server</strong>" : "Compartiuse un ficheiro ou cartafol desde <strong>outro servidor</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Foi <strong>descargado</strong> un ficheiro ou cartafol público",
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede",
     "You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón",
     "Shares" : "Comparticións",
+    "Accept" : "Aceptar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Comparte comigo a través do meu ID da nube federada do #ownCloud , vexa %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Comparte comigo a través do meu ID da nube federada do #ownCloud",
     "This share is password-protected" : "Esta compartición está protexida con contrasinal",
@@ -66,7 +67,6 @@ OC.L10N.register(
     "Federated Cloud" : "Nube federada",
     "Your Federated Cloud ID:" : "ID da súa nube federada:",
     "Share it:" : "Compártao:",
-    "Add it to your website:" : "Engádao o seu sitio web:",
     "Share with me via ownCloud" : "Comparte comigo a través do ownCloud",
     "HTML Code:" : "Código HTML:"
 },
diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json
index 97eb5d14bf..b9998a47a1 100644
--- a/apps/files_sharing/l10n/gl.json
+++ b/apps/files_sharing/l10n/gl.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Pode envialo a este cartafol",
     "No ownCloud installation (7 or higher) found at {remote}" : "Non se atopa unha instalación de ownCloud (7 ou superior) en {remote}",
     "Invalid ownCloud url" : "URL incorrecto do ownCloud",
-    "Share" : "Compartir",
     "Shared by" : "Compartido por",
+    "Sharing" : "Compartindo",
     "A file or folder has been <strong>shared</strong>" : "<strong>Compartiuse</strong> un ficheiro ou cartafol",
     "A file or folder was shared from <strong>another server</strong>" : "Compartiuse un ficheiro ou cartafol desde <strong>outro servidor</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Foi <strong>descargado</strong> un ficheiro ou cartafol público",
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s compartiu %1$s con vostede",
     "You shared %1$s via link" : "Vostede compartiu %1$s mediante ligazón",
     "Shares" : "Comparticións",
+    "Accept" : "Aceptar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Comparte comigo a través do meu ID da nube federada do #ownCloud , vexa %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Comparte comigo a través do meu ID da nube federada do #ownCloud",
     "This share is password-protected" : "Esta compartición está protexida con contrasinal",
@@ -64,7 +65,6 @@
     "Federated Cloud" : "Nube federada",
     "Your Federated Cloud ID:" : "ID da súa nube federada:",
     "Share it:" : "Compártao:",
-    "Add it to your website:" : "Engádao o seu sitio web:",
     "Share with me via ownCloud" : "Comparte comigo a través do ownCloud",
     "HTML Code:" : "Código HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/he.js b/apps/files_sharing/l10n/he.js
index 82184a4629..a9292dc820 100644
--- a/apps/files_sharing/l10n/he.js
+++ b/apps/files_sharing/l10n/he.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "ביטול",
-    "Share" : "שיתוף",
     "Shared by" : "שותף על־ידי",
+    "Sharing" : "שיתוף",
     "A file or folder has been <strong>shared</strong>" : "קובץ או תיקייה <strong>שותפו<strong/>",
     "You shared %1$s with %2$s" : "שיתפת %1$s עם %2$s",
     "You shared %1$s with group %2$s" : "שיתפת %1$s עם קבוצת %2$s",
diff --git a/apps/files_sharing/l10n/he.json b/apps/files_sharing/l10n/he.json
index 3b35f84f2e..9f9ab2593f 100644
--- a/apps/files_sharing/l10n/he.json
+++ b/apps/files_sharing/l10n/he.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Cancel" : "ביטול",
-    "Share" : "שיתוף",
     "Shared by" : "שותף על־ידי",
+    "Sharing" : "שיתוף",
     "A file or folder has been <strong>shared</strong>" : "קובץ או תיקייה <strong>שותפו<strong/>",
     "You shared %1$s with %2$s" : "שיתפת %1$s עם %2$s",
     "You shared %1$s with group %2$s" : "שיתפת %1$s עם קבוצת %2$s",
diff --git a/apps/files_sharing/l10n/hi.js b/apps/files_sharing/l10n/hi.js
index 8a6c01ef43..a9647c762d 100644
--- a/apps/files_sharing/l10n/hi.js
+++ b/apps/files_sharing/l10n/hi.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "रद्द करें ",
-    "Share" : "साझा करें",
     "Shared by" : "द्वारा साझा",
     "Password" : "पासवर्ड"
 },
diff --git a/apps/files_sharing/l10n/hi.json b/apps/files_sharing/l10n/hi.json
index 6078a1ba37..5775830b62 100644
--- a/apps/files_sharing/l10n/hi.json
+++ b/apps/files_sharing/l10n/hi.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "रद्द करें ",
-    "Share" : "साझा करें",
     "Shared by" : "द्वारा साझा",
     "Password" : "पासवर्ड"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/hr.js b/apps/files_sharing/l10n/hr.js
index f367ba070f..63090dd4e4 100644
--- a/apps/files_sharing/l10n/hr.js
+++ b/apps/files_sharing/l10n/hr.js
@@ -13,8 +13,8 @@ OC.L10N.register(
     "Cancel" : "Odustanite",
     "Add remote share" : "Dodajte udaljeni zajednički resurs",
     "Invalid ownCloud url" : "Neispravan ownCloud URL",
-    "Share" : "Podijelite resurs",
     "Shared by" : "Podijeljeno od strane",
+    "Sharing" : "Dijeljenje zajedničkih resursa",
     "A file or folder has been <strong>shared</strong>" : "Datoteka ili mapa su <strong>podijeljeni</strong>",
     "You shared %1$s with %2$s" : "Podijelili ste %1$s s %2$s",
     "You shared %1$s with group %2$s" : "Podijelili ste %1$s s grupom %2$s",
diff --git a/apps/files_sharing/l10n/hr.json b/apps/files_sharing/l10n/hr.json
index a04d285f02..dd5fa0489f 100644
--- a/apps/files_sharing/l10n/hr.json
+++ b/apps/files_sharing/l10n/hr.json
@@ -11,8 +11,8 @@
     "Cancel" : "Odustanite",
     "Add remote share" : "Dodajte udaljeni zajednički resurs",
     "Invalid ownCloud url" : "Neispravan ownCloud URL",
-    "Share" : "Podijelite resurs",
     "Shared by" : "Podijeljeno od strane",
+    "Sharing" : "Dijeljenje zajedničkih resursa",
     "A file or folder has been <strong>shared</strong>" : "Datoteka ili mapa su <strong>podijeljeni</strong>",
     "You shared %1$s with %2$s" : "Podijelili ste %1$s s %2$s",
     "You shared %1$s with group %2$s" : "Podijelili ste %1$s s grupom %2$s",
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index c035733d39..c78bdce652 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Ebbe a könyvtárba fel tud tölteni",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nem található ownCloud telepítés (7 vagy nagyobb verzió) itt  {remote}",
     "Invalid ownCloud url" : "Érvénytelen ownCloud webcím",
-    "Share" : "Megosztás",
     "Shared by" : "Megosztotta Önnel",
+    "Sharing" : "Megosztás",
     "A file or folder has been <strong>shared</strong>" : "Fájl vagy könyvtár <strong>megosztása</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Egy fájl vagy könyvtár meg lett osztva egy <strong>másik szerverről</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Egy nyilvánosan megosztott fáljt vagy könyvtárat <strong>letöltöttek</strong>",
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
     "Shares" : "Megosztások",
+    "Accept" : "Elfogadás",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ",
     "This share is password-protected" : "Ez egy jelszóval védett megosztás",
@@ -66,7 +67,7 @@ OC.L10N.register(
     "Federated Cloud" : "Egyesített felhő",
     "Your Federated Cloud ID:" : "Egyesített felhő azonosító:",
     "Share it:" : "Ossza meg:",
-    "Add it to your website:" : "Adja hozzá a saját weboldalához:",
+    "Add to your website" : "Add hozzá saját weboldaladhoz",
     "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül",
     "HTML Code:" : "HTML Code:"
 },
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index d35cf5f438..22cc1422eb 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Ebbe a könyvtárba fel tud tölteni",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nem található ownCloud telepítés (7 vagy nagyobb verzió) itt  {remote}",
     "Invalid ownCloud url" : "Érvénytelen ownCloud webcím",
-    "Share" : "Megosztás",
     "Shared by" : "Megosztotta Önnel",
+    "Sharing" : "Megosztás",
     "A file or folder has been <strong>shared</strong>" : "Fájl vagy könyvtár <strong>megosztása</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Egy fájl vagy könyvtár meg lett osztva egy <strong>másik szerverről</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Egy nyilvánosan megosztott fáljt vagy könyvtárat <strong>letöltöttek</strong>",
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s megosztotta velem ezt: %1$s",
     "You shared %1$s via link" : "Megosztottam link segítségével: %1$s",
     "Shares" : "Megosztások",
+    "Accept" : "Elfogadás",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével, lásd %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Ossza meg velem az #ownCloud Egyesített Felhő Azonosító segítségével ",
     "This share is password-protected" : "Ez egy jelszóval védett megosztás",
@@ -64,7 +65,7 @@
     "Federated Cloud" : "Egyesített felhő",
     "Your Federated Cloud ID:" : "Egyesített felhő azonosító:",
     "Share it:" : "Ossza meg:",
-    "Add it to your website:" : "Adja hozzá a saját weboldalához:",
+    "Add to your website" : "Add hozzá saját weboldaladhoz",
     "Share with me via ownCloud" : "Ossza meg velem ownCloud-on keresztül",
     "HTML Code:" : "HTML Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/ia.js b/apps/files_sharing/l10n/ia.js
index e85ad89efa..43b103e272 100644
--- a/apps/files_sharing/l10n/ia.js
+++ b/apps/files_sharing/l10n/ia.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Cancellar",
-    "Share" : "Compartir",
     "A file or folder has been <strong>shared</strong>" : "Un file o un dossier ha essite <strong>compartite</strong>",
     "You shared %1$s with %2$s" : "Tu compartiva %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Tu compartiva %1$s con gruppo %2$s",
diff --git a/apps/files_sharing/l10n/ia.json b/apps/files_sharing/l10n/ia.json
index 659d35e56c..64bda72c7d 100644
--- a/apps/files_sharing/l10n/ia.json
+++ b/apps/files_sharing/l10n/ia.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "Cancellar",
-    "Share" : "Compartir",
     "A file or folder has been <strong>shared</strong>" : "Un file o un dossier ha essite <strong>compartite</strong>",
     "You shared %1$s with %2$s" : "Tu compartiva %1$s con %2$s",
     "You shared %1$s with group %2$s" : "Tu compartiva %1$s con gruppo %2$s",
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index e605559626..f0d9fc2aec 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Anda dapat mengunggah kedalam folder ini",
     "No ownCloud installation (7 or higher) found at {remote}" : "Tidak ditemukan instalasi ownCloud (7 atau lebih tinggi) pada {remote}",
     "Invalid ownCloud url" : "URL ownCloud tidak sah",
-    "Share" : "Bagikan",
     "Shared by" : "Dibagikan oleh",
+    "Sharing" : "Berbagi",
     "A file or folder has been <strong>shared</strong>" : "Sebuah berkas atau folder telah <strong>dibagikan</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Sebuah berkas atau folder telah dibagikan dari <strong>server lainnya</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Sebuah berkas atau folder berbagi publik telah <strong>diunduh</strong>",
@@ -41,6 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
     "Shares" : "Dibagikan",
+    "You received %s as a remote share from %s" : "Anda menerima %s sebagai berbagi remote dari %s",
+    "Accept" : "Terima",
+    "Decline" : "Tolak",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya",
     "This share is password-protected" : "Berbagi ini dilindungi sandi",
@@ -66,7 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Federated Cloud ID Anda:",
     "Share it:" : "Bagikan:",
-    "Add it to your website:" : "Tambahkan ke situs web Anda:",
+    "Add to your website" : "Tambahkan pada situs web Anda",
     "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud",
     "HTML Code:" : "Kode HTML:"
 },
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index e0f19c8537..b14f4c4378 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Anda dapat mengunggah kedalam folder ini",
     "No ownCloud installation (7 or higher) found at {remote}" : "Tidak ditemukan instalasi ownCloud (7 atau lebih tinggi) pada {remote}",
     "Invalid ownCloud url" : "URL ownCloud tidak sah",
-    "Share" : "Bagikan",
     "Shared by" : "Dibagikan oleh",
+    "Sharing" : "Berbagi",
     "A file or folder has been <strong>shared</strong>" : "Sebuah berkas atau folder telah <strong>dibagikan</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Sebuah berkas atau folder telah dibagikan dari <strong>server lainnya</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Sebuah berkas atau folder berbagi publik telah <strong>diunduh</strong>",
@@ -39,6 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s membagikan %1$s dengan Anda",
     "You shared %1$s via link" : "Anda membagikan %1$s via tautan",
     "Shares" : "Dibagikan",
+    "You received %s as a remote share from %s" : "Anda menerima %s sebagai berbagi remote dari %s",
+    "Accept" : "Terima",
+    "Decline" : "Tolak",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya, lihat %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Dibagikan pada saya melalui #ownCloud Federated Cloud ID saya",
     "This share is password-protected" : "Berbagi ini dilindungi sandi",
@@ -64,7 +67,7 @@
     "Federated Cloud" : "Federated Cloud",
     "Your Federated Cloud ID:" : "Federated Cloud ID Anda:",
     "Share it:" : "Bagikan:",
-    "Add it to your website:" : "Tambahkan ke situs web Anda:",
+    "Add to your website" : "Tambahkan pada situs web Anda",
     "Share with me via ownCloud" : "Dibagikan pada saya via ownCloud",
     "HTML Code:" : "Kode HTML:"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/is.js b/apps/files_sharing/l10n/is.js
index 93f63e2531..19d519f59d 100644
--- a/apps/files_sharing/l10n/is.js
+++ b/apps/files_sharing/l10n/is.js
@@ -2,10 +2,10 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Hætta við",
-    "Share" : "Deila",
     "Shared by" : "Deilt af",
     "Password" : "Lykilorð",
+    "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
     "Name" : "Nafn",
     "Download" : "Niðurhal"
 },
-"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);");
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/files_sharing/l10n/is.json b/apps/files_sharing/l10n/is.json
index 69493847d9..21fb8e1239 100644
--- a/apps/files_sharing/l10n/is.json
+++ b/apps/files_sharing/l10n/is.json
@@ -1,9 +1,9 @@
 { "translations": {
     "Cancel" : "Hætta við",
-    "Share" : "Deila",
     "Shared by" : "Deilt af",
     "Password" : "Lykilorð",
+    "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
     "Name" : "Nafn",
     "Download" : "Niðurhal"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index 1a5e4c0bbd..9ddf9b5f38 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Puoi caricare in questa cartella",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nessuna installazione di ownCloud (7 o superiore) trovata su {remote}",
     "Invalid ownCloud url" : "URL di ownCloud non valido",
-    "Share" : "Condividi",
     "Shared by" : "Condiviso da",
+    "Sharing" : "Condivisione",
     "A file or folder has been <strong>shared</strong>" : "Un file o una cartella è stato <strong>condiviso</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Un file o una cartella è stato condiviso da <strong>un altro server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Un file condiviso pubblicamente o una cartella è stato <strong>scaricato</strong>",
@@ -41,6 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
+    "You received %s as a remote share from %s" : "Hai ricevuto %s come condivisione remota da %s",
+    "Accept" : "Accetta",
+    "Decline" : "Rifiuta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud",
     "This share is password-protected" : "Questa condivione è protetta da password",
@@ -66,7 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "Cloud federata",
     "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:",
     "Share it:" : "Condividilo:",
-    "Add it to your website:" : "Aggiungilo al tuo sito web:",
+    "Add to your website" : "Aggiungilo al tuo sito web",
     "Share with me via ownCloud" : "Condividi con me tramite ownCloud",
     "HTML Code:" : "Codice HTML:"
 },
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index 319a4a44c9..2ff7f2d13b 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Puoi caricare in questa cartella",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nessuna installazione di ownCloud (7 o superiore) trovata su {remote}",
     "Invalid ownCloud url" : "URL di ownCloud non valido",
-    "Share" : "Condividi",
     "Shared by" : "Condiviso da",
+    "Sharing" : "Condivisione",
     "A file or folder has been <strong>shared</strong>" : "Un file o una cartella è stato <strong>condiviso</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Un file o una cartella è stato condiviso da <strong>un altro server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Un file condiviso pubblicamente o una cartella è stato <strong>scaricato</strong>",
@@ -39,6 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s ha condiviso %1$s con te",
     "You shared %1$s via link" : "Hai condiviso %1$s tramite collegamento",
     "Shares" : "Condivisioni",
+    "You received %s as a remote share from %s" : "Hai ricevuto %s come condivisione remota da %s",
+    "Accept" : "Accetta",
+    "Decline" : "Rifiuta",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud, vedi %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Condividi con me attraverso il mio ID di cloud federata #ownCloud",
     "This share is password-protected" : "Questa condivione è protetta da password",
@@ -64,7 +67,7 @@
     "Federated Cloud" : "Cloud federata",
     "Your Federated Cloud ID:" : "Il tuo ID di cloud federata:",
     "Share it:" : "Condividilo:",
-    "Add it to your website:" : "Aggiungilo al tuo sito web:",
+    "Add to your website" : "Aggiungilo al tuo sito web",
     "Share with me via ownCloud" : "Condividi con me tramite ownCloud",
     "HTML Code:" : "Codice HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index 93e7323882..413f4a2ac8 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -24,11 +24,11 @@ OC.L10N.register(
     "You can upload into this folder" : "このフォルダーにアップロードできます",
     "No ownCloud installation (7 or higher) found at {remote}" : "{remote} にはownCloud (7以上)がインストールされていません",
     "Invalid ownCloud url" : "無効なownCloud URL です",
-    "Share" : "共有",
     "Shared by" : "共有者：",
-    "A file or folder has been <strong>shared</strong>" : "ファイルまたはフォルダーを<strong>共有</strong>したとき",
-    "A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーが<strong>他のサーバー</strong>から共有されたとき",
-    "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーが<strong>ダウンロードされた</strong>とき",
+    "Sharing" : "共有",
+    "A file or folder has been <strong>shared</strong>" : "ファイルまたはフォルダーが<strong>共有</strong>されました。",
+    "A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーが<strong>他のサーバー</strong>から共有されました。",
+    "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーが<strong>ダウンロード</strong>されました。",
     "You received a new remote share %2$s from %1$s" : "%1$s から新しいリモート共有のリクエスト %2$s を受け取りました。",
     "You received a new remote share from %s" : "%sからリモート共有のリクエストは\n届きました。",
     "%1$s accepted remote share %2$s" : "%1$s は %2$s のリモート共有を承認しました。",
@@ -41,12 +41,15 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s は %1$s をあなたと共有しました",
     "You shared %1$s via link" : "リンク経由で %1$s を共有しています",
     "Shares" : "共有",
+    "Accept" : "承諾",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud の「クラウド連携ID」で私と共有できます。こちらを見てください。%s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud の「クラウド連携ID」で私と共有できます。",
     "This share is password-protected" : "この共有はパスワードで保護されています",
     "The password is wrong. Try again." : "パスワードが間違っています。再試行してください。",
     "Password" : "パスワード",
     "No entries found in this folder" : "このフォルダーにはエントリーがありません",
     "Name" : "名前",
-    "Share time" : "共有時間",
+    "Share time" : "共有した時刻",
     "Sorry, this link doesn’t seem to work anymore." : "すみません。このリンクはもう利用できません。",
     "Reasons might be:" : "理由は以下の通りと考えられます：",
     "the item was removed" : "アイテムが削除されました",
@@ -61,8 +64,9 @@ OC.L10N.register(
     "Open documentation" : "ドキュメントを開く",
     "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する",
     "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する",
-    "Share it:" : "共有:",
-    "Add it to your website:" : "ウェブサイトに追加:",
+    "Federated Cloud" : "クラウド連携",
+    "Your Federated Cloud ID:" : "あなたのクラウド連携ID：",
+    "Share it:" : "以下で共有:",
     "Share with me via ownCloud" : "OwnCloud経由で共有",
     "HTML Code:" : "HTMLコード:"
 },
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index 6f3acbb747..65d762871d 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -22,11 +22,11 @@
     "You can upload into this folder" : "このフォルダーにアップロードできます",
     "No ownCloud installation (7 or higher) found at {remote}" : "{remote} にはownCloud (7以上)がインストールされていません",
     "Invalid ownCloud url" : "無効なownCloud URL です",
-    "Share" : "共有",
     "Shared by" : "共有者：",
-    "A file or folder has been <strong>shared</strong>" : "ファイルまたはフォルダーを<strong>共有</strong>したとき",
-    "A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーが<strong>他のサーバー</strong>から共有されたとき",
-    "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーが<strong>ダウンロードされた</strong>とき",
+    "Sharing" : "共有",
+    "A file or folder has been <strong>shared</strong>" : "ファイルまたはフォルダーが<strong>共有</strong>されました。",
+    "A file or folder was shared from <strong>another server</strong>" : "ファイルまたはフォルダーが<strong>他のサーバー</strong>から共有されました。",
+    "A public shared file or folder was <strong>downloaded</strong>" : "公開共有ファイルまたはフォルダーが<strong>ダウンロード</strong>されました。",
     "You received a new remote share %2$s from %1$s" : "%1$s から新しいリモート共有のリクエスト %2$s を受け取りました。",
     "You received a new remote share from %s" : "%sからリモート共有のリクエストは\n届きました。",
     "%1$s accepted remote share %2$s" : "%1$s は %2$s のリモート共有を承認しました。",
@@ -39,12 +39,15 @@
     "%2$s shared %1$s with you" : "%2$s は %1$s をあなたと共有しました",
     "You shared %1$s via link" : "リンク経由で %1$s を共有しています",
     "Shares" : "共有",
+    "Accept" : "承諾",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud の「クラウド連携ID」で私と共有できます。こちらを見てください。%s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud の「クラウド連携ID」で私と共有できます。",
     "This share is password-protected" : "この共有はパスワードで保護されています",
     "The password is wrong. Try again." : "パスワードが間違っています。再試行してください。",
     "Password" : "パスワード",
     "No entries found in this folder" : "このフォルダーにはエントリーがありません",
     "Name" : "名前",
-    "Share time" : "共有時間",
+    "Share time" : "共有した時刻",
     "Sorry, this link doesn’t seem to work anymore." : "すみません。このリンクはもう利用できません。",
     "Reasons might be:" : "理由は以下の通りと考えられます：",
     "the item was removed" : "アイテムが削除されました",
@@ -59,8 +62,9 @@
     "Open documentation" : "ドキュメントを開く",
     "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する",
     "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する",
-    "Share it:" : "共有:",
-    "Add it to your website:" : "ウェブサイトに追加:",
+    "Federated Cloud" : "クラウド連携",
+    "Your Federated Cloud ID:" : "あなたのクラウド連携ID：",
+    "Share it:" : "以下で共有:",
     "Share with me via ownCloud" : "OwnCloud経由で共有",
     "HTML Code:" : "HTMLコード:"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/ka_GE.js b/apps/files_sharing/l10n/ka_GE.js
index c4373ea9f4..adeb048e89 100644
--- a/apps/files_sharing/l10n/ka_GE.js
+++ b/apps/files_sharing/l10n/ka_GE.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "უარყოფა",
-    "Share" : "გაზიარება",
     "Shared by" : "აზიარებს",
+    "Sharing" : "გაზიარება",
     "Password" : "პაროლი",
     "Name" : "სახელი",
     "Download" : "ჩამოტვირთვა"
diff --git a/apps/files_sharing/l10n/ka_GE.json b/apps/files_sharing/l10n/ka_GE.json
index d052f45f09..5660d3b1a9 100644
--- a/apps/files_sharing/l10n/ka_GE.json
+++ b/apps/files_sharing/l10n/ka_GE.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Cancel" : "უარყოფა",
-    "Share" : "გაზიარება",
     "Shared by" : "აზიარებს",
+    "Sharing" : "გაზიარება",
     "Password" : "პაროლი",
     "Name" : "სახელი",
     "Download" : "ჩამოტვირთვა"
diff --git a/apps/files_sharing/l10n/km.js b/apps/files_sharing/l10n/km.js
index 215905c6d5..a6066a3a59 100644
--- a/apps/files_sharing/l10n/km.js
+++ b/apps/files_sharing/l10n/km.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "បោះបង់",
-    "Share" : "ចែក​រំលែក",
     "Shared by" : "បាន​ចែក​រំលែក​ដោយ",
+    "Sharing" : "ការ​ចែក​រំលែក",
     "A file or folder has been <strong>shared</strong>" : "<strong>បាន​ចែករំលែក</strong> ឯកសារ​ឬ​ថត",
     "You shared %1$s with %2$s" : "អ្នក​បាន​ចែករំលែក %1$s ជាមួយ %2$s",
     "You shared %1$s with group %2$s" : "អ្នក​បាន​ចែករំលែក %1$s ជាមួយ​ក្រុម %2$s",
diff --git a/apps/files_sharing/l10n/km.json b/apps/files_sharing/l10n/km.json
index e1a6acbf12..a1c84079d7 100644
--- a/apps/files_sharing/l10n/km.json
+++ b/apps/files_sharing/l10n/km.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Cancel" : "បោះបង់",
-    "Share" : "ចែក​រំលែក",
     "Shared by" : "បាន​ចែក​រំលែក​ដោយ",
+    "Sharing" : "ការ​ចែក​រំលែក",
     "A file or folder has been <strong>shared</strong>" : "<strong>បាន​ចែករំលែក</strong> ឯកសារ​ឬ​ថត",
     "You shared %1$s with %2$s" : "អ្នក​បាន​ចែករំលែក %1$s ជាមួយ %2$s",
     "You shared %1$s with group %2$s" : "អ្នក​បាន​ចែករំលែក %1$s ជាមួយ​ក្រុម %2$s",
diff --git a/apps/files_sharing/l10n/kn.js b/apps/files_sharing/l10n/kn.js
index 8ae732752a..69d899ad0a 100644
--- a/apps/files_sharing/l10n/kn.js
+++ b/apps/files_sharing/l10n/kn.js
@@ -2,7 +2,7 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "ರದ್ದು",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
+    "Sharing" : "ಹಂಚಿಕೆ",
     "Password" : "ಗುಪ್ತ ಪದ",
     "Name" : "ಹೆಸರು",
     "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ"
diff --git a/apps/files_sharing/l10n/kn.json b/apps/files_sharing/l10n/kn.json
index 5f990849c9..7553a7d1c9 100644
--- a/apps/files_sharing/l10n/kn.json
+++ b/apps/files_sharing/l10n/kn.json
@@ -1,6 +1,6 @@
 { "translations": {
     "Cancel" : "ರದ್ದು",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
+    "Sharing" : "ಹಂಚಿಕೆ",
     "Password" : "ಗುಪ್ತ ಪದ",
     "Name" : "ಹೆಸರು",
     "Download" : "ಪ್ರತಿಯನ್ನು ಸ್ಥಳೀಯವಾಗಿ ಉಳಿಸಿಕೊಳ್ಳಿ"
diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js
index a8d99ada8e..d750f82779 100644
--- a/apps/files_sharing/l10n/ko.js
+++ b/apps/files_sharing/l10n/ko.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "이 폴더에 업로드할 수 있습니다",
     "No ownCloud installation (7 or higher) found at {remote}" : "{remote}에 ownCloud 7 이상이 설치되어 있지 않음",
     "Invalid ownCloud url" : "잘못된 ownCloud URL",
-    "Share" : "공유",
     "Shared by" : "공유한 사용자:",
+    "Sharing" : "공유",
     "A file or folder has been <strong>shared</strong>" : "파일이나 폴더가 <strong>공유됨</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "<strong>다른 서버</strong>에서 파일이나 폴더를 공유함",
     "A public shared file or folder was <strong>downloaded</strong>" : "공개 공유된 파일이나 폴더가 <strong>다운로드됨</strong>",
@@ -41,6 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
     "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
     "Shares" : "공유",
+    "You received %s as a remote share from %s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다",
+    "Accept" : "수락",
+    "Decline" : "거절",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨",
     "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다",
@@ -66,7 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "연합 클라우드",
     "Your Federated Cloud ID:" : "내 연합 클라우드 ID:",
     "Share it:" : "공유하기:",
-    "Add it to your website:" : "웹 사이트에 다음을 추가하십시오:",
+    "Add to your website" : "내 웹 사이트에 추가",
     "Share with me via ownCloud" : "ownCloud로 나와 공유하기",
     "HTML Code:" : "HTML 코드:"
 },
diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json
index 85d4543bb1..e9a169be4f 100644
--- a/apps/files_sharing/l10n/ko.json
+++ b/apps/files_sharing/l10n/ko.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "이 폴더에 업로드할 수 있습니다",
     "No ownCloud installation (7 or higher) found at {remote}" : "{remote}에 ownCloud 7 이상이 설치되어 있지 않음",
     "Invalid ownCloud url" : "잘못된 ownCloud URL",
-    "Share" : "공유",
     "Shared by" : "공유한 사용자:",
+    "Sharing" : "공유",
     "A file or folder has been <strong>shared</strong>" : "파일이나 폴더가 <strong>공유됨</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "<strong>다른 서버</strong>에서 파일이나 폴더를 공유함",
     "A public shared file or folder was <strong>downloaded</strong>" : "공개 공유된 파일이나 폴더가 <strong>다운로드됨</strong>",
@@ -39,6 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s 님이 내게 %1$s을(를) 공유함",
     "You shared %1$s via link" : "내가 %1$s을(를) 링크로 공유함",
     "Shares" : "공유",
+    "You received %s as a remote share from %s" : "%1$s의 원격 공유로 %2$s을(를) 받았습니다",
+    "Accept" : "수락",
+    "Decline" : "거절",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨, 더 알아보기: %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "내 #ownCloud 연합 클라우드 ID를 통해서 공유됨",
     "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다",
@@ -64,7 +67,7 @@
     "Federated Cloud" : "연합 클라우드",
     "Your Federated Cloud ID:" : "내 연합 클라우드 ID:",
     "Share it:" : "공유하기:",
-    "Add it to your website:" : "웹 사이트에 다음을 추가하십시오:",
+    "Add to your website" : "내 웹 사이트에 추가",
     "Share with me via ownCloud" : "ownCloud로 나와 공유하기",
     "HTML Code:" : "HTML 코드:"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/ku_IQ.js b/apps/files_sharing/l10n/ku_IQ.js
index 3c751c0a7b..f1549d46c0 100644
--- a/apps/files_sharing/l10n/ku_IQ.js
+++ b/apps/files_sharing/l10n/ku_IQ.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "لابردن",
-    "Share" : "هاوبەشی کردن",
     "Password" : "وشەی تێپەربو",
     "Name" : "ناو",
     "Download" : "داگرتن"
diff --git a/apps/files_sharing/l10n/ku_IQ.json b/apps/files_sharing/l10n/ku_IQ.json
index 8c54636362..7be49d0c5e 100644
--- a/apps/files_sharing/l10n/ku_IQ.json
+++ b/apps/files_sharing/l10n/ku_IQ.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "لابردن",
-    "Share" : "هاوبەشی کردن",
     "Password" : "وشەی تێپەربو",
     "Name" : "ناو",
     "Download" : "داگرتن"
diff --git a/apps/files_sharing/l10n/lb.js b/apps/files_sharing/l10n/lb.js
index 1bdb37e38e..deaddb2613 100644
--- a/apps/files_sharing/l10n/lb.js
+++ b/apps/files_sharing/l10n/lb.js
@@ -4,7 +4,6 @@ OC.L10N.register(
     "Nothing shared yet" : "Nach näischt gedeelt",
     "No shared links" : "Keng gedeelte Linken",
     "Cancel" : "Ofbriechen",
-    "Share" : "Deelen",
     "Shared by" : "Gedeelt vun",
     "The password is wrong. Try again." : "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
     "Password" : "Passwuert",
diff --git a/apps/files_sharing/l10n/lb.json b/apps/files_sharing/l10n/lb.json
index ec78da1f17..43de4dbb66 100644
--- a/apps/files_sharing/l10n/lb.json
+++ b/apps/files_sharing/l10n/lb.json
@@ -2,7 +2,6 @@
     "Nothing shared yet" : "Nach näischt gedeelt",
     "No shared links" : "Keng gedeelte Linken",
     "Cancel" : "Ofbriechen",
-    "Share" : "Deelen",
     "Shared by" : "Gedeelt vun",
     "The password is wrong. Try again." : "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
     "Password" : "Passwuert",
diff --git a/apps/files_sharing/l10n/lo.js b/apps/files_sharing/l10n/lo.js
new file mode 100644
index 0000000000..c2ef0b8138
--- /dev/null
+++ b/apps/files_sharing/l10n/lo.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Sharing" : "ການແບ່ງປັນ"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/lo.json b/apps/files_sharing/l10n/lo.json
new file mode 100644
index 0000000000..e6d885c8e7
--- /dev/null
+++ b/apps/files_sharing/l10n/lo.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Sharing" : "ການແບ່ງປັນ"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/lt_LT.js b/apps/files_sharing/l10n/lt_LT.js
index 61860ef2f4..897bfe457d 100644
--- a/apps/files_sharing/l10n/lt_LT.js
+++ b/apps/files_sharing/l10n/lt_LT.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Atšaukti",
-    "Share" : "Dalintis",
     "Shared by" : "Dalinasi",
+    "Sharing" : "Dalijimasis",
     "A file or folder has been <strong>shared</strong>" : "Failas ar aplankas buvo <strong>pasidalintas</strong>",
     "You shared %1$s with %2$s" : "Jūs pasidalinote %1$s su %2$s",
     "You shared %1$s with group %2$s" : "Jūs pasidalinote %1$s su grupe %2$s",
diff --git a/apps/files_sharing/l10n/lt_LT.json b/apps/files_sharing/l10n/lt_LT.json
index 8e42e1ca94..c27668b24c 100644
--- a/apps/files_sharing/l10n/lt_LT.json
+++ b/apps/files_sharing/l10n/lt_LT.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Cancel" : "Atšaukti",
-    "Share" : "Dalintis",
     "Shared by" : "Dalinasi",
+    "Sharing" : "Dalijimasis",
     "A file or folder has been <strong>shared</strong>" : "Failas ar aplankas buvo <strong>pasidalintas</strong>",
     "You shared %1$s with %2$s" : "Jūs pasidalinote %1$s su %2$s",
     "You shared %1$s with group %2$s" : "Jūs pasidalinote %1$s su grupe %2$s",
diff --git a/apps/files_sharing/l10n/lv.js b/apps/files_sharing/l10n/lv.js
index b2a1334fc3..9c2f4d3fe4 100644
--- a/apps/files_sharing/l10n/lv.js
+++ b/apps/files_sharing/l10n/lv.js
@@ -23,8 +23,8 @@ OC.L10N.register(
     "Add remote share" : "Pievienot attālināto koplietotni",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nav atrasta neviena ownCloud (7. vai augstāka) instalācija {remote}",
     "Invalid ownCloud url" : "Nederīga ownCloud saite",
-    "Share" : "Dalīties",
     "Shared by" : "Dalījās",
+    "Sharing" : "Dalīšanās",
     "A file or folder has been <strong>shared</strong>" : "<strong>Koplietota</strong> fails vai mape",
     "A file or folder was shared from <strong>another server</strong>" : "Fails vai mape tika koplietota no <strong>cita servera</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Publiski koplietots fails vai mape tika <strong>lejupielādēts</strong>",
diff --git a/apps/files_sharing/l10n/lv.json b/apps/files_sharing/l10n/lv.json
index 7337d84171..abc16e3ad6 100644
--- a/apps/files_sharing/l10n/lv.json
+++ b/apps/files_sharing/l10n/lv.json
@@ -21,8 +21,8 @@
     "Add remote share" : "Pievienot attālināto koplietotni",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nav atrasta neviena ownCloud (7. vai augstāka) instalācija {remote}",
     "Invalid ownCloud url" : "Nederīga ownCloud saite",
-    "Share" : "Dalīties",
     "Shared by" : "Dalījās",
+    "Sharing" : "Dalīšanās",
     "A file or folder has been <strong>shared</strong>" : "<strong>Koplietota</strong> fails vai mape",
     "A file or folder was shared from <strong>another server</strong>" : "Fails vai mape tika koplietota no <strong>cita servera</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Publiski koplietots fails vai mape tika <strong>lejupielādēts</strong>",
diff --git a/apps/files_sharing/l10n/mk.js b/apps/files_sharing/l10n/mk.js
index a66bcbdd79..a5de7fb5c0 100644
--- a/apps/files_sharing/l10n/mk.js
+++ b/apps/files_sharing/l10n/mk.js
@@ -5,8 +5,8 @@ OC.L10N.register(
     "Shared with others" : "Сподели со останатите",
     "Shared by link" : "Споделено со врска",
     "Cancel" : "Откажи",
-    "Share" : "Сподели",
     "Shared by" : "Споделено од",
+    "Sharing" : "Споделување",
     "A file or folder has been <strong>shared</strong>" : "Датотека или фолдер беше <strong>споделен</strong>",
     "You shared %1$s with %2$s" : "Вие споделивте %1$s со %2$s",
     "You shared %1$s with group %2$s" : "Вие споделивте %1$s со групата %2$s",
diff --git a/apps/files_sharing/l10n/mk.json b/apps/files_sharing/l10n/mk.json
index 2aa50a1662..ad7eff6078 100644
--- a/apps/files_sharing/l10n/mk.json
+++ b/apps/files_sharing/l10n/mk.json
@@ -3,8 +3,8 @@
     "Shared with others" : "Сподели со останатите",
     "Shared by link" : "Споделено со врска",
     "Cancel" : "Откажи",
-    "Share" : "Сподели",
     "Shared by" : "Споделено од",
+    "Sharing" : "Споделување",
     "A file or folder has been <strong>shared</strong>" : "Датотека или фолдер беше <strong>споделен</strong>",
     "You shared %1$s with %2$s" : "Вие споделивте %1$s со %2$s",
     "You shared %1$s with group %2$s" : "Вие споделивте %1$s со групата %2$s",
diff --git a/apps/files_sharing/l10n/mn.js b/apps/files_sharing/l10n/mn.js
index 09d6902e57..49251482ad 100644
--- a/apps/files_sharing/l10n/mn.js
+++ b/apps/files_sharing/l10n/mn.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "files_sharing",
     {
-    "Share" : "Түгээх",
+    "Sharing" : "Түгээлт",
     "A file or folder has been <strong>shared</strong>" : "Файл эсвэл хавтас амжилттай <strong>түгээгдлээ</strong>",
     "You shared %1$s with %2$s" : "Та %1$s-ийг %2$s руу түгээлээ",
     "You shared %1$s with group %2$s" : "Та %1$s-ийг %2$s групп руу түгээлээ",
diff --git a/apps/files_sharing/l10n/mn.json b/apps/files_sharing/l10n/mn.json
index 1d7a83d2f9..f727c47a00 100644
--- a/apps/files_sharing/l10n/mn.json
+++ b/apps/files_sharing/l10n/mn.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Share" : "Түгээх",
+    "Sharing" : "Түгээлт",
     "A file or folder has been <strong>shared</strong>" : "Файл эсвэл хавтас амжилттай <strong>түгээгдлээ</strong>",
     "You shared %1$s with %2$s" : "Та %1$s-ийг %2$s руу түгээлээ",
     "You shared %1$s with group %2$s" : "Та %1$s-ийг %2$s групп руу түгээлээ",
diff --git a/apps/files_sharing/l10n/ms_MY.js b/apps/files_sharing/l10n/ms_MY.js
index d970549d4a..0b54000037 100644
--- a/apps/files_sharing/l10n/ms_MY.js
+++ b/apps/files_sharing/l10n/ms_MY.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Batal",
-    "Share" : "Kongsi",
     "Shared by" : "Dikongsi dengan",
     "%2$s shared %1$s with you" : "%2$s berkongsi %1$s dengan anda",
     "You shared %1$s via link" : "Anda kongsikan %1$s melalui sambungan",
diff --git a/apps/files_sharing/l10n/ms_MY.json b/apps/files_sharing/l10n/ms_MY.json
index 5590112705..8897e9e101 100644
--- a/apps/files_sharing/l10n/ms_MY.json
+++ b/apps/files_sharing/l10n/ms_MY.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "Batal",
-    "Share" : "Kongsi",
     "Shared by" : "Dikongsi dengan",
     "%2$s shared %1$s with you" : "%2$s berkongsi %1$s dengan anda",
     "You shared %1$s via link" : "Anda kongsikan %1$s melalui sambungan",
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index c6c7fb0b44..a83ce84d26 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Du kan laste opp til denne mappen",
     "No ownCloud installation (7 or higher) found at {remote}" : "Ingen ownCloud-installasjon (7 eller høyere) funnet på {remote}",
     "Invalid ownCloud url" : "Ugyldig ownCloud-url",
-    "Share" : "Del",
     "Shared by" : "Delt av",
+    "Sharing" : "Deling",
     "A file or folder has been <strong>shared</strong>" : "En fil eller mappe ble <strong>delt</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe ble delt fra <strong>en annen server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "En offentlig delt fil eller mappe ble <strong>lastet ned</strong>",
@@ -41,6 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "You shared %1$s via link" : "Du delte %1$s via lenke",
     "Shares" : "Delinger",
+    "You received %s as a remote share from %s" : "Du mottok %s som en ekstern deling fra %s",
+    "Accept" : "Aksepter",
+    "Decline" : "Avslå",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky",
     "This share is password-protected" : "Denne delingen er passordbeskyttet",
@@ -66,7 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "Sammenknyttet sky",
     "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:",
     "Share it:" : "Del den:",
-    "Add it to your website:" : "Legg den på websiden din:",
+    "Add to your website" : "Legg på websiden din",
     "Share with me via ownCloud" : "Del med meg via ownCloud",
     "HTML Code:" : "HTML-kode:"
 },
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index 43435faa5a..6eedd895f4 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Du kan laste opp til denne mappen",
     "No ownCloud installation (7 or higher) found at {remote}" : "Ingen ownCloud-installasjon (7 eller høyere) funnet på {remote}",
     "Invalid ownCloud url" : "Ugyldig ownCloud-url",
-    "Share" : "Del",
     "Shared by" : "Delt av",
+    "Sharing" : "Deling",
     "A file or folder has been <strong>shared</strong>" : "En fil eller mappe ble <strong>delt</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "En fil eller mappe ble delt fra <strong>en annen server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "En offentlig delt fil eller mappe ble <strong>lastet ned</strong>",
@@ -39,6 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s delte %1$s med deg",
     "You shared %1$s via link" : "Du delte %1$s via lenke",
     "Shares" : "Delinger",
+    "You received %s as a remote share from %s" : "Du mottok %s som en ekstern deling fra %s",
+    "Accept" : "Aksepter",
+    "Decline" : "Avslå",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky, se %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Del med meg gjennom min #ownCloud ID for sammenknyttet sky",
     "This share is password-protected" : "Denne delingen er passordbeskyttet",
@@ -64,7 +67,7 @@
     "Federated Cloud" : "Sammenknyttet sky",
     "Your Federated Cloud ID:" : "Din ID for sammenknyttet sky:",
     "Share it:" : "Del den:",
-    "Add it to your website:" : "Legg den på websiden din:",
+    "Add to your website" : "Legg på websiden din",
     "Share with me via ownCloud" : "Del med meg via ownCloud",
     "HTML Code:" : "HTML-kode:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index b2dc1f1dea..7468819fda 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "U kunt uploaden naar deze map",
     "No ownCloud installation (7 or higher) found at {remote}" : "Geen recente ownCloud installatie (7 of hoger) gevonden op {remote}",
     "Invalid ownCloud url" : "Ongeldige ownCloud url",
-    "Share" : "Deel",
     "Shared by" : "Gedeeld door",
+    "Sharing" : "Delen",
     "A file or folder has been <strong>shared</strong>" : "Een bestand of map is <strong>gedeeld</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Een bestand of map werd gedeeld vanaf <strong>een andere server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Een openbaar gedeeld bestand of map werd <strong>gedownloaded</strong>",
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "You shared %1$s via link" : "U deelde %1$s via link",
     "Shares" : "Gedeeld",
+    "Accept" : "Accepteren",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID",
     "This share is password-protected" : "Deze share is met een wachtwoord beveiligd",
@@ -66,7 +67,7 @@ OC.L10N.register(
     "Federated Cloud" : "Gefedereerde Cloud",
     "Your Federated Cloud ID:" : "Uw Federated Cloud ID:",
     "Share it:" : "Deel het:",
-    "Add it to your website:" : "Voeg het toe aan uw website:",
+    "Add to your website" : "Toevoegen aan uw website",
     "Share with me via ownCloud" : "Deel met mij via ownCloud",
     "HTML Code:" : "HTML Code:"
 },
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index e4cf032aad..57df2d5c15 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "U kunt uploaden naar deze map",
     "No ownCloud installation (7 or higher) found at {remote}" : "Geen recente ownCloud installatie (7 of hoger) gevonden op {remote}",
     "Invalid ownCloud url" : "Ongeldige ownCloud url",
-    "Share" : "Deel",
     "Shared by" : "Gedeeld door",
+    "Sharing" : "Delen",
     "A file or folder has been <strong>shared</strong>" : "Een bestand of map is <strong>gedeeld</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Een bestand of map werd gedeeld vanaf <strong>een andere server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Een openbaar gedeeld bestand of map werd <strong>gedownloaded</strong>",
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s deelde %1$s met u",
     "You shared %1$s via link" : "U deelde %1$s via link",
     "Shares" : "Gedeeld",
+    "Accept" : "Accepteren",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Deel met mij via mijn #ownCloud federated Cloud ID, zie %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Deel met mij via mijn #ownCloud federated Cloud ID",
     "This share is password-protected" : "Deze share is met een wachtwoord beveiligd",
@@ -64,7 +65,7 @@
     "Federated Cloud" : "Gefedereerde Cloud",
     "Your Federated Cloud ID:" : "Uw Federated Cloud ID:",
     "Share it:" : "Deel het:",
-    "Add it to your website:" : "Voeg het toe aan uw website:",
+    "Add to your website" : "Toevoegen aan uw website",
     "Share with me via ownCloud" : "Deel met mij via ownCloud",
     "HTML Code:" : "HTML Code:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/nn_NO.js b/apps/files_sharing/l10n/nn_NO.js
index 67e3779265..233dd6c058 100644
--- a/apps/files_sharing/l10n/nn_NO.js
+++ b/apps/files_sharing/l10n/nn_NO.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Avbryt",
-    "Share" : "Del",
     "Shared by" : "Delt av",
+    "Sharing" : "Deling",
     "A file or folder has been <strong>shared</strong>" : "Ei fil eller ei mappe har blitt <strong>delt</strong>",
     "You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
     "You shared %1$s with group %2$s" : "Du delte %1$s med gruppa %2$s",
diff --git a/apps/files_sharing/l10n/nn_NO.json b/apps/files_sharing/l10n/nn_NO.json
index fbf38ec262..d5d33c0ae4 100644
--- a/apps/files_sharing/l10n/nn_NO.json
+++ b/apps/files_sharing/l10n/nn_NO.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Cancel" : "Avbryt",
-    "Share" : "Del",
     "Shared by" : "Delt av",
+    "Sharing" : "Deling",
     "A file or folder has been <strong>shared</strong>" : "Ei fil eller ei mappe har blitt <strong>delt</strong>",
     "You shared %1$s with %2$s" : "Du delte %1$s med %2$s",
     "You shared %1$s with group %2$s" : "Du delte %1$s med gruppa %2$s",
diff --git a/apps/files_sharing/l10n/oc.js b/apps/files_sharing/l10n/oc.js
index b171633a33..5137891181 100644
--- a/apps/files_sharing/l10n/oc.js
+++ b/apps/files_sharing/l10n/oc.js
@@ -2,7 +2,7 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Annula",
-    "Share" : "Parteja",
+    "Sharing" : "Partiment",
     "Password" : "Senhal",
     "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr",
     "Name" : "Nom",
diff --git a/apps/files_sharing/l10n/oc.json b/apps/files_sharing/l10n/oc.json
index 0dd565d1a2..1dc1272a31 100644
--- a/apps/files_sharing/l10n/oc.json
+++ b/apps/files_sharing/l10n/oc.json
@@ -1,6 +1,6 @@
 { "translations": {
     "Cancel" : "Annula",
-    "Share" : "Parteja",
+    "Sharing" : "Partiment",
     "Password" : "Senhal",
     "No entries found in this folder" : "Cap d'entrada pas trobada dins aqueste dorsièr",
     "Name" : "Nom",
diff --git a/apps/files_sharing/l10n/pa.js b/apps/files_sharing/l10n/pa.js
index 5cf1b4d73a..55e1fcc249 100644
--- a/apps/files_sharing/l10n/pa.js
+++ b/apps/files_sharing/l10n/pa.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "ਰੱਦ ਕਰੋ",
-    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Password" : "ਪਾਸਵਰ",
     "Download" : "ਡਾਊਨਲੋਡ"
 },
diff --git a/apps/files_sharing/l10n/pa.json b/apps/files_sharing/l10n/pa.json
index f033319520..d0feec38ff 100644
--- a/apps/files_sharing/l10n/pa.json
+++ b/apps/files_sharing/l10n/pa.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "ਰੱਦ ਕਰੋ",
-    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Password" : "ਪਾਸਵਰ",
     "Download" : "ਡਾਊਨਲੋਡ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js
index 361ebeff20..62b128844d 100644
--- a/apps/files_sharing/l10n/pl.js
+++ b/apps/files_sharing/l10n/pl.js
@@ -22,14 +22,15 @@ OC.L10N.register(
     "Cancel" : "Anuluj",
     "Add remote share" : "Dodaj zdalny zasób",
     "Invalid ownCloud url" : "Błędny adres URL",
-    "Share" : "Udostępnij",
     "Shared by" : "Udostępniane przez",
+    "Sharing" : "Udostępnianie",
     "A file or folder has been <strong>shared</strong>" : "Plik lub folder stał się <strong>współdzielony</strong>",
     "You shared %1$s with %2$s" : "Współdzielisz %1$s z %2$s",
     "You shared %1$s with group %2$s" : "Współdzielisz %1$s z grupą %2$s",
     "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
     "You shared %1$s via link" : "Udostępniasz %1$s przez link",
     "Shares" : "Udziały",
+    "Accept" : "Akceptuj",
     "This share is password-protected" : "Udział ten jest chroniony hasłem",
     "The password is wrong. Try again." : "To hasło jest niewłaściwe. Spróbuj ponownie.",
     "Password" : "Hasło",
diff --git a/apps/files_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json
index 372b4724a5..76052b1dfb 100644
--- a/apps/files_sharing/l10n/pl.json
+++ b/apps/files_sharing/l10n/pl.json
@@ -20,14 +20,15 @@
     "Cancel" : "Anuluj",
     "Add remote share" : "Dodaj zdalny zasób",
     "Invalid ownCloud url" : "Błędny adres URL",
-    "Share" : "Udostępnij",
     "Shared by" : "Udostępniane przez",
+    "Sharing" : "Udostępnianie",
     "A file or folder has been <strong>shared</strong>" : "Plik lub folder stał się <strong>współdzielony</strong>",
     "You shared %1$s with %2$s" : "Współdzielisz %1$s z %2$s",
     "You shared %1$s with group %2$s" : "Współdzielisz %1$s z grupą %2$s",
     "%2$s shared %1$s with you" : "%2$s współdzieli %1$s z Tobą",
     "You shared %1$s via link" : "Udostępniasz %1$s przez link",
     "Shares" : "Udziały",
+    "Accept" : "Akceptuj",
     "This share is password-protected" : "Udział ten jest chroniony hasłem",
     "The password is wrong. Try again." : "To hasło jest niewłaściwe. Spróbuj ponownie.",
     "Password" : "Hasło",
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 06ab247fc3..35c9f97000 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Você não pode enviar arquivos para esta pasta",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação ownCloud (7 ou superior) foi encontrada em {remote}",
     "Invalid ownCloud url" : "Url invalida para ownCloud",
-    "Share" : "Compartilhar",
     "Shared by" : "Compartilhado por",
+    "Sharing" : "Compartilhamento",
     "A file or folder has been <strong>shared</strong>" : "Um arquivo ou pasta foi <strong>compartilhado</strong> ",
     "A file or folder was shared from <strong>another server</strong>" : "Um arquivo ou pasta foi compartilhada a partir de <strong>outro servidor</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Um arquivo ou pasta compartilhada publicamente foi <strong>baixado</strong>",
@@ -41,6 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
+    "You received %s as a remote share from %s" : "Você recebeu %s como um compartilhamento remoto de %s",
+    "Accept" : "Aceitar",
+    "Decline" : "Rejeitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID",
     "This share is password-protected" : "Este compartilhamento esta protegido por senha",
@@ -66,7 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "Nuvem Conglomerada",
     "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:",
     "Share it:" : "Compartilhe:",
-    "Add it to your website:" : "Adicione ao seu site:",
+    "Add to your website" : "Adicione ao seu website",
     "Share with me via ownCloud" : "Compartilhe comigo via ownCloud",
     "HTML Code:" : "Código HTML:"
 },
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 76865b3418..ebb2a5a4cc 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Você não pode enviar arquivos para esta pasta",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação ownCloud (7 ou superior) foi encontrada em {remote}",
     "Invalid ownCloud url" : "Url invalida para ownCloud",
-    "Share" : "Compartilhar",
     "Shared by" : "Compartilhado por",
+    "Sharing" : "Compartilhamento",
     "A file or folder has been <strong>shared</strong>" : "Um arquivo ou pasta foi <strong>compartilhado</strong> ",
     "A file or folder was shared from <strong>another server</strong>" : "Um arquivo ou pasta foi compartilhada a partir de <strong>outro servidor</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Um arquivo ou pasta compartilhada publicamente foi <strong>baixado</strong>",
@@ -39,6 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s compartilhou %1$s com você",
     "You shared %1$s via link" : "Você compartilhou %1$s via link",
     "Shares" : "Compartilhamentos",
+    "You received %s as a remote share from %s" : "Você recebeu %s como um compartilhamento remoto de %s",
+    "Accept" : "Aceitar",
+    "Decline" : "Rejeitar",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID, veja %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Compartilhe comigo através do meu #ownCloud Nuvem Federados ID",
     "This share is password-protected" : "Este compartilhamento esta protegido por senha",
@@ -64,7 +67,7 @@
     "Federated Cloud" : "Nuvem Conglomerada",
     "Your Federated Cloud ID:" : "Seu Federados Nuvem ID:",
     "Share it:" : "Compartilhe:",
-    "Add it to your website:" : "Adicione ao seu site:",
+    "Add to your website" : "Adicione ao seu website",
     "Share with me via ownCloud" : "Compartilhe comigo via ownCloud",
     "HTML Code:" : "Código HTML:"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
index f58cc27c19..dc501ebe04 100644
--- a/apps/files_sharing/l10n/pt_PT.js
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -4,41 +4,46 @@ OC.L10N.register(
     "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor",
     "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
-    "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada",
+    "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada",
     "Storage not valid" : "Armazenamento inválido",
     "Couldn't add remote share" : "Não foi possível adicionar a partilha remota",
     "Shared with you" : "Partilhado consigo ",
     "Shared with others" : "Partilhado com outros",
     "Shared by link" : "Partilhado pela hiperligação",
     "Nothing shared with you yet" : "Ainda não foi partilhado nada consigo",
-    "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui",
-    "Nothing shared yet" : "Ainda não foi nada paratilhado",
-    "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui",
+    "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradaos aqui",
+    "Nothing shared yet" : "Ainda não foi partilhado nada",
+    "Files and folders you share will show up here" : "Os ficheiros e as pastas que partilha serão mostrados aqui",
     "No shared links" : "Sem hiperligações partilhadas",
-    "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui",
+    "Files and folders you share by link will show up here" : "Os ficheiros e as pastas que partilha com esta hiperligação, serão mostrados aqui",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?",
     "Remote share" : "Partilha remota",
     "Remote share password" : "Senha da partilha remota",
     "Cancel" : "Cancelar",
     "Add remote share" : "Adicionar partilha remota",
-    "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}",
+    "You can upload into this folder" : "Pode enviar para esta pasta",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Não foi encontrada nenhuma instalação OwnCloud (7 ou superior) em {remote}",
     "Invalid ownCloud url" : "Url ownCloud inválido",
-    "Share" : "Compartilhar",
     "Shared by" : "Partilhado por",
+    "Sharing" : "Partilha",
     "A file or folder has been <strong>shared</strong>" : "Foi <strong>partilhado</strong> um ficheiro ou uma pasta",
     "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>",
-    "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi  <strong>descarregado</strong>",
-    "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s",
+    "A public shared file or folder was <strong>downloaded</strong>" : "Foi  <strong>transferido</strong> um ficheiro ou pasta partilhada publicamente",
+    "You received a new remote share %2$s from %1$s" : "Recebeu uma nova partilha remota %2$s de %1$s",
+    "You received a new remote share from %s" : "Recebeu uma nova partilha remota de %s",
     "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s",
     "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s",
-    "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo",
-    "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada",
-    "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado",
+    "%1$s unshared %2$s from you" : "%1$s cancelou a partilha %2$s consigo",
+    "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi transferida",
+    "Public shared file %1$s was downloaded" : "Foi transferido o ficheiro %1$s partilhado publicamente",
     "You shared %1$s with %2$s" : "Partilhou %1$s com %2$s",
     "You shared %1$s with group %2$s" : "Partilhou %1$s com o grupo %2$s",
     "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo",
     "You shared %1$s via link" : "Partilhou %1$s através de uma hiperligação",
     "Shares" : "Partilhas",
+    "Accept" : "Aceitar",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud",
     "This share is password-protected" : "Esta partilha está protegida por senha",
     "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.",
     "Password" : "Senha",
@@ -55,10 +60,14 @@ OC.L10N.register(
     "Download" : "Transferir",
     "Download %s" : "Transferir %s",
     "Direct link" : "Hiperligação direta",
-    "Federated Cloud Sharing" : "Partilha de Cloud Federada",
+    "Federated Cloud Sharing" : "Partilha de Nuvem Federada",
     "Open documentation" : "Abrir documentação",
     "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores",
     "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores",
+    "Federated Cloud" : "Nuvem Federada",
+    "Your Federated Cloud ID:" : "A Sua Id. da Nuvem Federada",
+    "Share it:" : "Partilhe:",
+    "Add to your website" : "Adicione ao seu sítio da Web",
     "Share with me via ownCloud" : "Partilhe comigo via ownCloud",
     "HTML Code:" : "Código HTML:"
 },
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
index cac69a145b..9c5bc14e61 100644
--- a/apps/files_sharing/l10n/pt_PT.json
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -2,41 +2,46 @@
     "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível neste servidor",
     "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém carateres inválidos.",
     "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
-    "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para partilha remota, a palavra-passe pode estar errada",
+    "Could not authenticate to remote share, password might be wrong" : "Não foi possível autenticar para a partilha remota, a palavra-passe poderá estar errada",
     "Storage not valid" : "Armazenamento inválido",
     "Couldn't add remote share" : "Não foi possível adicionar a partilha remota",
     "Shared with you" : "Partilhado consigo ",
     "Shared with others" : "Partilhado com outros",
     "Shared by link" : "Partilhado pela hiperligação",
     "Nothing shared with you yet" : "Ainda não foi partilhado nada consigo",
-    "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradas aqui",
-    "Nothing shared yet" : "Ainda não foi nada paratilhado",
-    "Files and folders you share will show up here" : "Os ficheiros e pastas que você partilha serão mostrados aqui",
+    "Files and folders others share with you will show up here" : "Os ficheiros e pastas que os outros partilham consigo, serão mostradaos aqui",
+    "Nothing shared yet" : "Ainda não foi partilhado nada",
+    "Files and folders you share will show up here" : "Os ficheiros e as pastas que partilha serão mostrados aqui",
     "No shared links" : "Sem hiperligações partilhadas",
-    "Files and folders you share by link will show up here" : "Os ficheiros e pastas que você partilha por link serão mostrados aqui",
+    "Files and folders you share by link will show up here" : "Os ficheiros e as pastas que partilha com esta hiperligação, serão mostrados aqui",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Deseja adicionar a partilha remota {nome} de {proprietário}@{remoto}?",
     "Remote share" : "Partilha remota",
     "Remote share password" : "Senha da partilha remota",
     "Cancel" : "Cancelar",
     "Add remote share" : "Adicionar partilha remota",
-    "No ownCloud installation (7 or higher) found at {remote}" : "Nenhuma instalação do OwnCloud (7 ou superior) encontrada em {remote}",
+    "You can upload into this folder" : "Pode enviar para esta pasta",
+    "No ownCloud installation (7 or higher) found at {remote}" : "Não foi encontrada nenhuma instalação OwnCloud (7 ou superior) em {remote}",
     "Invalid ownCloud url" : "Url ownCloud inválido",
-    "Share" : "Compartilhar",
     "Shared by" : "Partilhado por",
+    "Sharing" : "Partilha",
     "A file or folder has been <strong>shared</strong>" : "Foi <strong>partilhado</strong> um ficheiro ou uma pasta",
     "A file or folder was shared from <strong>another server</strong>" : "Um ficheiro ou pasta foi partilhado a partir de <strong>outro servidor</strong>",
-    "A public shared file or folder was <strong>downloaded</strong>" : "Um ficheiro ou pasta partilhada publicamente foi  <strong>descarregado</strong>",
-    "You received a new remote share from %s" : "Você recebeu uma nova partilha remota de %s",
+    "A public shared file or folder was <strong>downloaded</strong>" : "Foi  <strong>transferido</strong> um ficheiro ou pasta partilhada publicamente",
+    "You received a new remote share %2$s from %1$s" : "Recebeu uma nova partilha remota %2$s de %1$s",
+    "You received a new remote share from %s" : "Recebeu uma nova partilha remota de %s",
     "%1$s accepted remote share %2$s" : "%1$s aceitou a partilha remota %2$s",
     "%1$s declined remote share %2$s" : "%1$s rejeitou a partilha remota %2$s",
-    "%1$s unshared %2$s from you" : "%1$s retirou a partilha %2$s contigo",
-    "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi descarregada",
-    "Public shared file %1$s was downloaded" : "O ficheiro partilhado publicamente %1$s foi descarregado",
+    "%1$s unshared %2$s from you" : "%1$s cancelou a partilha %2$s consigo",
+    "Public shared folder %1$s was downloaded" : "A pasta partilhada publicamente %1$s foi transferida",
+    "Public shared file %1$s was downloaded" : "Foi transferido o ficheiro %1$s partilhado publicamente",
     "You shared %1$s with %2$s" : "Partilhou %1$s com %2$s",
     "You shared %1$s with group %2$s" : "Partilhou %1$s com o grupo %2$s",
     "%2$s shared %1$s with you" : "%2$s partilhou %1$s consigo",
     "You shared %1$s via link" : "Partilhou %1$s através de uma hiperligação",
     "Shares" : "Partilhas",
+    "Accept" : "Aceitar",
+    "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud, veja %s",
+    "Share with me through my #ownCloud Federated Cloud ID" : "Partilhe comigo através da minha Id. da Nuvem Federada #ownCloud",
     "This share is password-protected" : "Esta partilha está protegida por senha",
     "The password is wrong. Try again." : "A senha está errada. Por favor, tente de novo.",
     "Password" : "Senha",
@@ -53,10 +58,14 @@
     "Download" : "Transferir",
     "Download %s" : "Transferir %s",
     "Direct link" : "Hiperligação direta",
-    "Federated Cloud Sharing" : "Partilha de Cloud Federada",
+    "Federated Cloud Sharing" : "Partilha de Nuvem Federada",
     "Open documentation" : "Abrir documentação",
     "Allow users on this server to send shares to other servers" : "Permitir utilizadores neste servidor para enviar as partilhas para outros servidores",
     "Allow users on this server to receive shares from other servers" : "Permitir utilizadores neste servidor para receber as partilhas de outros servidores",
+    "Federated Cloud" : "Nuvem Federada",
+    "Your Federated Cloud ID:" : "A Sua Id. da Nuvem Federada",
+    "Share it:" : "Partilhe:",
+    "Add to your website" : "Adicione ao seu sítio da Web",
     "Share with me via ownCloud" : "Partilhe comigo via ownCloud",
     "HTML Code:" : "Código HTML:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_sharing/l10n/ro.js b/apps/files_sharing/l10n/ro.js
index deca9cc68e..1ec5b930d2 100644
--- a/apps/files_sharing/l10n/ro.js
+++ b/apps/files_sharing/l10n/ro.js
@@ -7,8 +7,8 @@ OC.L10N.register(
     "Nothing shared with you yet" : "Nimic nu e partajat cu tine încă",
     "Nothing shared yet" : "Nimic partajat încă",
     "Cancel" : "Anulare",
-    "Share" : "Partajează",
     "Shared by" : "impartite in ",
+    "Sharing" : "Partajare",
     "A file or folder has been <strong>shared</strong>" : "Un fișier sau director a fost <strong>partajat</strong>",
     "You shared %1$s with %2$s" : "Ai partajat %1$s cu %2$s",
     "You shared %1$s with group %2$s" : "Ai partajat %1$s cu grupul %2$s",
diff --git a/apps/files_sharing/l10n/ro.json b/apps/files_sharing/l10n/ro.json
index 62f44c6f9d..b106c99001 100644
--- a/apps/files_sharing/l10n/ro.json
+++ b/apps/files_sharing/l10n/ro.json
@@ -5,8 +5,8 @@
     "Nothing shared with you yet" : "Nimic nu e partajat cu tine încă",
     "Nothing shared yet" : "Nimic partajat încă",
     "Cancel" : "Anulare",
-    "Share" : "Partajează",
     "Shared by" : "impartite in ",
+    "Sharing" : "Partajare",
     "A file or folder has been <strong>shared</strong>" : "Un fișier sau director a fost <strong>partajat</strong>",
     "You shared %1$s with %2$s" : "Ai partajat %1$s cu %2$s",
     "You shared %1$s with group %2$s" : "Ai partajat %1$s cu grupul %2$s",
diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index 17790058fe..2d89b5e310 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Вы можете загружать в эту папку",
     "No ownCloud installation (7 or higher) found at {remote}" : "На удаленном ресурсе {remote} не установлен ownCloud версии 7 или выше",
     "Invalid ownCloud url" : "Неверный адрес ownCloud",
-    "Share" : "Поделиться",
     "Shared by" : "Поделился",
+    "Sharing" : "Общий доступ",
     "A file or folder has been <strong>shared</strong>" : "<strong>Опубликован</strong> файл или каталог",
     "A file or folder was shared from <strong>another server</strong>" : "Файлом или каталогом поделились с <strong>удаленного сервера</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Общий файл или каталог был <strong>скачан</strong>",
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
     "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки",
     "Shares" : "События обмена файлами",
+    "Accept" : "Принять",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ",
     "This share is password-protected" : "Общий ресурс защищен паролем",
@@ -66,7 +67,6 @@ OC.L10N.register(
     "Federated Cloud" : "Объединение облачных хранилищ",
     "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:",
     "Share it:" : "Поделись этим:",
-    "Add it to your website:" : "Добавь это на свой сайт:",
     "Share with me via ownCloud" : "Поделитесь мной через ownCloud",
     "HTML Code:" : "HTML код:"
 },
diff --git a/apps/files_sharing/l10n/ru.json b/apps/files_sharing/l10n/ru.json
index a3fdafbed8..0f7a152f53 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Вы можете загружать в эту папку",
     "No ownCloud installation (7 or higher) found at {remote}" : "На удаленном ресурсе {remote} не установлен ownCloud версии 7 или выше",
     "Invalid ownCloud url" : "Неверный адрес ownCloud",
-    "Share" : "Поделиться",
     "Shared by" : "Поделился",
+    "Sharing" : "Общий доступ",
     "A file or folder has been <strong>shared</strong>" : "<strong>Опубликован</strong> файл или каталог",
     "A file or folder was shared from <strong>another server</strong>" : "Файлом или каталогом поделились с <strong>удаленного сервера</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Общий файл или каталог был <strong>скачан</strong>",
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s поделился с вами %1$s",
     "You shared %1$s via link" : "Вы поделились %1$s с помощью ссылки",
     "Shares" : "События обмена файлами",
+    "Accept" : "Принять",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ, смотрите %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Поделитесь со мной через мой #ownCloud ID в объединении облачных хранилищ",
     "This share is password-protected" : "Общий ресурс защищен паролем",
@@ -64,7 +65,6 @@
     "Federated Cloud" : "Объединение облачных хранилищ",
     "Your Federated Cloud ID:" : "Ваш ID в объединении облачных хранилищ:",
     "Share it:" : "Поделись этим:",
-    "Add it to your website:" : "Добавь это на свой сайт:",
     "Share with me via ownCloud" : "Поделитесь мной через ownCloud",
     "HTML Code:" : "HTML код:"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
diff --git a/apps/files_sharing/l10n/si_LK.js b/apps/files_sharing/l10n/si_LK.js
index 06b8b5e3fa..d7e57fbb2e 100644
--- a/apps/files_sharing/l10n/si_LK.js
+++ b/apps/files_sharing/l10n/si_LK.js
@@ -2,7 +2,7 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "එපා",
-    "Share" : "බෙදා හදා ගන්න",
+    "Sharing" : "හුවමාරු කිරීම",
     "A file or folder has been <strong>shared</strong>" : "ගොනුවක් හෝ ෆෝල්ඩරයක් <strong>හවුල්</strong> වී ඇත",
     "Password" : "මුර පදය",
     "Name" : "නම",
diff --git a/apps/files_sharing/l10n/si_LK.json b/apps/files_sharing/l10n/si_LK.json
index be4be8f1a7..ff94883c51 100644
--- a/apps/files_sharing/l10n/si_LK.json
+++ b/apps/files_sharing/l10n/si_LK.json
@@ -1,6 +1,6 @@
 { "translations": {
     "Cancel" : "එපා",
-    "Share" : "බෙදා හදා ගන්න",
+    "Sharing" : "හුවමාරු කිරීම",
     "A file or folder has been <strong>shared</strong>" : "ගොනුවක් හෝ ෆෝල්ඩරයක් <strong>හවුල්</strong> වී ඇත",
     "Password" : "මුර පදය",
     "Name" : "නම",
diff --git a/apps/files_sharing/l10n/sk.js b/apps/files_sharing/l10n/sk.js
deleted file mode 100644
index aa38585149..0000000000
--- a/apps/files_sharing/l10n/sk.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "files_sharing",
-    {
-    "Cancel" : "Zrušiť",
-    "Download" : "Stiahnuť"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_sharing/l10n/sk.json b/apps/files_sharing/l10n/sk.json
deleted file mode 100644
index 65bbffa419..0000000000
--- a/apps/files_sharing/l10n/sk.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Cancel" : "Zrušiť",
-    "Download" : "Stiahnuť"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js
index 897b0ae624..677b4f24e2 100644
--- a/apps/files_sharing/l10n/sk_SK.js
+++ b/apps/files_sharing/l10n/sk_SK.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Môžete nahrávať do tohto priečinka",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nebola nájdená inštalácia ownCloudu (7 alebo vyššia) {remote}",
     "Invalid ownCloud url" : "Chybná ownCloud url",
-    "Share" : "Zdieľať",
     "Shared by" : "Zdieľa",
+    "Sharing" : "Zdieľanie",
     "A file or folder has been <strong>shared</strong>" : "Súbor alebo priečinok bol <strong>zdieľaný</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Súbor alebo priečinok bol vyzdieľaný z <strong>iného servera</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Verejne zdieľaný súbor alebo priečinok bol <strong>stiahnutý</strong>",
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s",
     "You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu",
     "Shares" : "Zdieľanie",
+    "Accept" : "Schváliť",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Toto zdieľanie je chránené heslom",
@@ -65,7 +66,6 @@ OC.L10N.register(
     "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov",
     "Your Federated Cloud ID:" : "Vaše združené Cloud ID",
     "Share it:" : "Zdieľať:",
-    "Add it to your website:" : "Pridať na svoju webstránku:",
     "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud",
     "HTML Code:" : "HTML kód:"
 },
diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json
index f7f7217469..f4f6cc3798 100644
--- a/apps/files_sharing/l10n/sk_SK.json
+++ b/apps/files_sharing/l10n/sk_SK.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Môžete nahrávať do tohto priečinka",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nebola nájdená inštalácia ownCloudu (7 alebo vyššia) {remote}",
     "Invalid ownCloud url" : "Chybná ownCloud url",
-    "Share" : "Zdieľať",
     "Shared by" : "Zdieľa",
+    "Sharing" : "Zdieľanie",
     "A file or folder has been <strong>shared</strong>" : "Súbor alebo priečinok bol <strong>zdieľaný</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Súbor alebo priečinok bol vyzdieľaný z <strong>iného servera</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Verejne zdieľaný súbor alebo priečinok bol <strong>stiahnutý</strong>",
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s vám zdieľal %1$s",
     "You shared %1$s via link" : "Zdieľate %1$s prostredníctvom odkazu",
     "Shares" : "Zdieľanie",
+    "Accept" : "Schváliť",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID, viac n %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "Zdieľajte so mnou pomocou môjho #ownCloud Federated Cloud ID",
     "This share is password-protected" : "Toto zdieľanie je chránené heslom",
@@ -63,7 +64,6 @@
     "Allow users on this server to receive shares from other servers" : "Povoliť používateľom z tohoto servera prijímať zdieľania z iných serverov",
     "Your Federated Cloud ID:" : "Vaše združené Cloud ID",
     "Share it:" : "Zdieľať:",
-    "Add it to your website:" : "Pridať na svoju webstránku:",
     "Share with me via ownCloud" : "Zdieľané so mnou cez ownCloud",
     "HTML Code:" : "HTML kód:"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js
index be6c0bd93f..3b6622aedf 100644
--- a/apps/files_sharing/l10n/sl.js
+++ b/apps/files_sharing/l10n/sl.js
@@ -23,8 +23,8 @@ OC.L10N.register(
     "Add remote share" : "Dodaj oddaljeno mesto za souporabo",
     "No ownCloud installation (7 or higher) found at {remote}" : "Na mestu {remote} ni nameščenega okolja ownCloud (različice 7 ali višje)",
     "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud",
-    "Share" : "Souporaba",
     "Shared by" : "V souporabi z",
+    "Sharing" : "Souporaba",
     "A file or folder has been <strong>shared</strong>" : "Za datoteko ali mapo je odobrena <strong>souporaba</strong>.",
     "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je odobrena.",
     "A public shared file or folder was <strong>downloaded</strong>" : "Mapa ali datoteka v souporabi je bila <strong>prejeta</strong>.",
@@ -39,6 +39,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s",
     "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave",
     "Shares" : "Souporaba",
+    "Accept" : "Sprejmi",
     "This share is password-protected" : "To mesto je zaščiteno z geslom.",
     "The password is wrong. Try again." : "Geslo je napačno. Poskusite znova.",
     "Password" : "Geslo",
diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json
index e4ec892d76..2d443de13d 100644
--- a/apps/files_sharing/l10n/sl.json
+++ b/apps/files_sharing/l10n/sl.json
@@ -21,8 +21,8 @@
     "Add remote share" : "Dodaj oddaljeno mesto za souporabo",
     "No ownCloud installation (7 or higher) found at {remote}" : "Na mestu {remote} ni nameščenega okolja ownCloud (različice 7 ali višje)",
     "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud",
-    "Share" : "Souporaba",
     "Shared by" : "V souporabi z",
+    "Sharing" : "Souporaba",
     "A file or folder has been <strong>shared</strong>" : "Za datoteko ali mapo je odobrena <strong>souporaba</strong>.",
     "A file or folder was shared from <strong>another server</strong>" : "Souporaba datoteke ali mape <strong>z drugega strežnika</strong> je odobrena.",
     "A public shared file or folder was <strong>downloaded</strong>" : "Mapa ali datoteka v souporabi je bila <strong>prejeta</strong>.",
@@ -37,6 +37,7 @@
     "%2$s shared %1$s with you" : "Uporabnik %2$s je omogočil souporabo %1$s",
     "You shared %1$s via link" : "Omogočili ste souporabo %1$s preko povezave",
     "Shares" : "Souporaba",
+    "Accept" : "Sprejmi",
     "This share is password-protected" : "To mesto je zaščiteno z geslom.",
     "The password is wrong. Try again." : "Geslo je napačno. Poskusite znova.",
     "Password" : "Geslo",
diff --git a/apps/files_sharing/l10n/sq.js b/apps/files_sharing/l10n/sq.js
index a4a4777f47..c5933a0fa5 100644
--- a/apps/files_sharing/l10n/sq.js
+++ b/apps/files_sharing/l10n/sq.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "Anullo",
-    "Share" : "Ndaj",
     "Shared by" : "Ndarë nga",
+    "Sharing" : "Ndarje",
     "A file or folder has been <strong>shared</strong>" : "Një skedar ose dosje është <strong>ndarë</strong>",
     "You shared %1$s with %2$s" : "Ju ndatë %1$s me %2$s",
     "You shared %1$s with group %2$s" : "Ju ndatë %1$s me grupin %2$s",
diff --git a/apps/files_sharing/l10n/sq.json b/apps/files_sharing/l10n/sq.json
index d6da034148..e7c43d75ac 100644
--- a/apps/files_sharing/l10n/sq.json
+++ b/apps/files_sharing/l10n/sq.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Cancel" : "Anullo",
-    "Share" : "Ndaj",
     "Shared by" : "Ndarë nga",
+    "Sharing" : "Ndarje",
     "A file or folder has been <strong>shared</strong>" : "Një skedar ose dosje është <strong>ndarë</strong>",
     "You shared %1$s with %2$s" : "Ju ndatë %1$s me %2$s",
     "You shared %1$s with group %2$s" : "Ju ndatë %1$s me grupin %2$s",
diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js
index fe36c06b75..ddb15bd218 100644
--- a/apps/files_sharing/l10n/sr.js
+++ b/apps/files_sharing/l10n/sr.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Можете да отпремате у ову фасциклу",
     "No ownCloud installation (7 or higher) found at {remote}" : "Нема оунКлауд инсталације верзије 7 или више на {remote}",
     "Invalid ownCloud url" : "Неисправан оунКлауд УРЛ",
-    "Share" : "Дељење",
     "Shared by" : "Дели",
+    "Sharing" : "Дељење",
     "A file or folder has been <strong>shared</strong>" : "Фајл или фасцикла је <strong>дељен</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Фајл или фасцикла су дељени са <strong>другог сервера</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Јавно дељени фајл или фасцикла су <strong>преузети</strong>",
@@ -40,6 +40,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s подели %1$s са вама",
     "You shared %1$s via link" : "Поделили сте %1$s путем везе",
     "Shares" : "Дељења",
+    "Accept" : "Прихвати",
     "This share is password-protected" : "Дељење је заштићено лозинком",
     "The password is wrong. Try again." : "Лозинка је погрешна. Покушајте поново.",
     "Password" : "Лозинка",
diff --git a/apps/files_sharing/l10n/sr.json b/apps/files_sharing/l10n/sr.json
index 1d7e9b155b..dc44b1fbb6 100644
--- a/apps/files_sharing/l10n/sr.json
+++ b/apps/files_sharing/l10n/sr.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Можете да отпремате у ову фасциклу",
     "No ownCloud installation (7 or higher) found at {remote}" : "Нема оунКлауд инсталације верзије 7 или више на {remote}",
     "Invalid ownCloud url" : "Неисправан оунКлауд УРЛ",
-    "Share" : "Дељење",
     "Shared by" : "Дели",
+    "Sharing" : "Дељење",
     "A file or folder has been <strong>shared</strong>" : "Фајл или фасцикла је <strong>дељен</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Фајл или фасцикла су дељени са <strong>другог сервера</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Јавно дељени фајл или фасцикла су <strong>преузети</strong>",
@@ -38,6 +38,7 @@
     "%2$s shared %1$s with you" : "%2$s подели %1$s са вама",
     "You shared %1$s via link" : "Поделили сте %1$s путем везе",
     "Shares" : "Дељења",
+    "Accept" : "Прихвати",
     "This share is password-protected" : "Дељење је заштићено лозинком",
     "The password is wrong. Try again." : "Лозинка је погрешна. Покушајте поново.",
     "Password" : "Лозинка",
diff --git a/apps/files_sharing/l10n/sr@latin.js b/apps/files_sharing/l10n/sr@latin.js
index 0f77ea6cc3..32f2b29885 100644
--- a/apps/files_sharing/l10n/sr@latin.js
+++ b/apps/files_sharing/l10n/sr@latin.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "Add remote share" : "Dodaj udaljeni deljeni resurs",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nije pronađena ownCloud instalacija (7 ili noviji) na {remote}",
     "Invalid ownCloud url" : "Neispravan ownCloud url",
-    "Share" : "Podeli",
     "Shared by" : "Deljeno od strane",
     "A file or folder has been <strong>shared</strong>" : "Fijl ili direktorijum je <strong>podeljen</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Fajl ili direktorijum je deljen sa <strong>drugog servera</strong>",
diff --git a/apps/files_sharing/l10n/sr@latin.json b/apps/files_sharing/l10n/sr@latin.json
index c7ffa922bd..aae286962f 100644
--- a/apps/files_sharing/l10n/sr@latin.json
+++ b/apps/files_sharing/l10n/sr@latin.json
@@ -19,7 +19,6 @@
     "Add remote share" : "Dodaj udaljeni deljeni resurs",
     "No ownCloud installation (7 or higher) found at {remote}" : "Nije pronađena ownCloud instalacija (7 ili noviji) na {remote}",
     "Invalid ownCloud url" : "Neispravan ownCloud url",
-    "Share" : "Podeli",
     "Shared by" : "Deljeno od strane",
     "A file or folder has been <strong>shared</strong>" : "Fijl ili direktorijum je <strong>podeljen</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Fajl ili direktorijum je deljen sa <strong>drugog servera</strong>",
diff --git a/apps/files_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js
index 94224aa1c0..9b1d9ccb59 100644
--- a/apps/files_sharing/l10n/sv.js
+++ b/apps/files_sharing/l10n/sv.js
@@ -20,8 +20,8 @@ OC.L10N.register(
     "Cancel" : "Avbryt",
     "Add remote share" : "Lägg till fjärrdelning",
     "Invalid ownCloud url" : "Felaktig ownCloud url",
-    "Share" : "Dela",
     "Shared by" : "Delad av",
+    "Sharing" : "Dela",
     "A file or folder has been <strong>shared</strong>" : "En fil eller mapp har <strong>delats</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "En fil eller mapp delades från <strong>en annan server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "En publikt delad fil eller mapp blev <strong>nerladdad</strong>",
@@ -36,6 +36,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
     "You shared %1$s via link" : "Du delade %1$s via länk",
     "Shares" : "Delningar",
+    "Accept" : "Acceptera",
     "This share is password-protected" : "Den här delningen är lösenordsskyddad",
     "The password is wrong. Try again." : "Lösenordet är fel. Försök igen.",
     "Password" : "Lösenord",
diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json
index 9b2dd8f9f6..0d13069dfb 100644
--- a/apps/files_sharing/l10n/sv.json
+++ b/apps/files_sharing/l10n/sv.json
@@ -18,8 +18,8 @@
     "Cancel" : "Avbryt",
     "Add remote share" : "Lägg till fjärrdelning",
     "Invalid ownCloud url" : "Felaktig ownCloud url",
-    "Share" : "Dela",
     "Shared by" : "Delad av",
+    "Sharing" : "Dela",
     "A file or folder has been <strong>shared</strong>" : "En fil eller mapp har <strong>delats</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "En fil eller mapp delades från <strong>en annan server</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "En publikt delad fil eller mapp blev <strong>nerladdad</strong>",
@@ -34,6 +34,7 @@
     "%2$s shared %1$s with you" : "%2$s delade %1$s med dig",
     "You shared %1$s via link" : "Du delade %1$s via länk",
     "Shares" : "Delningar",
+    "Accept" : "Acceptera",
     "This share is password-protected" : "Den här delningen är lösenordsskyddad",
     "The password is wrong. Try again." : "Lösenordet är fel. Försök igen.",
     "Password" : "Lösenord",
diff --git a/apps/files_sharing/l10n/ta_LK.js b/apps/files_sharing/l10n/ta_LK.js
index d81565a3f6..846ed1b4f8 100644
--- a/apps/files_sharing/l10n/ta_LK.js
+++ b/apps/files_sharing/l10n/ta_LK.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "இரத்து செய்க",
-    "Share" : "பகிர்வு",
     "Password" : "கடவுச்சொல்",
     "Name" : "பெயர்",
     "Download" : "பதிவிறக்குக"
diff --git a/apps/files_sharing/l10n/ta_LK.json b/apps/files_sharing/l10n/ta_LK.json
index 4d2bfd332b..8e722a9388 100644
--- a/apps/files_sharing/l10n/ta_LK.json
+++ b/apps/files_sharing/l10n/ta_LK.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "இரத்து செய்க",
-    "Share" : "பகிர்வு",
     "Password" : "கடவுச்சொல்",
     "Name" : "பெயர்",
     "Download" : "பதிவிறக்குக"
diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js
index 3314dcdb9f..9db7c60010 100644
--- a/apps/files_sharing/l10n/th_TH.js
+++ b/apps/files_sharing/l10n/th_TH.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "คุณสามารถอัพโหลดลงในโฟลเดอร์นี้",
     "No ownCloud installation (7 or higher) found at {remote}" : "ไม่มีการติดตั้ง ownCloud (7 หรือสูงกว่า) พบได้ที่ {remote}",
     "Invalid ownCloud url" : "URL ownCloud ไม่ถูกต้อง",
-    "Share" : "แชร์",
     "Shared by" : "ถูกแชร์โดย",
+    "Sharing" : "การแชร์ข้อมูล",
     "A file or folder has been <strong>shared</strong>" : "ไฟล์หรือโฟลเดอร์ได้ถูก <strong>แชร์</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "ไฟล์หรือโฟลเดอร์จะถูกแชร์จาก <strong>เซิร์ฟเวอร์อื่นๆ</ strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "แชร์ไฟล์หรือโฟลเดอร์สาธารณะถูก <strong>ดาวน์โหลด</strong>",
@@ -41,6 +41,9 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
+    "You received %s as a remote share from %s" : "คุณได้รับ %s โดยรีโมทแชร์จาก %s",
+    "Accept" : "ยอมรับ",
+    "Decline" : "ลดลง",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ",
     "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน",
@@ -66,7 +69,7 @@ OC.L10N.register(
     "Federated Cloud" : "สหพันธ์คลาวด์",
     "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:",
     "Share it:" : "แชร์มัน:",
-    "Add it to your website:" : "เพิ่มไปยังเว็บไซต์ของคุณ:",
+    "Add to your website" : "เพิ่มไปยังเว็บไซต์",
     "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud",
     "HTML Code:" : "โค้ด HTML:"
 },
diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json
index fc9189e1c7..f630c06264 100644
--- a/apps/files_sharing/l10n/th_TH.json
+++ b/apps/files_sharing/l10n/th_TH.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "คุณสามารถอัพโหลดลงในโฟลเดอร์นี้",
     "No ownCloud installation (7 or higher) found at {remote}" : "ไม่มีการติดตั้ง ownCloud (7 หรือสูงกว่า) พบได้ที่ {remote}",
     "Invalid ownCloud url" : "URL ownCloud ไม่ถูกต้อง",
-    "Share" : "แชร์",
     "Shared by" : "ถูกแชร์โดย",
+    "Sharing" : "การแชร์ข้อมูล",
     "A file or folder has been <strong>shared</strong>" : "ไฟล์หรือโฟลเดอร์ได้ถูก <strong>แชร์</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "ไฟล์หรือโฟลเดอร์จะถูกแชร์จาก <strong>เซิร์ฟเวอร์อื่นๆ</ strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "แชร์ไฟล์หรือโฟลเดอร์สาธารณะถูก <strong>ดาวน์โหลด</strong>",
@@ -39,6 +39,9 @@
     "%2$s shared %1$s with you" : "%2$s ถูกแชร์ %1$s กับคุณ",
     "You shared %1$s via link" : "คุณแชร์ %1$s ผ่านลิงค์",
     "Shares" : "แชร์",
+    "You received %s as a remote share from %s" : "คุณได้รับ %s โดยรีโมทแชร์จาก %s",
+    "Accept" : "ยอมรับ",
+    "Decline" : "ลดลง",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ สามารถดูได้ที่ %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "แชร์ร่วมกับฉันผ่าน #ownCloud ด้วยไอดีคลาวด์ในเครือ",
     "This share is password-protected" : "นี้แชร์การป้องกันด้วยรหัสผ่าน",
@@ -64,7 +67,7 @@
     "Federated Cloud" : "สหพันธ์คลาวด์",
     "Your Federated Cloud ID:" : "ไอดีคลาวด์ของคุณ:",
     "Share it:" : "แชร์มัน:",
-    "Add it to your website:" : "เพิ่มไปยังเว็บไซต์ของคุณ:",
+    "Add to your website" : "เพิ่มไปยังเว็บไซต์",
     "Share with me via ownCloud" : "แชร์ร่วมกับฉันผ่าน ownCloud",
     "HTML Code:" : "โค้ด HTML:"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
index 12a85f732b..bb00dd4295 100644
--- a/apps/files_sharing/l10n/tr.js
+++ b/apps/files_sharing/l10n/tr.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Bu dizine yükleme yapabilirsiniz",
     "No ownCloud installation (7 or higher) found at {remote}" : "{remote} üzerinde ownCloud (7 veya daha üstü) kurulumu bulunamadı",
     "Invalid ownCloud url" : "Geçersiz ownCloud adresi",
-    "Share" : "Paylaş",
     "Shared by" : "Paylaşan",
+    "Sharing" : "Paylaşım",
     "A file or folder has been <strong>shared</strong>" : "Bir dosya veya klasör <strong>paylaşıldı</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "<strong>Başka sunucudan</strong> bir dosya veya klasör paylaşıldı",
     "A public shared file or folder was <strong>downloaded</strong>" : "Herkese açık paylaşılan bir dosya veya klasör <strong>indirildi</strong>",
@@ -41,6 +41,7 @@ OC.L10N.register(
     "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı",
     "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız",
     "Shares" : "Paylaşımlar",
+    "Accept" : "Kabul et",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı",
     "This share is password-protected" : "Bu paylaşım parola korumalı",
@@ -66,7 +67,6 @@ OC.L10N.register(
     "Federated Cloud" : "Birleşmiş Bulut",
     "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:",
     "Share it:" : "Paylaşın:",
-    "Add it to your website:" : "Web sitenize ekleyin:",
     "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı",
     "HTML Code:" : "HTML Kodu:"
 },
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
index c6f23ef077..1371bf3744 100644
--- a/apps/files_sharing/l10n/tr.json
+++ b/apps/files_sharing/l10n/tr.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Bu dizine yükleme yapabilirsiniz",
     "No ownCloud installation (7 or higher) found at {remote}" : "{remote} üzerinde ownCloud (7 veya daha üstü) kurulumu bulunamadı",
     "Invalid ownCloud url" : "Geçersiz ownCloud adresi",
-    "Share" : "Paylaş",
     "Shared by" : "Paylaşan",
+    "Sharing" : "Paylaşım",
     "A file or folder has been <strong>shared</strong>" : "Bir dosya veya klasör <strong>paylaşıldı</strong>",
     "A file or folder was shared from <strong>another server</strong>" : "<strong>Başka sunucudan</strong> bir dosya veya klasör paylaşıldı",
     "A public shared file or folder was <strong>downloaded</strong>" : "Herkese açık paylaşılan bir dosya veya klasör <strong>indirildi</strong>",
@@ -39,6 +39,7 @@
     "%2$s shared %1$s with you" : "%2$s sizinle %1$s dosyasını paylaştı",
     "You shared %1$s via link" : "Bağlantı ile %1$s paylaşımını yaptınız",
     "Shares" : "Paylaşımlar",
+    "Accept" : "Kabul et",
     "Share with me through my #ownCloud Federated Cloud ID, see %s" : "#ownCloud Birleşik Bulut kimliğim ile paylaşıldı, bkz %s",
     "Share with me through my #ownCloud Federated Cloud ID" : "#ownCloud Birleşmiş Bulut kimliğim ile paylaşıldı",
     "This share is password-protected" : "Bu paylaşım parola korumalı",
@@ -64,7 +65,6 @@
     "Federated Cloud" : "Birleşmiş Bulut",
     "Your Federated Cloud ID:" : "Birleşmiş Bulut Kimliğiniz:",
     "Share it:" : "Paylaşın:",
-    "Add it to your website:" : "Web sitenize ekleyin:",
     "Share with me via ownCloud" : "Benimle ownCloud aracılığıyla paylaşıldı",
     "HTML Code:" : "HTML Kodu:"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
diff --git a/apps/files_sharing/l10n/ug.js b/apps/files_sharing/l10n/ug.js
index 4a9b698aa0..983bb3cc70 100644
--- a/apps/files_sharing/l10n/ug.js
+++ b/apps/files_sharing/l10n/ug.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "ۋاز كەچ",
-    "Share" : "ھەمبەھىر",
     "Shared by" : "ھەمبەھىرلىگۈچى",
+    "Sharing" : "ھەمبەھىر",
     "Password" : "ئىم",
     "Name" : "ئاتى",
     "Download" : "چۈشۈر"
diff --git a/apps/files_sharing/l10n/ug.json b/apps/files_sharing/l10n/ug.json
index a4253e61d0..63991ebcfc 100644
--- a/apps/files_sharing/l10n/ug.json
+++ b/apps/files_sharing/l10n/ug.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Cancel" : "ۋاز كەچ",
-    "Share" : "ھەمبەھىر",
     "Shared by" : "ھەمبەھىرلىگۈچى",
+    "Sharing" : "ھەمبەھىر",
     "Password" : "ئىم",
     "Name" : "ئاتى",
     "Download" : "چۈشۈر"
diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js
index 76e9b88525..80c28c8a93 100644
--- a/apps/files_sharing/l10n/uk.js
+++ b/apps/files_sharing/l10n/uk.js
@@ -24,8 +24,8 @@ OC.L10N.register(
     "You can upload into this folder" : "Ви можете завантажити до цієї теки",
     "No ownCloud installation (7 or higher) found at {remote}" : "Немає установленого OwnCloud (7 або вище), можна знайти на {remote}",
     "Invalid ownCloud url" : "Невірний ownCloud URL",
-    "Share" : "Поділитися",
     "Shared by" : "Опубліковано",
+    "Sharing" : "Спільний доступ",
     "A file or folder has been <strong>shared</strong>" : "Файл або теку було відкрито для <strong> спільного користування </strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Файл або каталог був опублікований <strong>з іншого сервера</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Опублікований файл або каталог  був <strong>завантажений</strong>",
@@ -61,7 +61,6 @@ OC.L10N.register(
     "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах",
     "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів",
     "Share it:" : "Поділитися цим:",
-    "Add it to your website:" : "Додати до вашого сайту:",
     "HTML Code:" : "HTML код:"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_sharing/l10n/uk.json b/apps/files_sharing/l10n/uk.json
index 74cccc1901..0b5de75ac5 100644
--- a/apps/files_sharing/l10n/uk.json
+++ b/apps/files_sharing/l10n/uk.json
@@ -22,8 +22,8 @@
     "You can upload into this folder" : "Ви можете завантажити до цієї теки",
     "No ownCloud installation (7 or higher) found at {remote}" : "Немає установленого OwnCloud (7 або вище), можна знайти на {remote}",
     "Invalid ownCloud url" : "Невірний ownCloud URL",
-    "Share" : "Поділитися",
     "Shared by" : "Опубліковано",
+    "Sharing" : "Спільний доступ",
     "A file or folder has been <strong>shared</strong>" : "Файл або теку було відкрито для <strong> спільного користування </strong>",
     "A file or folder was shared from <strong>another server</strong>" : "Файл або каталог був опублікований <strong>з іншого сервера</strong>",
     "A public shared file or folder was <strong>downloaded</strong>" : "Опублікований файл або каталог  був <strong>завантажений</strong>",
@@ -59,7 +59,6 @@
     "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах",
     "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів",
     "Share it:" : "Поділитися цим:",
-    "Add it to your website:" : "Додати до вашого сайту:",
     "HTML Code:" : "HTML код:"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ur_PK.js b/apps/files_sharing/l10n/ur_PK.js
index ad802fe8ea..2e9b145d78 100644
--- a/apps/files_sharing/l10n/ur_PK.js
+++ b/apps/files_sharing/l10n/ur_PK.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "منسوخ کریں",
-    "Share" : "اشتراک",
     "Shared by" : "سے اشتراک شدہ",
     "Password" : "پاسورڈ",
     "Name" : "اسم",
diff --git a/apps/files_sharing/l10n/ur_PK.json b/apps/files_sharing/l10n/ur_PK.json
index 5431e0a2fa..b0ac6d244b 100644
--- a/apps/files_sharing/l10n/ur_PK.json
+++ b/apps/files_sharing/l10n/ur_PK.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Cancel" : "منسوخ کریں",
-    "Share" : "اشتراک",
     "Shared by" : "سے اشتراک شدہ",
     "Password" : "پاسورڈ",
     "Name" : "اسم",
diff --git a/apps/files_sharing/l10n/vi.js b/apps/files_sharing/l10n/vi.js
index a96969df22..2be9b19302 100644
--- a/apps/files_sharing/l10n/vi.js
+++ b/apps/files_sharing/l10n/vi.js
@@ -12,8 +12,8 @@ OC.L10N.register(
     "Files and folders you share will show up here" : "Tập tin và thư mục bạn chia sẻ sẽ được hiển thị tại đây.",
     "No shared links" : "Chưa có liên kết chia sẻ",
     "Cancel" : "Hủy",
-    "Share" : "Chia sẻ",
     "Shared by" : "Chia sẻ bởi",
+    "Sharing" : "Chia sẻ",
     "Shares" : "Chia sẻ",
     "The password is wrong. Try again." : "Mật khẩu sai. Xin hãy thử lại.",
     "Password" : "Mật khẩu",
diff --git a/apps/files_sharing/l10n/vi.json b/apps/files_sharing/l10n/vi.json
index a53d3c9e38..978c916cbb 100644
--- a/apps/files_sharing/l10n/vi.json
+++ b/apps/files_sharing/l10n/vi.json
@@ -10,8 +10,8 @@
     "Files and folders you share will show up here" : "Tập tin và thư mục bạn chia sẻ sẽ được hiển thị tại đây.",
     "No shared links" : "Chưa có liên kết chia sẻ",
     "Cancel" : "Hủy",
-    "Share" : "Chia sẻ",
     "Shared by" : "Chia sẻ bởi",
+    "Sharing" : "Chia sẻ",
     "Shares" : "Chia sẻ",
     "The password is wrong. Try again." : "Mật khẩu sai. Xin hãy thử lại.",
     "Password" : "Mật khẩu",
diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js
index f3bbbbcfcb..c62e6a4762 100644
--- a/apps/files_sharing/l10n/zh_CN.js
+++ b/apps/files_sharing/l10n/zh_CN.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "files_sharing",
     {
     "Server to server sharing is not enabled on this server" : "此服务器未启用服务器到服务器分享功能",
+    "Invalid or untrusted SSL certificate" : "不合法或是不被信任的 SSL 证书",
     "Couldn't add remote share" : "无法添加远程分享",
     "Shared with you" : "分享给您的文件",
     "Shared with others" : "您分享的文件",
@@ -11,10 +12,13 @@ OC.L10N.register(
     "Remote share password" : "远程分享密码",
     "Cancel" : "取消",
     "Add remote share" : "添加远程分享",
+    "You can upload into this folder" : "您可以上传文件至此文件夹",
+    "No ownCloud installation (7 or higher) found at {remote}" : "未发现 {remote} 安装有ownCloud (7 或更高版本)",
     "Invalid ownCloud url" : "无效的 ownCloud 网址",
-    "Share" : "共享",
     "Shared by" : "共享人",
+    "Sharing" : "共享",
     "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。",
+    "You received a new remote share from %s" : "您从%s收到了新的远程分享",
     "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s",
     "You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组",
     "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您",
@@ -37,6 +41,9 @@ OC.L10N.register(
     "Download %s" : "下载 %s",
     "Direct link" : "直接链接",
     "Federated Cloud Sharing" : "联合云共享",
-    "Open documentation" : "打开文档"
+    "Open documentation" : "打开文档",
+    "Allow users on this server to send shares to other servers" : "允许用户分享文件给其他服务器上的用户",
+    "Allow users on this server to receive shares from other servers" : "允许用户从其他服务器接收分享",
+    "HTML Code:" : "HTML 代码:"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json
index a8b4d45a62..5496d90bea 100644
--- a/apps/files_sharing/l10n/zh_CN.json
+++ b/apps/files_sharing/l10n/zh_CN.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Server to server sharing is not enabled on this server" : "此服务器未启用服务器到服务器分享功能",
+    "Invalid or untrusted SSL certificate" : "不合法或是不被信任的 SSL 证书",
     "Couldn't add remote share" : "无法添加远程分享",
     "Shared with you" : "分享给您的文件",
     "Shared with others" : "您分享的文件",
@@ -9,10 +10,13 @@
     "Remote share password" : "远程分享密码",
     "Cancel" : "取消",
     "Add remote share" : "添加远程分享",
+    "You can upload into this folder" : "您可以上传文件至此文件夹",
+    "No ownCloud installation (7 or higher) found at {remote}" : "未发现 {remote} 安装有ownCloud (7 或更高版本)",
     "Invalid ownCloud url" : "无效的 ownCloud 网址",
-    "Share" : "共享",
     "Shared by" : "共享人",
+    "Sharing" : "共享",
     "A file or folder has been <strong>shared</strong>" : "一个文件或文件夹已<strong>共享</strong>。",
+    "You received a new remote share from %s" : "您从%s收到了新的远程分享",
     "You shared %1$s with %2$s" : "您把 %1$s分享给了 %2$s",
     "You shared %1$s with group %2$s" : "你把 %1$s 分享给了 %2$s 组",
     "%2$s shared %1$s with you" : "%2$s 把 %1$s 分享给了您",
@@ -35,6 +39,9 @@
     "Download %s" : "下载 %s",
     "Direct link" : "直接链接",
     "Federated Cloud Sharing" : "联合云共享",
-    "Open documentation" : "打开文档"
+    "Open documentation" : "打开文档",
+    "Allow users on this server to send shares to other servers" : "允许用户分享文件给其他服务器上的用户",
+    "Allow users on this server to receive shares from other servers" : "允许用户从其他服务器接收分享",
+    "HTML Code:" : "HTML 代码:"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/zh_HK.js b/apps/files_sharing/l10n/zh_HK.js
index e840f92c42..b2fee180ba 100644
--- a/apps/files_sharing/l10n/zh_HK.js
+++ b/apps/files_sharing/l10n/zh_HK.js
@@ -2,7 +2,7 @@ OC.L10N.register(
     "files_sharing",
     {
     "Cancel" : "取消",
-    "Share" : "分享",
+    "Sharing" : "分享",
     "A file or folder has been <strong>shared</strong>" : "檔案或資料夾已被<strong>分享</strong>",
     "You shared %1$s with %2$s" : "你分享了 %1$s 給 %2$s",
     "Shares" : "分享",
diff --git a/apps/files_sharing/l10n/zh_HK.json b/apps/files_sharing/l10n/zh_HK.json
index 9e283b58ba..35e832e76f 100644
--- a/apps/files_sharing/l10n/zh_HK.json
+++ b/apps/files_sharing/l10n/zh_HK.json
@@ -1,6 +1,6 @@
 { "translations": {
     "Cancel" : "取消",
-    "Share" : "分享",
+    "Sharing" : "分享",
     "A file or folder has been <strong>shared</strong>" : "檔案或資料夾已被<strong>分享</strong>",
     "You shared %1$s with %2$s" : "你分享了 %1$s 給 %2$s",
     "Shares" : "分享",
diff --git a/apps/files_sharing/l10n/zh_TW.js b/apps/files_sharing/l10n/zh_TW.js
index 44231e17bc..a5f97c9209 100644
--- a/apps/files_sharing/l10n/zh_TW.js
+++ b/apps/files_sharing/l10n/zh_TW.js
@@ -12,8 +12,8 @@ OC.L10N.register(
     "Cancel" : "取消",
     "Add remote share" : "加入遠端分享",
     "Invalid ownCloud url" : "無效的 ownCloud URL",
-    "Share" : "分享",
     "Shared by" : "由...分享",
+    "Sharing" : "分享",
     "A file or folder has been <strong>shared</strong>" : "檔案或目錄已被 <strong>分享</strong>",
     "You shared %1$s with %2$s" : "您與 %2$s 分享了 %1$s",
     "You shared %1$s with group %2$s" : "您與 %2$s 群組分享了 %1$s",
@@ -23,6 +23,7 @@ OC.L10N.register(
     "This share is password-protected" : "這個分享有密碼保護",
     "The password is wrong. Try again." : "請檢查您的密碼並再試一次",
     "Password" : "密碼",
+    "No entries found in this folder" : "在此資料夾中沒有任何項目",
     "Name" : "名稱",
     "Share time" : "分享時間",
     "Sorry, this link doesn’t seem to work anymore." : "抱歉，此連結已經失效",
diff --git a/apps/files_sharing/l10n/zh_TW.json b/apps/files_sharing/l10n/zh_TW.json
index 4be6f0f10f..67150e495b 100644
--- a/apps/files_sharing/l10n/zh_TW.json
+++ b/apps/files_sharing/l10n/zh_TW.json
@@ -10,8 +10,8 @@
     "Cancel" : "取消",
     "Add remote share" : "加入遠端分享",
     "Invalid ownCloud url" : "無效的 ownCloud URL",
-    "Share" : "分享",
     "Shared by" : "由...分享",
+    "Sharing" : "分享",
     "A file or folder has been <strong>shared</strong>" : "檔案或目錄已被 <strong>分享</strong>",
     "You shared %1$s with %2$s" : "您與 %2$s 分享了 %1$s",
     "You shared %1$s with group %2$s" : "您與 %2$s 群組分享了 %1$s",
@@ -21,6 +21,7 @@
     "This share is password-protected" : "這個分享有密碼保護",
     "The password is wrong. Try again." : "請檢查您的密碼並再試一次",
     "Password" : "密碼",
+    "No entries found in this folder" : "在此資料夾中沒有任何項目",
     "Name" : "名稱",
     "Share time" : "分享時間",
     "Sorry, this link doesn’t seem to work anymore." : "抱歉，此連結已經失效",
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index c25dc92409..377c9f0225 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -47,6 +47,7 @@ class Shared_Cache extends Cache {
 	 * @param \OC\Files\Storage\Shared $storage
 	 */
 	public function __construct($storage) {
+		parent::__construct($storage);
 		$this->storage = $storage;
 	}
 
@@ -94,6 +95,7 @@ class Shared_Cache extends Cache {
 	 * @return array|false
 	 */
 	public function get($file) {
+		$mimetypeLoader = \OC::$server->getMimeTypeLoader();
 		if (is_string($file)) {
 			$cache = $this->getSourceCache($file);
 			if ($cache) {
@@ -130,8 +132,8 @@ class Shared_Cache extends Cache {
 			$data['mtime'] = (int)$data['mtime'];
 			$data['storage_mtime'] = (int)$data['storage_mtime'];
 			$data['encrypted'] = (bool)$data['encrypted'];
-			$data['mimetype'] = $this->getMimetype($data['mimetype']);
-			$data['mimepart'] = $this->getMimetype($data['mimepart']);
+			$data['mimetype'] = $mimetypeLoader->getMimetypeById($data['mimetype']);
+			$data['mimepart'] = $mimetypeLoader->getMimetypeById($data['mimepart']);
 			if ($data['storage_mtime'] === 0) {
 				$data['storage_mtime'] = $data['mtime'];
 			}
diff --git a/apps/files_sharing/lib/controllers/externalsharescontroller.php b/apps/files_sharing/lib/controllers/externalsharescontroller.php
index 494a544b2b..6eb9d3c13d 100644
--- a/apps/files_sharing/lib/controllers/externalsharescontroller.php
+++ b/apps/files_sharing/lib/controllers/externalsharescontroller.php
@@ -23,11 +23,11 @@
 
 namespace OCA\Files_Sharing\Controllers;
 
-use OC;
-use OCP;
 use OCP\AppFramework\Controller;
 use OCP\IRequest;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\Http\Client\IClientService;
+use OCP\AppFramework\Http\DataResponse;
 
 /**
  * Class ExternalSharesController
@@ -40,20 +40,25 @@ class ExternalSharesController extends Controller {
 	private $incomingShareEnabled;
 	/** @var \OCA\Files_Sharing\External\Manager */
 	private $externalManager;
+	/** @var IClientService */
+	private $clientService;
 
 	/**
 	 * @param string $appName
 	 * @param IRequest $request
 	 * @param bool $incomingShareEnabled
 	 * @param \OCA\Files_Sharing\External\Manager $externalManager
+	 * @param IClientService $clientService
 	 */
 	public function __construct($appName,
 								IRequest $request,
 								$incomingShareEnabled,
-								\OCA\Files_Sharing\External\Manager $externalManager) {
+								\OCA\Files_Sharing\External\Manager $externalManager,
+								IClientService $clientService) {
 		parent::__construct($appName, $request);
 		$this->incomingShareEnabled = $incomingShareEnabled;
 		$this->externalManager = $externalManager;
+		$this->clientService = $clientService;
 	}
 
 	/**
@@ -97,4 +102,43 @@ class ExternalSharesController extends Controller {
 		return new JSONResponse();
 	}
 
+	/**
+	 * Test whether the specified remote is accessible
+	 *
+	 * @param string $remote
+	 * @return bool
+	 */
+	protected function testUrl($remote) {
+		try {
+			$client = $this->clientService->newClient();
+			$response = json_decode($client->get(
+				$remote,
+				[
+					'timeout' => 3,
+					'connect_timeout' => 3,
+				]
+			)->getBody());
+
+			return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
+		} catch (\Exception $e) {
+			return false;
+		}
+	}
+
+	/**
+	 * @PublicPage
+	 *
+	 * @param string $remote
+	 * @return DataResponse
+	 */
+	public function testRemote($remote) {
+		if ($this->testUrl('https://' . $remote . '/status.php')) {
+			return new DataResponse('https');
+		} elseif ($this->testUrl('http://' . $remote . '/status.php')) {
+			return new DataResponse('http');
+		} else {
+			return new DataResponse(false);
+		}
+	}
+
 }
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 67a26c096c..17142e9509 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -28,6 +28,7 @@ namespace OCA\Files_Sharing\External;
 
 use OC\Files\Filesystem;
 use OCP\Files;
+use OC\Notification\IManager;
 
 class Manager {
 	const STORAGE = '\OCA\Files_Sharing\External\Storage';
@@ -57,20 +58,27 @@ class Manager {
 	 */
 	private $httpHelper;
 
+	/**
+	 * @var IManager
+	 */
+	private $notificationManager;
+
 	/**
 	 * @param \OCP\IDBConnection $connection
 	 * @param \OC\Files\Mount\Manager $mountManager
 	 * @param \OCP\Files\Storage\IStorageFactory $storageLoader
 	 * @param \OC\HTTPHelper $httpHelper
+	 * @param IManager $notificationManager
 	 * @param string $uid
 	 */
 	public function __construct(\OCP\IDBConnection $connection, \OC\Files\Mount\Manager $mountManager,
-								\OCP\Files\Storage\IStorageFactory $storageLoader, \OC\HTTPHelper $httpHelper, $uid) {
+								\OCP\Files\Storage\IStorageFactory $storageLoader, \OC\HTTPHelper $httpHelper, IManager $notificationManager, $uid) {
 		$this->connection = $connection;
 		$this->mountManager = $mountManager;
 		$this->storageLoader = $storageLoader;
 		$this->httpHelper = $httpHelper;
 		$this->uid = $uid;
+		$this->notificationManager = $notificationManager;
 	}
 
 	/**
@@ -206,6 +214,7 @@ class Manager {
 			$acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid));
 			$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept');
 
+			$this->scrapNotification($share['remote_id']);
 			return true;
 		}
 
@@ -228,12 +237,24 @@ class Manager {
 			$removeShare->execute(array($id, $this->uid));
 			$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'decline');
 
+			$this->scrapNotification($share['remote_id']);
 			return true;
 		}
 
 		return false;
 	}
 
+	/**
+	 * @param int $remoteShare
+	 */
+	protected function scrapNotification($remoteShare) {
+		$filter = $this->notificationManager->createNotification();
+		$filter->setApp('files_sharing')
+			->setUser($this->uid)
+			->setObject('remote_share', (int) $remoteShare);
+		$this->notificationManager->markProcessed($filter);
+	}
+
 	/**
 	 * inform remote server whether server-to-server share was accepted/declined
 	 *
@@ -265,6 +286,7 @@ class Manager {
 				\OC\Files\Filesystem::getMountManager(),
 				\OC\Files\Filesystem::getLoader(),
 				\OC::$server->getHTTPHelper(),
+				\OC::$server->getNotificationManager(),
 				$params['user']
 		);
 
diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php
index dc8d1738b0..270d8b6d1b 100644
--- a/apps/files_sharing/lib/external/storage.php
+++ b/apps/files_sharing/lib/external/storage.php
@@ -88,6 +88,8 @@ class Storage extends DAV implements ISharedStorage {
 			'user' => $options['token'],
 			'password' => (string)$options['password']
 		));
+
+		$this->getWatcher()->setPolicy(\OC\Files\Cache\Watcher::CHECK_ONCE);
 	}
 
 	public function getRemoteUser() {
diff --git a/apps/files_sharing/lib/hooks.php b/apps/files_sharing/lib/hooks.php
index 7dd04f2f4a..1937010f39 100644
--- a/apps/files_sharing/lib/hooks.php
+++ b/apps/files_sharing/lib/hooks.php
@@ -33,6 +33,7 @@ class Hooks {
 			\OC\Files\Filesystem::getMountManager(),
 			\OC\Files\Filesystem::getLoader(),
 			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
 			$params['uid']);
 
 		$manager->removeUserShares($params['uid']);
diff --git a/apps/files_sharing/lib/mountprovider.php b/apps/files_sharing/lib/mountprovider.php
index 3f59fd131d..14a7962599 100644
--- a/apps/files_sharing/lib/mountprovider.php
+++ b/apps/files_sharing/lib/mountprovider.php
@@ -66,12 +66,6 @@ class MountProvider implements IMountProvider {
 			return $share['permissions'] > 0;
 		});
 		$shares = array_map(function ($share) use ($user, $storageFactory) {
-			try {
-				Filesystem::initMountPoints($share['uid_owner']);
-			} catch(NoUserException $e) {
-				\OC::$server->getLogger()->warning('The user \'' . $share['uid_owner'] . '\' of share with ID \'' . $share['id'] . '\' can\'t be retrieved.', array('app' => 'files_sharing'));
-				return null;
-			}
 			// for updating etags for the share owner when we make changes to this share.
 			$ownerPropagator = $this->propagationManager->getChangePropagator($share['uid_owner']);
 
diff --git a/apps/files_sharing/lib/notifier.php b/apps/files_sharing/lib/notifier.php
new file mode 100644
index 0000000000..cc2deb3f43
--- /dev/null
+++ b/apps/files_sharing/lib/notifier.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_Sharing;
+
+
+use OC\Notification\INotification;
+use OC\Notification\INotifier;
+
+class Notifier implements INotifier {
+	/** @var \OCP\L10N\IFactory */
+	protected $factory;
+
+	/**
+	 * @param \OCP\L10N\IFactory $factory
+	 */
+	public function __construct(\OCP\L10N\IFactory $factory) {
+		$this->factory = $factory;
+	}
+
+	/**
+	 * @param INotification $notification
+	 * @param string $languageCode The code of the language that should be used to prepare the notification
+	 * @return INotification
+	 */
+	public function prepare(INotification $notification, $languageCode) {
+		if ($notification->getApp() !== 'files_sharing') {
+			// Not my app => throw
+			throw new \InvalidArgumentException();
+		}
+
+		// Read the language from the notification
+		$l = $this->factory->get('files_sharing', $languageCode);
+
+		switch ($notification->getSubject()) {
+			// Deal with known subjects
+			case 'remote_share':
+				$params = $notification->getSubjectParameters();
+				$notification->setParsedSubject(
+					(string) $l->t('You received %s as a remote share from %s', $params)
+				);
+
+				// Deal with the actions for a known subject
+				foreach ($notification->getActions() as $action) {
+					switch ($action->getLabel()) {
+						case 'accept':
+							$action->setParsedLabel(
+								(string) $l->t('Accept')
+							);
+							break;
+
+						case 'decline':
+							$action->setParsedLabel(
+								(string) $l->t('Decline')
+							);
+							break;
+					}
+
+					$notification->addParsedAction($action);
+				}
+				return $notification;
+
+			default:
+				// Unknown subject => Unknown notification => throw
+				throw new \InvalidArgumentException();
+		}
+	}
+}
diff --git a/apps/files_sharing/lib/propagation/recipientpropagator.php b/apps/files_sharing/lib/propagation/recipientpropagator.php
index 1176410686..420cacb3d2 100644
--- a/apps/files_sharing/lib/propagation/recipientpropagator.php
+++ b/apps/files_sharing/lib/propagation/recipientpropagator.php
@@ -126,7 +126,13 @@ class RecipientPropagator {
 		});
 	}
 
+	protected $propagatingIds = [];
+
 	public function propagateById($id) {
+		if (isset($this->propagatingIds[$id])) {
+			return;
+		}
+		$this->propagatingIds[$id] = true;
 		$shares = Share::getAllSharesForFileId($id);
 		foreach ($shares as $share) {
 			// propagate down the share tree
@@ -141,5 +147,7 @@ class RecipientPropagator {
 				$watcher->writeHook(['path' => $path]);
 			}
 		}
+
+		unset($this->propagatingIds[$id]);
 	}
 }
diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php
index 2771e0415b..9aa9bbf562 100644
--- a/apps/files_sharing/lib/sharedmount.php
+++ b/apps/files_sharing/lib/sharedmount.php
@@ -81,7 +81,7 @@ class SharedMount extends MountPoint implements MoveableMount {
 		);
 
 		if ($newMountPoint !== $share['file_target']) {
-			self::updateFileTarget($newMountPoint, $share);
+			$this->updateFileTarget($newMountPoint, $share);
 			$share['file_target'] = $newMountPoint;
 			$share['unique_name'] = true;
 		}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index c7529df061..1ac401f3cf 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -55,6 +55,10 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 		$this->ownerView = $arguments['ownerView'];
 	}
 
+	private function init() {
+		Filesystem::initMountPoints($this->share['uid_owner']);
+	}
+
 	/**
 	 * get id of the mount point
 	 *
@@ -80,6 +84,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	 * @return array Returns array with the keys path, permissions, and owner or false if not found
 	 */
 	public function getFile($target) {
+		$this->init();
 		if (!isset($this->files[$target])) {
 			// Check for partial files
 			if (pathinfo($target, PATHINFO_EXTENSION) === 'part') {
@@ -319,7 +324,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	}
 
 	public function rename($path1, $path2) {
-
+		$this->init();
 		// we need the paths relative to data/user/files
 		$relPath1 = $this->getMountPoint() . '/' . $path1;
 		$relPath2 = $this->getMountPoint() . '/' . $path2;
diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php
index 9ff94eb16c..f4c9c6cd30 100644
--- a/apps/files_sharing/settings-personal.php
+++ b/apps/files_sharing/settings-personal.php
@@ -25,6 +25,12 @@
 
 $l = \OC::$server->getL10N('files_sharing');
 
+$isIE8 = false;
+preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
+if (count($matches) > 0 && $matches[1] <= 9) {
+	$isIE8 = true;
+}
+
 $uid = \OC::$server->getUserSession()->getUser()->getUID();
 $server = \OC::$server->getURLGenerator()->getAbsoluteURL('/');
 $cloudID = $uid . '@' . rtrim(\OCA\Files_Sharing\Helper::removeProtocolFromUrl($server), '/');
@@ -38,5 +44,6 @@ $tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud F
 $tmpl->assign('owncloud_logo_path', $ownCloudLogoPath);
 $tmpl->assign('reference', $url);
 $tmpl->assign('cloudId', $cloudID);
+$tmpl->assign('showShareIT', !$isIE8);
 
 return $tmpl->fetchPage();
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 43c76125e1..cde28c80fc 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -17,6 +17,7 @@ OCP\Util::addStyle('files', 'upload');
 OCP\Util::addScript('files', 'filesummary');
 OCP\Util::addScript('files', 'breadcrumb');
 OCP\Util::addScript('files', 'fileinfomodel');
+OCP\Util::addScript('files', 'newfilemenu');
 OCP\Util::addScript('files', 'files');
 OCP\Util::addScript('files', 'filelist');
 OCP\Util::addscript('files', 'keyboardshortcuts');
diff --git a/apps/files_sharing/templates/settings-personal.php b/apps/files_sharing/templates/settings-personal.php
index ee761ff589..1b93084e54 100644
--- a/apps/files_sharing/templates/settings-personal.php
+++ b/apps/files_sharing/templates/settings-personal.php
@@ -3,8 +3,10 @@
 /** @var array $_ */
 script('files_sharing', 'settings-personal');
 style('files_sharing', 'settings-personal');
-script('files_sharing', '3rdparty/gs-share/gs-share');
-style('files_sharing', '3rdparty/gs-share/style');
+if ($_['showShareIT']) {
+	script('files_sharing', '3rdparty/gs-share/gs-share');
+	style('files_sharing', '3rdparty/gs-share/style');
+}
 ?>
 
 <?php if ($_['outgoingServer2serverShareEnabled']): ?>
@@ -18,6 +20,7 @@ style('files_sharing', '3rdparty/gs-share/style');
 
 		<br>
 
+		<?php if ($_['showShareIT']) {?>
 		<p>
 			<?php p($l->t('Share it:')); ?>
 			<div class="gs-share">
@@ -43,13 +46,13 @@ style('files_sharing', '3rdparty/gs-share/style');
 				data-url='https://plus.google.com/share?url=<?php p(urlencode($_['reference'])); ?>'/>
 				Google+
 			</button>
+			<button id="oca-files-sharing-add-to-your-website">
+				<?php p($l->t('Add to your website')) ?>
+			</button>
 		</p>
 
-		<br>
-
-		<p>
-			<?php p($l->t('Add it to your website:')); ?>
-
+		<div class="hidden" id="oca-files-sharing-add-to-your-website-expanded">
+		<p style="margin: 10px 0">
 			<a target="_blank" href="<?php p($_['reference']); ?>"
 				style="padding:10px;background-color:#1d2d44;color:#fff;border-radius:3px;padding-left:4px;">
 				<img src="<?php p($_['owncloud_logo_path']); ?>"
@@ -68,6 +71,8 @@ style('files_sharing', '3rdparty/gs-share/style');
 
 </a></xmp>
 		</p>
+		</div>
+		<?php } ?>
 
 	</div>
 <?php endif; ?>
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 3bd568e47a..3809b81205 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -73,40 +73,108 @@ class Test_Files_Sharing_Api extends TestCase {
 	/**
 	 * @medium
 	 */
-	function testCreateShare() {
-
-		// share to user
-
+	function testCreateShareUserFile() {
 		// simulate a post request
 		$_POST['path'] = $this->filename;
 		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
 		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
 
-		$result = \OCA\Files_Sharing\API\Local::createShare(array());
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
 
 		$this->assertTrue($result->succeeded());
 		$data = $result->getData();
+		$this->assertEquals(23, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
 
 		$share = $this->getShareFromId($data['id']);
-
 		$items = \OCP\Share::getItemShared('file', $share['item_source']);
-
 		$this->assertTrue(!empty($items));
 
-		// share link
+		$fileinfo = $this->view->getFileInfo($this->filename);
+		\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+	}
 
+	function testCreateShareUserFolder() {
+		// simulate a post request
+		$_POST['path'] = $this->folder;
+		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		$this->assertTrue($result->succeeded());
+		$data = $result->getData();
+		$this->assertEquals(31, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
+
+		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
+
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+	}
+
+
+	function testCreateShareGroupFile() {
+		// simulate a post request
+		$_POST['path'] = $this->filename;
+		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_GROUP;
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		$this->assertTrue($result->succeeded());
+		$data = $result->getData();
+		$this->assertEquals(23, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
+
+		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
+
+		$fileinfo = $this->view->getFileInfo($this->filename);
+		\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1);
+	}
+
+	function testCreateShareGroupFolder() {
+		// simulate a post request
+		$_POST['path'] = $this->folder;
+		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_GROUP;
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		$this->assertTrue($result->succeeded());
+		$data = $result->getData();
+		$this->assertEquals(31, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
+
+		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
+
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_GROUP1);
+	}
+
+	public function testCreateShareLink() {
 		// simulate a post request
 		$_POST['path'] = $this->folder;
 		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
 
-		$result = \OCA\Files_Sharing\API\Local::createShare(array());
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
 
 		// check if API call was successful
 		$this->assertTrue($result->succeeded());
 
 		$data = $result->getData();
-
-		// check if we have a token
+		$this->assertEquals(1, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
 		$this->assertTrue(is_string($data['token']));
 
 		// check for correct link
@@ -115,18 +183,39 @@ class Test_Files_Sharing_Api extends TestCase {
 
 
 		$share = $this->getShareFromId($data['id']);
-
 		$items = \OCP\Share::getItemShared('file', $share['item_source']);
-
 		$this->assertTrue(!empty($items));
 
-		$fileinfo = $this->view->getFileInfo($this->filename);
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+	}
 
-		\OCP\Share::unshare('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
-				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+	public function testCreateShareLinkPublicUpload() {
+		// simulate a post request
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['publicUpload'] = 'true';
+
+		$result = \OCA\Files_Sharing\API\Local::createShare(array());
+
+		// check if API call was successful
+		$this->assertTrue($result->succeeded());
+
+		$data = $result->getData();
+		$this->assertEquals(7, $data['permissions']);
+		$this->assertEmpty($data['expiration']);
+		$this->assertTrue(is_string($data['token']));
+
+		// check for correct link
+		$url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']);
+		$this->assertEquals($url, $data['url']);
+
+
+		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
 
 		$fileinfo = $this->view->getFileInfo($this->folder);
-
 		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
 	}
 
@@ -287,7 +376,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
 	 */
 	function testGetAllShares() {
 
@@ -334,7 +423,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareLink
 	 */
 	function testPublicLinkUrl() {
 		// simulate a post request
@@ -379,7 +468,8 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
+	 * @depends testCreateShareLink
 	 */
 	function testGetShareFromSource() {
 
@@ -409,7 +499,8 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
+	 * @depends testCreateShareLink
 	 */
 	function testGetShareFromSourceWithReshares() {
 
@@ -463,7 +554,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
 	 */
 	function testGetShareFromId() {
 
@@ -911,7 +1002,8 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
+	 * @depends testCreateShareLink
 	 */
 	function testUpdateShare() {
 
@@ -1037,7 +1129,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
 	 */
 	public function testUpdateShareInvalidPermissions() {
 
@@ -1232,7 +1324,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	/**
 	 * @medium
-	 * @depends testCreateShare
+	 * @depends testCreateShareUserFile
 	 */
 	function testDeleteShare() {
 
@@ -1487,4 +1579,148 @@ class Test_Files_Sharing_Api extends TestCase {
 		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'no');
 
 	}
+
+	public function datesProvider() {
+		$date = new \DateTime();
+		$date->add(new \DateInterval('P5D'));
+
+		$year = (int)$date->format('Y');
+
+		return [
+			[$date->format('Y-m-d'), true],
+			[$year+1 . '-1-1', false],
+			[$date->format('Y-m-dTH:m'), false],
+			['abc', false],
+			[$date->format('Y-m-d') . 'xyz', false],
+		];
+	}
+
+	/**
+	 * Make sure only ISO 8601 dates are accepted
+	 *
+	 * @dataProvider datesProvider
+	 */
+	public function testPublicLinkExpireDate($date, $valid) {
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['expireDate'] = $date;
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		if ($valid === false) {
+			$this->assertFalse($result->succeeded());
+			$this->assertEquals(404, $result->getStatusCode());
+			$this->assertEquals('Invalid Date. Format must be YYYY-MM-DD.', $result->getMeta()['message']);
+			return;
+		}
+
+		$this->assertTrue($result->succeeded());
+
+		$data = $result->getData();
+		$this->assertTrue(is_string($data['token']));
+		$this->assertEquals($date, substr($data['expiration'], 0, 10));
+
+		// check for correct link
+		$url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']);
+		$this->assertEquals($url, $data['url']);
+
+
+		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
+
+		$item = reset($items);
+		$this->assertTrue(is_array($item));
+		$this->assertEquals($date, substr($item['expiration'], 0, 10));
+
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+	}
+
+	public function testCreatePublicLinkExpireDateValid() {
+		$config = \OC::$server->getConfig();
+
+		// enforce expire date, by default 7 days after the file was shared
+		$config->setAppValue('core', 'shareapi_default_expire_date', 'yes');
+		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'yes');
+
+		$date = new \DateTime();
+		$date->add(new \DateInterval('P5D'));
+
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['expireDate'] = $date->format('Y-m-d');
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		$this->assertTrue($result->succeeded());
+
+		$data = $result->getData();
+		$this->assertTrue(is_string($data['token']));
+		$this->assertEquals($date->format('Y-m-d') . ' 00:00:00', $data['expiration']);
+
+		// check for correct link
+		$url = \OC::$server->getURLGenerator()->getAbsoluteURL('/index.php/s/' . $data['token']);
+		$this->assertEquals($url, $data['url']);
+
+
+		$share = $this->getShareFromId($data['id']);
+		$items = \OCP\Share::getItemShared('file', $share['item_source']);
+		$this->assertTrue(!empty($items));
+
+		$item = reset($items);
+		$this->assertTrue(is_array($item));
+		$this->assertEquals($date->format('Y-m-d'), substr($item['expiration'], 0, 10));
+
+		$fileinfo = $this->view->getFileInfo($this->folder);
+		\OCP\Share::unshare('folder', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+
+		$config->setAppValue('core', 'shareapi_default_expire_date', 'no');
+		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'no');
+	}
+
+	public function testCreatePublicLinkExpireDateInvalidFuture() {
+		$config = \OC::$server->getConfig();
+
+		// enforce expire date, by default 7 days after the file was shared
+		$config->setAppValue('core', 'shareapi_default_expire_date', 'yes');
+		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'yes');
+
+		$date = new \DateTime();
+		$date->add(new \DateInterval('P8D'));
+
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['expireDate'] = $date->format('Y-m-d');
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		$this->assertFalse($result->succeeded());
+		$this->assertEquals(404, $result->getStatusCode());
+		$this->assertEquals('Cannot set expiration date. Shares cannot expire later than 7 after they have been shared', $result->getMeta()['message']);
+
+		$config->setAppValue('core', 'shareapi_default_expire_date', 'no');
+		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'no');
+	}
+
+	public function testCreatePublicLinkExpireDateInvalidPast() {
+		$config = \OC::$server->getConfig();
+
+		$date = new \DateTime();
+		$date->sub(new \DateInterval('P8D'));
+
+		$_POST['path'] = $this->folder;
+		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_LINK;
+		$_POST['expireDate'] = $date->format('Y-m-d');
+
+		$result = \OCA\Files_Sharing\API\Local::createShare([]);
+
+		$this->assertFalse($result->succeeded());
+		$this->assertEquals(404, $result->getStatusCode());
+		$this->assertEquals('Cannot set expiration date. Expiration date is in the past', $result->getMeta()['message']);
+
+		$config->setAppValue('core', 'shareapi_default_expire_date', 'no');
+		$config->setAppValue('core', 'shareapi_enforce_expire_date', 'no');
+	}
+
 }
diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
new file mode 100644
index 0000000000..1e28cb8ed5
--- /dev/null
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -0,0 +1,995 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_Sharing\Tests\API;
+
+use Doctrine\DBAL\Connection;
+use OC\Share\Constants;
+use OCA\Files_Sharing\API\Sharees;
+use OCA\Files_sharing\Tests\TestCase;
+use OCP\Share;
+
+class ShareesTest extends TestCase {
+	/** @var Sharees */
+	protected $sharees;
+
+	/** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */
+	protected $userManager;
+
+	/** @var \OCP\IGroupManager|\PHPUnit_Framework_MockObject_MockObject */
+	protected $groupManager;
+
+	/** @var \OCP\Contacts\IManager|\PHPUnit_Framework_MockObject_MockObject */
+	protected $contactsManager;
+
+	/** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */
+	protected $session;
+
+	/** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */
+	protected $request;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->userManager = $this->getMockBuilder('OCP\IUserManager')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->groupManager = $this->getMockBuilder('OCP\IGroupManager')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->contactsManager = $this->getMockBuilder('OCP\Contacts\IManager')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->session = $this->getMockBuilder('OCP\IUserSession')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->request = $this->getMockBuilder('OCP\IRequest')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->sharees = new Sharees(
+			$this->groupManager,
+			$this->userManager,
+			$this->contactsManager,
+			$this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
+			$this->session,
+			$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
+			$this->request,
+			$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
+		);
+	}
+
+	protected function getUserMock($uid, $displayName) {
+		$user = $this->getMockBuilder('OCP\IUser')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$user->expects($this->any())
+			->method('getUID')
+			->willReturn($uid);
+
+		$user->expects($this->any())
+			->method('getDisplayName')
+			->willReturn($displayName);
+
+		return $user;
+	}
+
+	protected function getGroupMock($gid) {
+		$group = $this->getMockBuilder('OCP\IGroup')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$group->expects($this->any())
+			->method('getGID')
+			->willReturn($gid);
+
+		return $group;
+	}
+
+	public function dataGetUsers() {
+		return [
+			['test', false, [], [], [], [], true, false],
+			['test', true, [], [], [], [], true, false],
+			[
+				'test', false, [], [],
+				[
+					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
+				], [], true, $this->getUserMock('test', 'Test')
+			],
+			[
+				'test', true, [], [],
+				[
+					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
+				], [], true, $this->getUserMock('test', 'Test')
+			],
+			[
+				'test',
+				false,
+				[],
+				[
+					$this->getUserMock('test1', 'Test One'),
+				],
+				[],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				],
+				true,
+				false,
+			],
+			[
+				'test',
+				false,
+				[],
+				[
+					$this->getUserMock('test1', 'Test One'),
+					$this->getUserMock('test2', 'Test Two'),
+				],
+				[],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				],
+				false,
+				false,
+			],
+			[
+				'test',
+				false,
+				[],
+				[
+					$this->getUserMock('test0', 'Test'),
+					$this->getUserMock('test1', 'Test One'),
+					$this->getUserMock('test2', 'Test Two'),
+				],
+				[
+					['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test0']],
+				],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				],
+				false,
+				false,
+			],
+			[
+				'test',
+				true,
+				['abc', 'xyz'],
+				[
+					['abc', 'test', 2, 0, ['test1' => 'Test One']],
+					['xyz', 'test', 2, 0, []],
+				],
+				[],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				],
+				true,
+				false,
+			],
+			[
+				'test',
+				true,
+				['abc', 'xyz'],
+				[
+					['abc', 'test', 2, 0, [
+						'test1' => 'Test One',
+						'test2' => 'Test Two',
+					]],
+					['xyz', 'test', 2, 0, [
+						'test1' => 'Test One',
+						'test2' => 'Test Two',
+					]],
+				],
+				[],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				],
+				false,
+				false,
+			],
+			[
+				'test',
+				true,
+				['abc', 'xyz'],
+				[
+					['abc', 'test', 2, 0, [
+						'test' => 'Test One',
+					]],
+					['xyz', 'test', 2, 0, [
+						'test2' => 'Test Two',
+					]],
+				],
+				[
+					['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
+				],
+				[
+					['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				],
+				false,
+				false,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataGetUsers
+	 *
+	 * @param string $searchTerm
+	 * @param bool $shareWithGroupOnly
+	 * @param array $groupResponse
+	 * @param array $userResponse
+	 * @param array $exactExpected
+	 * @param array $expected
+	 * @param bool $reachedEnd
+	 * @param mixed $singleUser
+	 */
+	public function testGetUsers($searchTerm, $shareWithGroupOnly, $groupResponse, $userResponse, $exactExpected, $expected, $reachedEnd, $singleUser) {
+		$this->invokePrivate($this->sharees, 'limit', [2]);
+		$this->invokePrivate($this->sharees, 'offset', [0]);
+		$this->invokePrivate($this->sharees, 'shareWithGroupOnly', [$shareWithGroupOnly]);
+
+		$user = $this->getUserMock('admin', 'Administrator');
+		$this->session->expects($this->any())
+			->method('getUser')
+			->willReturn($user);
+
+		if (!$shareWithGroupOnly) {
+			$this->userManager->expects($this->once())
+				->method('searchDisplayName')
+				->with($searchTerm, $this->invokePrivate($this->sharees, 'limit'), $this->invokePrivate($this->sharees, 'offset'))
+				->willReturn($userResponse);
+		} else {
+			$this->groupManager->expects($this->once())
+				->method('getUserGroupIds')
+				->with($user)
+				->willReturn($groupResponse);
+
+			$this->groupManager->expects($this->exactly(sizeof($groupResponse)))
+				->method('displayNamesInGroup')
+				->with($this->anything(), $searchTerm, $this->invokePrivate($this->sharees, 'limit'), $this->invokePrivate($this->sharees, 'offset'))
+				->willReturnMap($userResponse);
+		}
+
+		if ($singleUser !== false) {
+			$this->userManager->expects($this->once())
+				->method('get')
+				->with($searchTerm)
+				->willReturn($singleUser);
+		}
+
+		$this->invokePrivate($this->sharees, 'getUsers', [$searchTerm]);
+		$result = $this->invokePrivate($this->sharees, 'result');
+
+		$this->assertEquals($exactExpected, $result['exact']['users']);
+		$this->assertEquals($expected, $result['users']);
+		$this->assertCount((int) $reachedEnd, $this->invokePrivate($this->sharees, 'reachedEndFor'));
+	}
+
+	public function dataGetGroups() {
+		return [
+			['test', false, [], [], [], [], true, false],
+			[
+				'test', false,
+				[$this->getGroupMock('test1')],
+				[],
+				[],
+				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				true,
+				false,
+			],
+			[
+				'test', false,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[],
+				[['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
+				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				false,
+				false,
+			],
+			[
+				'test', false,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[],
+				[],
+				[
+					['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
+					['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
+				],
+				false,
+				null,
+			],
+			[
+				'test', false,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[],
+				[
+					['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']],
+				],
+				[
+					['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
+					['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
+				],
+				false,
+				$this->getGroupMock('test'),
+			],
+			['test', true, [], [], [], [], true, false],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test1'),
+					$this->getGroupMock('test2'),
+				],
+				[$this->getGroupMock('test1')],
+				[],
+				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				false,
+				false,
+			],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test')],
+				[['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
+				[],
+				false,
+				false,
+			],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test1')],
+				[],
+				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				false,
+				false,
+			],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
+				[['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
+				[['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
+				false,
+				false,
+			],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
+				[],
+				[
+					['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
+					['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
+				],
+				false,
+				null,
+			],
+			[
+				'test', true,
+				[
+					$this->getGroupMock('test0'),
+					$this->getGroupMock('test1'),
+				],
+				[$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
+				[
+					['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']],
+				],
+				[
+					['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
+					['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
+				],
+				false,
+				$this->getGroupMock('test'),
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataGetGroups
+	 *
+	 * @param string $searchTerm
+	 * @param bool $shareWithGroupOnly
+	 * @param array $groupResponse
+	 * @param array $userGroupsResponse
+	 * @param array $exactExpected
+	 * @param array $expected
+	 * @param bool $reachedEnd
+	 * @param mixed $singleGroup
+	 */
+	public function testGetGroups($searchTerm, $shareWithGroupOnly, $groupResponse, $userGroupsResponse, $exactExpected, $expected, $reachedEnd, $singleGroup) {
+		$this->invokePrivate($this->sharees, 'limit', [2]);
+		$this->invokePrivate($this->sharees, 'offset', [0]);
+		$this->invokePrivate($this->sharees, 'shareWithGroupOnly', [$shareWithGroupOnly]);
+
+		$this->groupManager->expects($this->once())
+			->method('search')
+			->with($searchTerm, $this->invokePrivate($this->sharees, 'limit'), $this->invokePrivate($this->sharees, 'offset'))
+			->willReturn($groupResponse);
+
+		if ($singleGroup !== false) {
+			$this->groupManager->expects($this->once())
+				->method('get')
+				->with($searchTerm)
+				->willReturn($singleGroup);
+		}
+
+		if ($shareWithGroupOnly) {
+			$user = $this->getUserMock('admin', 'Administrator');
+			$this->session->expects($this->any())
+				->method('getUser')
+				->willReturn($user);
+
+			$numGetUserGroupsCalls = empty($groupResponse) ? 0 : 1;
+			$this->groupManager->expects($this->exactly($numGetUserGroupsCalls))
+				->method('getUserGroups')
+				->with($user)
+				->willReturn($userGroupsResponse);
+		}
+
+		$this->invokePrivate($this->sharees, 'getGroups', [$searchTerm]);
+		$result = $this->invokePrivate($this->sharees, 'result');
+
+		$this->assertEquals($exactExpected, $result['exact']['groups']);
+		$this->assertEquals($expected, $result['groups']);
+		$this->assertCount((int) $reachedEnd, $this->invokePrivate($this->sharees, 'reachedEndFor'));
+	}
+
+	public function dataGetRemote() {
+		return [
+			['test', [], [], [], true],
+			[
+				'test@remote',
+				[],
+				[
+					['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
+				],
+				[],
+				true,
+			],
+			[
+				'test',
+				[
+					[
+						'FN' => 'User3 @ Localhost',
+					],
+					[
+						'FN' => 'User2 @ Localhost',
+						'CLOUD' => [
+						],
+					],
+					[
+						'FN' => 'User @ Localhost',
+						'CLOUD' => [
+							'username@localhost',
+						],
+					],
+				],
+				[],
+				[
+					['label' => 'User @ Localhost', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
+				],
+				true,
+			],
+			[
+				'test@remote',
+				[
+					[
+						'FN' => 'User3 @ Localhost',
+					],
+					[
+						'FN' => 'User2 @ Localhost',
+						'CLOUD' => [
+						],
+					],
+					[
+						'FN' => 'User @ Localhost',
+						'CLOUD' => [
+							'username@localhost',
+						],
+					],
+				],
+				[
+					['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']],
+				],
+				[
+					['label' => 'User @ Localhost', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
+				],
+				true,
+			],
+			[
+				'username@localhost',
+				[
+					[
+						'FN' => 'User3 @ Localhost',
+					],
+					[
+						'FN' => 'User2 @ Localhost',
+						'CLOUD' => [
+						],
+					],
+					[
+						'FN' => 'User @ Localhost',
+						'CLOUD' => [
+							'username@localhost',
+						],
+					],
+				],
+				[
+					['label' => 'User @ Localhost', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost']],
+				],
+				[
+				],
+				true,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataGetRemote
+	 *
+	 * @param string $searchTerm
+	 * @param array $contacts
+	 * @param array $exactExpected
+	 * @param array $expected
+	 * @param bool $reachedEnd
+	 */
+	public function testGetRemote($searchTerm, $contacts, $exactExpected, $expected, $reachedEnd) {
+		$this->contactsManager->expects($this->any())
+			->method('search')
+			->with($searchTerm, ['CLOUD', 'FN'])
+			->willReturn($contacts);
+
+		$this->invokePrivate($this->sharees, 'getRemote', [$searchTerm]);
+		$result = $this->invokePrivate($this->sharees, 'result');
+
+		$this->assertEquals($exactExpected, $result['exact']['remotes']);
+		$this->assertEquals($expected, $result['remotes']);
+		$this->assertCount((int) $reachedEnd, $this->invokePrivate($this->sharees, 'reachedEndFor'));
+	}
+
+	public function dataSearch() {
+		$allTypes = [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE];
+
+		return [
+			[[], '', true, '', null, $allTypes, 1, 200, false],
+
+			// Test itemType
+			[[
+				'search' => '',
+			], '', true, '', null, $allTypes, 1, 200, false],
+			[[
+				'search' => 'foobar',
+			], '', true, 'foobar', null, $allTypes, 1, 200, false],
+			[[
+				'search' => 0,
+			], '', true, '0', null, $allTypes, 1, 200, false],
+
+			// Test itemType
+			[[
+				'itemType' => '',
+			], '', true, '', '', $allTypes, 1, 200, false],
+			[[
+				'itemType' => 'folder',
+			], '', true, '', 'folder', $allTypes, 1, 200, false],
+			[[
+				'itemType' => 0,
+			], '', true, '', '0', $allTypes, 1, 200, false],
+
+			// Test shareType
+			[[
+			], '', true, '', null, $allTypes, 1, 200, false],
+			[[
+				'shareType' => 0,
+			], '', true, '', null, [0], 1, 200, false],
+			[[
+				'shareType' => '0',
+			], '', true, '', null, [0], 1, 200, false],
+			[[
+				'shareType' => 1,
+			], '', true, '', null, [1], 1, 200, false],
+			[[
+				'shareType' => 12,
+			], '', true, '', null, [], 1, 200, false],
+			[[
+				'shareType' => 'foobar',
+			], '', true, '', null, $allTypes, 1, 200, false],
+			[[
+				'shareType' => [0, 1, 2],
+			], '', true, '', null, [0, 1], 1, 200, false],
+			[[
+				'shareType' => [0, 1],
+			], '', true, '', null, [0, 1], 1, 200, false],
+			[[
+				'shareType' => $allTypes,
+			], '', true, '', null, $allTypes, 1, 200, false],
+			[[
+				'shareType' => $allTypes,
+			], '', false, '', null, [0, 1], 1, 200, false],
+
+			// Test pagination
+			[[
+				'page' => 0,
+			], '', true, '', null, $allTypes, 1, 200, false],
+			[[
+				'page' => '0',
+			], '', true, '', null, $allTypes, 1, 200, false],
+			[[
+				'page' => -1,
+			], '', true, '', null, $allTypes, 1, 200, false],
+			[[
+				'page' => 1,
+			], '', true, '', null, $allTypes, 1, 200, false],
+			[[
+				'page' => 10,
+			], '', true, '', null, $allTypes, 10, 200, false],
+
+			// Test perPage
+			[[
+				'perPage' => 0,
+			], '', true, '', null, $allTypes, 1, 200, false],
+			[[
+				'perPage' => '0',
+			], '', true, '', null, $allTypes, 1, 200, false],
+			[[
+				'perPage' => -1,
+			], '', true, '', null, $allTypes, 1, 1, false],
+			[[
+				'perPage' => 1,
+			], '', true, '', null, $allTypes, 1, 1, false],
+			[[
+				'perPage' => 10,
+			], '', true, '', null, $allTypes, 1, 10, false],
+
+			// Test $shareWithGroupOnly setting
+			[[], 'no', true, '', null, $allTypes, 1, 200, false],
+			[[], 'yes', true, '', null, $allTypes, 1, 200, true],
+
+		];
+	}
+
+	/**
+	 * @dataProvider dataSearch
+	 *
+	 * @param array $getData
+	 * @param string $apiSetting
+	 * @param bool $remoteSharingEnabled
+	 * @param string $search
+	 * @param string $itemType
+	 * @param array $shareTypes
+	 * @param int $page
+	 * @param int $perPage
+	 * @param bool $shareWithGroupOnly
+	 */
+	public function testSearch($getData, $apiSetting, $remoteSharingEnabled, $search, $itemType, $shareTypes, $page, $perPage, $shareWithGroupOnly) {
+		$oldGet = $_GET;
+		$_GET = $getData;
+
+		$config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$config->expects($this->once())
+			->method('getAppValue')
+			->with('core', 'shareapi_only_share_with_group_members', 'no')
+			->willReturn($apiSetting);
+
+		$sharees = $this->getMockBuilder('\OCA\Files_Sharing\API\Sharees')
+			->setConstructorArgs([
+				$this->groupManager,
+				$this->userManager,
+				$this->contactsManager,
+				$config,
+				$this->session,
+				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
+				$this->getMockBuilder('OCP\IRequest')->disableOriginalConstructor()->getMock(),
+				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
+			])
+			->setMethods(array('searchSharees', 'isRemoteSharingAllowed'))
+			->getMock();
+		$sharees->expects($this->once())
+			->method('searchSharees')
+			->with($search, $itemType, $shareTypes, $page, $perPage)
+			->willReturnCallback(function
+					($isearch, $iitemType, $ishareTypes, $ipage, $iperPage)
+				use ($search, $itemType, $shareTypes, $page, $perPage) {
+
+				// We are doing strict comparisons here, so we can differ 0/'' and null on shareType/itemType
+				$this->assertSame($search, $isearch);
+				$this->assertSame($itemType, $iitemType);
+				$this->assertSame($shareTypes, $ishareTypes);
+				$this->assertSame($page, $ipage);
+				$this->assertSame($perPage, $iperPage);
+				return new \OC_OCS_Result([]);
+			});
+		$sharees->expects($this->any())
+			->method('isRemoteSharingAllowed')
+			->with($itemType)
+			->willReturn($remoteSharingEnabled);
+
+		/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\API\Sharees $sharees */
+		$this->assertInstanceOf('\OC_OCS_Result', $sharees->search());
+
+		$this->assertSame($shareWithGroupOnly, $this->invokePrivate($sharees, 'shareWithGroupOnly'));
+
+		$_GET = $oldGet;
+	}
+
+	public function dataIsRemoteSharingAllowed() {
+		return [
+			['file', true],
+			['folder', true],
+			['', false],
+			['contacts', false],
+		];
+	}
+
+	/**
+	 * @dataProvider dataIsRemoteSharingAllowed
+	 *
+	 * @param string $itemType
+	 * @param bool $expected
+	 */
+	public function testIsRemoteSharingAllowed($itemType, $expected) {
+		$this->assertSame($expected, $this->invokePrivate($this->sharees, 'isRemoteSharingAllowed', [$itemType]));
+	}
+
+	public function dataSearchSharees() {
+		return [
+			['test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [],
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [],
+					'groups' => [],
+					'remotes' => [],
+				], false],
+			['test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], [],
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [],
+					'groups' => [],
+					'remotes' => [],
+				], false],
+			[
+				'test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE], 1, 2, false, [
+					['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				], [
+					['label' => 'testgroup1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
+				], [
+					['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+				],
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [
+						['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					],
+					'groups' => [
+						['label' => 'testgroup1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
+					],
+					'remotes' => [
+						['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+					],
+				], true,
+			],
+			// No groups requested
+			[
+				'test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_REMOTE], 1, 2, false, [
+					['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				], null, [
+					['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+				],
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [
+						['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					],
+					'groups' => [],
+					'remotes' => [
+						['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
+					],
+				], false,
+			],
+			// Share type restricted to user - Only one user
+			[
+				'test', 'folder', [Share::SHARE_TYPE_USER], 1, 2, false, [
+					['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+				], null, null,
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [
+						['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					],
+					'groups' => [],
+					'remotes' => [],
+				], false,
+			],
+			// Share type restricted to user - Multipage result
+			[
+				'test', 'folder', [Share::SHARE_TYPE_USER], 1, 2, false, [
+					['label' => 'test 1', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+					['label' => 'test 2', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+				], null, null,
+				[
+					'exact' => ['users' => [], 'groups' => [], 'remotes' => []],
+					'users' => [
+						['label' => 'test 1', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
+						['label' => 'test 2', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
+					],
+					'groups' => [],
+					'remotes' => [],
+				], true,
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSearchSharees
+	 *
+	 * @param string $searchTerm
+	 * @param string $itemType
+	 * @param array $shareTypes
+	 * @param int $page
+	 * @param int $perPage
+	 * @param bool $shareWithGroupOnly
+	 * @param array $mockedUserResult
+	 * @param array $mockedGroupsResult
+	 * @param array $mockedRemotesResult
+	 * @param array $expected
+	 * @param bool $nextLink
+	 */
+	public function testSearchSharees($searchTerm, $itemType, array $shareTypes, $page, $perPage, $shareWithGroupOnly,
+									  $mockedUserResult, $mockedGroupsResult, $mockedRemotesResult, $expected, $nextLink) {
+		/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\API\Sharees $sharees */
+		$sharees = $this->getMockBuilder('\OCA\Files_Sharing\API\Sharees')
+			->setConstructorArgs([
+				$this->groupManager,
+				$this->userManager,
+				$this->contactsManager,
+				$this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
+				$this->session,
+				$this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
+				$this->getMockBuilder('OCP\IRequest')->disableOriginalConstructor()->getMock(),
+				$this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock()
+			])
+			->setMethods(array('getShareesForShareIds', 'getUsers', 'getGroups', 'getRemote'))
+			->getMock();
+		$sharees->expects(($mockedUserResult === null) ? $this->never() : $this->once())
+			->method('getUsers')
+			->with($searchTerm)
+			->willReturnCallback(function() use ($sharees, $mockedUserResult) {
+				$result = $this->invokePrivate($sharees, 'result');
+				$result['users'] = $mockedUserResult;
+				$this->invokePrivate($sharees, 'result', [$result]);
+			});
+		$sharees->expects(($mockedGroupsResult === null) ? $this->never() : $this->once())
+			->method('getGroups')
+			->with($searchTerm)
+			->willReturnCallback(function() use ($sharees, $mockedGroupsResult) {
+				$result = $this->invokePrivate($sharees, 'result');
+				$result['groups'] = $mockedGroupsResult;
+				$this->invokePrivate($sharees, 'result', [$result]);
+			});
+		$sharees->expects(($mockedRemotesResult === null) ? $this->never() : $this->once())
+			->method('getRemote')
+			->with($searchTerm)
+			->willReturnCallback(function() use ($sharees, $mockedRemotesResult) {
+				$result = $this->invokePrivate($sharees, 'result');
+				$result['remotes'] = $mockedRemotesResult;
+				$this->invokePrivate($sharees, 'result', [$result]);
+			});
+
+		/** @var \OC_OCS_Result $ocs */
+		$ocs = $this->invokePrivate($sharees, 'searchSharees', [$searchTerm, $itemType, $shareTypes, $page, $perPage, $shareWithGroupOnly]);
+		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
+		$this->assertEquals($expected, $ocs->getData());
+
+		// Check if next link is set
+		if ($nextLink) {
+			$headers = $ocs->getHeaders();
+			$this->assertArrayHasKey('Link', $headers);
+			$this->assertStringStartsWith('<', $headers['Link']);
+			$this->assertStringEndsWith('>; rel="next"', $headers['Link']);
+		}
+	}
+
+	public function testSearchShareesNoItemType() {
+		/** @var \OC_OCS_Result $ocs */
+		$ocs = $this->invokePrivate($this->sharees, 'searchSharees', ['', null, [], [], 0, 0, false]);
+		$this->assertInstanceOf('\OC_OCS_Result', $ocs);
+
+		$this->assertSame(400, $ocs->getStatusCode(), 'Expected status code 400');
+		$this->assertSame([], $ocs->getData(), 'Expected that no data is send');
+
+		$meta = $ocs->getMeta();
+		$this->assertNotEmpty($meta);
+		$this->assertArrayHasKey('message', $meta);
+		$this->assertSame('missing itemType', $meta['message']);
+	}
+
+	public function dataGetPaginationLink() {
+		return [
+			[1, '/ocs/v1.php', ['perPage' => 2], '<?perPage=2&page=2>; rel="next"'],
+			[10, '/ocs/v2.php', ['perPage' => 2], '<?perPage=2&page=11>; rel="next"'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataGetPaginationLink
+	 *
+	 * @param int $page
+	 * @param string $scriptName
+	 * @param array $params
+	 * @param array $expected
+	 */
+	public function testGetPaginationLink($page, $scriptName, $params, $expected) {
+		$this->request->expects($this->once())
+			->method('getScriptName')
+			->willReturn($scriptName);
+
+		$this->assertEquals($expected, $this->invokePrivate($this->sharees, 'getPaginationLink', [$page, $params]));
+	}
+
+	public function dataIsV2() {
+		return [
+			['/ocs/v1.php', false],
+			['/ocs/v2.php', true],
+		];
+	}
+
+	/**
+	 * @dataProvider dataIsV2
+	 *
+	 * @param string $scriptName
+	 * @param bool $expected
+	 */
+	public function testIsV2($scriptName, $expected) {
+		$this->request->expects($this->once())
+			->method('getScriptName')
+			->willReturn($scriptName);
+
+		$this->assertEquals($expected, $this->invokePrivate($this->sharees, 'isV2'));
+	}
+}
diff --git a/apps/files_sharing/tests/controller/externalsharecontroller.php b/apps/files_sharing/tests/controller/externalsharecontroller.php
new file mode 100644
index 0000000000..3dc34bca7a
--- /dev/null
+++ b/apps/files_sharing/tests/controller/externalsharecontroller.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_Sharing\Controllers;
+
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\Http\Client\IClientService;
+use OCP\IRequest;
+
+/**
+ * Class ExternalShareControllerTest
+ *
+ * @package OCA\Files_Sharing\Controllers
+ */
+class ExternalShareControllerTest extends \Test\TestCase {
+	/** @var bool */
+	private $incomingShareEnabled;
+	/** @var IRequest */
+	private $request;
+	/** @var \OCA\Files_Sharing\External\Manager */
+	private $externalManager;
+	/** @var IClientService */
+	private $clientService;
+
+	public function setUp() {
+		$this->request = $this->getMockBuilder('\\OCP\\IRequest')
+			->disableOriginalConstructor()->getMock();
+		$this->externalManager = $this->getMockBuilder('\\OCA\\Files_Sharing\\External\\Manager')
+			->disableOriginalConstructor()->getMock();
+		$this->clientService = $this->getMockBuilder('\\OCP\Http\\Client\\IClientService')
+			->disableOriginalConstructor()->getMock();
+	}
+
+	/**
+	 * @return ExternalSharesController
+	 */
+	public function getExternalShareController() {
+		return new ExternalSharesController(
+			'files_sharing',
+			$this->request,
+			$this->incomingShareEnabled,
+			$this->externalManager,
+			$this->clientService
+		);
+	}
+
+	public function testIndexDisabled() {
+		$this->externalManager
+			->expects($this->never())
+			->method('getOpenShares');
+
+		$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->index());
+	}
+
+	public function testIndexEnabled() {
+		$this->incomingShareEnabled = true;
+		$this->externalManager
+			->expects($this->once())
+			->method('getOpenShares')
+			->will($this->returnValue(['MyDummyArray']));
+
+		$this->assertEquals(new JSONResponse(['MyDummyArray']), $this->getExternalShareController()->index());
+	}
+
+	public function testCreateDisabled() {
+		$this->externalManager
+			->expects($this->never())
+			->method('acceptShare');
+
+		$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->create(4));
+	}
+
+	public function testCreateEnabled() {
+		$this->incomingShareEnabled = true;
+		$this->externalManager
+			->expects($this->once())
+			->method('acceptShare')
+			->with(4);
+
+		$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->create(4));
+	}
+
+	public function testDestroyDisabled() {
+		$this->externalManager
+			->expects($this->never())
+			->method('destroy');
+
+		$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->destroy(4));
+	}
+
+	public function testDestroyEnabled() {
+		$this->incomingShareEnabled = true;
+		$this->externalManager
+			->expects($this->once())
+			->method('declineShare')
+			->with(4);
+
+		$this->assertEquals(new JSONResponse(), $this->getExternalShareController()->destroy(4));
+	}
+
+	public function testRemoteWithValidHttps() {
+		$client = $this->getMockBuilder('\\OCP\\Http\\Client\\IClient')
+			->disableOriginalConstructor()->getMock();
+		$response = $this->getMockBuilder('\\OCP\\Http\\Client\\IResponse')
+			->disableOriginalConstructor()->getMock();
+		$client
+			->expects($this->once())
+			->method('get')
+			->with(
+				'https://owncloud.org/status.php',
+				[
+					'timeout' => 3,
+					'connect_timeout' => 3,
+				]
+			)->will($this->returnValue($response));
+		$response
+			->expects($this->once())
+			->method('getBody')
+			->will($this->returnValue('{"installed":true,"maintenance":false,"version":"8.1.0.8","versionstring":"8.1.0","edition":""}'));
+
+		$this->clientService
+			->expects($this->once())
+			->method('newClient')
+			->will($this->returnValue($client));
+
+		$this->assertEquals(new DataResponse('https'), $this->getExternalShareController()->testRemote('owncloud.org'));
+	}
+
+	public function testRemoteWithWorkingHttp() {
+		$client = $this->getMockBuilder('\\OCP\\Http\\Client\\IClient')
+			->disableOriginalConstructor()->getMock();
+		$response = $this->getMockBuilder('\\OCP\\Http\\Client\\IResponse')
+			->disableOriginalConstructor()->getMock();
+		$client
+			->method('get')
+			->will($this->onConsecutiveCalls($response, $response));
+		$response
+			->expects($this->exactly(2))
+			->method('getBody')
+			->will($this->onConsecutiveCalls('Certainly not a JSON string', '{"installed":true,"maintenance":false,"version":"8.1.0.8","versionstring":"8.1.0","edition":""}'));
+		$this->clientService
+			->expects($this->exactly(2))
+			->method('newClient')
+			->will($this->returnValue($client));
+
+		$this->assertEquals(new DataResponse('http'), $this->getExternalShareController()->testRemote('owncloud.org'));
+	}
+
+	public function testRemoteWithInvalidRemote() {
+		$client = $this->getMockBuilder('\\OCP\\Http\\Client\\IClient')
+			->disableOriginalConstructor()->getMock();
+		$response = $this->getMockBuilder('\\OCP\\Http\\Client\\IResponse')
+			->disableOriginalConstructor()->getMock();
+		$client
+			->method('get')
+			->will($this->onConsecutiveCalls($response, $response));
+		$response
+			->expects($this->exactly(2))
+			->method('getBody')
+			->will($this->returnValue('Certainly not a JSON string'));
+		$this->clientService
+			->expects($this->exactly(2))
+			->method('newClient')
+			->will($this->returnValue($client));
+
+		$this->assertEquals(new DataResponse(false), $this->getExternalShareController()->testRemote('owncloud.org'));
+	}
+}
diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php
index df01ea0f73..8e03c67a9a 100644
--- a/apps/files_sharing/tests/external/managertest.php
+++ b/apps/files_sharing/tests/external/managertest.php
@@ -50,6 +50,7 @@ class ManagerTest extends TestCase {
 			$this->mountManager,
 			new StorageFactory(),
 			$httpHelper,
+			\OC::$server->getNotificationManager(),
 			$this->uid
 		);
 	}
diff --git a/apps/files_sharing/tests/js/shareSpec.js b/apps/files_sharing/tests/js/shareSpec.js
index 581e15caf9..b6368b901e 100644
--- a/apps/files_sharing/tests/js/shareSpec.js
+++ b/apps/files_sharing/tests/js/shareSpec.js
@@ -117,7 +117,7 @@ describe('OCA.Sharing.Util tests', function() {
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('Shared');
+			expect($action.find('>span').text().trim()).toEqual('Shared');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
 			expect($action.find('img').length).toEqual(1);
@@ -138,7 +138,7 @@ describe('OCA.Sharing.Util tests', function() {
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('Shared');
+			expect($action.find('>span').text().trim()).toEqual('Shared');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('public.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-public.svg');
 			expect($action.find('img').length).toEqual(1);
@@ -159,7 +159,7 @@ describe('OCA.Sharing.Util tests', function() {
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('User One');
+			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
 		});
@@ -179,7 +179,7 @@ describe('OCA.Sharing.Util tests', function() {
 			$tr = fileList.$el.find('tbody tr:first');
 			$action = $tr.find('.action-share');
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('Shared with User One, User Two');
+			expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 			expect(OC.basename(getImageUrl($tr.find('.filename .thumbnail')))).toEqual('folder-shared.svg');
 			expect($action.find('img').length).toEqual(1);
@@ -275,7 +275,7 @@ describe('OCA.Sharing.Util tests', function() {
 
 			OC.Share.updateIcon('file', 1);
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('Shared with Group One, Group Two, User One, User Two');
+			expect($action.find('>span').text().trim()).toEqual('Shared with Group One, Group Two, User One, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
 		it('updates share icon after updating shares of a file', function() {
@@ -311,7 +311,7 @@ describe('OCA.Sharing.Util tests', function() {
 			OC.Share.updateIcon('file', 1);
 
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('Shared with User One, User Three, User Two');
+			expect($action.find('>span').text().trim()).toEqual('Shared with User One, User Three, User Two');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
 		it('removes share icon after removing all shares from a file', function() {
@@ -380,7 +380,7 @@ describe('OCA.Sharing.Util tests', function() {
 			OC.Share.updateIcon('file', 1);
 
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('User One');
+			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
 		it('keep share text after unsharing reshare', function() {
@@ -416,7 +416,7 @@ describe('OCA.Sharing.Util tests', function() {
 			OC.Share.updateIcon('file', 1);
 
 			expect($action.hasClass('permanent')).toEqual(true);
-			expect($action.find('>span').text()).toEqual('User One');
+			expect($action.find('>span').text().trim()).toEqual('User One');
 			expect(OC.basename($action.find('img').attr('src'))).toEqual('share.svg');
 		});
 	});
diff --git a/apps/files_sharing/tests/server2server.php b/apps/files_sharing/tests/server2server.php
index a1c87d7339..a4cc8209a8 100644
--- a/apps/files_sharing/tests/server2server.php
+++ b/apps/files_sharing/tests/server2server.php
@@ -154,6 +154,7 @@ class Test_Files_Sharing_S2S_OCS_API extends TestCase {
 			\OC\Files\Filesystem::getMountManager(),
 			\OC\Files\Filesystem::getLoader(),
 			\OC::$server->getHTTPHelper(),
+			\OC::$server->getNotificationManager(),
 			$toDelete
 			);
 
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index 71b6372189..febe3a45be 100644
--- a/apps/files_trashbin/js/filelist.js
+++ b/apps/files_trashbin/js/filelist.js
@@ -122,6 +122,16 @@
 			return OC.linkTo('files', 'index.php')+"?view=trashbin&dir="+ encodeURIComponent(dir).replace(/%2F/g, '/');
 		},
 
+		elementToFile: function($el) {
+			var fileInfo = OCA.Files.FileList.prototype.elementToFile($el);
+			if (this.getCurrentDirectory() === '/') {
+				fileInfo.displayName = getDeletedFileName(fileInfo.name);
+			}
+			// no size available
+			delete fileInfo.size;
+			return fileInfo;
+		},
+
 		updateEmptyContent: function(){
 			var exists = this.$fileList.find('tr:first').exists();
 			this.$el.find('#emptycontent').toggleClass('hidden', exists);
diff --git a/apps/files_trashbin/l10n/de_CH.js b/apps/files_trashbin/l10n/de_CH.js
deleted file mode 100644
index 70a428d4c9..0000000000
--- a/apps/files_trashbin/l10n/de_CH.js
+++ /dev/null
@@ -1,15 +0,0 @@
-OC.L10N.register(
-    "files_trashbin",
-    {
-    "Couldn't delete %s permanently" : "Konnte %s nicht dauerhaft löschen",
-    "Couldn't restore %s" : "Konnte %s nicht wiederherstellen",
-    "Deleted files" : "Gelöschte Dateien",
-    "Restore" : "Wiederherstellen",
-    "Error" : "Fehler",
-    "restored" : "Wiederhergestellt",
-    "Nothing in here. Your trash bin is empty!" : "Nichts zu löschen, Ihr Papierkorb ist leer!",
-    "Name" : "Name",
-    "Deleted" : "Gelöscht",
-    "Delete" : "Löschen"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/de_CH.json b/apps/files_trashbin/l10n/de_CH.json
deleted file mode 100644
index 497b6c35d5..0000000000
--- a/apps/files_trashbin/l10n/de_CH.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{ "translations": {
-    "Couldn't delete %s permanently" : "Konnte %s nicht dauerhaft löschen",
-    "Couldn't restore %s" : "Konnte %s nicht wiederherstellen",
-    "Deleted files" : "Gelöschte Dateien",
-    "Restore" : "Wiederherstellen",
-    "Error" : "Fehler",
-    "restored" : "Wiederhergestellt",
-    "Nothing in here. Your trash bin is empty!" : "Nichts zu löschen, Ihr Papierkorb ist leer!",
-    "Name" : "Name",
-    "Deleted" : "Gelöscht",
-    "Delete" : "Löschen"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/eu_ES.js b/apps/files_trashbin/l10n/eu_ES.js
deleted file mode 100644
index 8e988be3bf..0000000000
--- a/apps/files_trashbin/l10n/eu_ES.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "files_trashbin",
-    {
-    "Delete" : "Ezabatu"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/fi.js b/apps/files_trashbin/l10n/fi.js
deleted file mode 100644
index e3b5a93ead..0000000000
--- a/apps/files_trashbin/l10n/fi.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "files_trashbin",
-    {
-    "Error" : "Virhe",
-    "Delete" : "Poista"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/fi.json b/apps/files_trashbin/l10n/fi.json
deleted file mode 100644
index 639a5749f2..0000000000
--- a/apps/files_trashbin/l10n/fi.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Error" : "Virhe",
-    "Delete" : "Poista"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/is.js b/apps/files_trashbin/l10n/is.js
index de8522ed67..38858a5a94 100644
--- a/apps/files_trashbin/l10n/is.js
+++ b/apps/files_trashbin/l10n/is.js
@@ -1,8 +1,19 @@
 OC.L10N.register(
     "files_trashbin",
     {
+    "Couldn't delete %s permanently" : "Ekki tókst að eyða %s varanlega",
+    "Couldn't restore %s" : "Gat ekki endurheimt %s",
+    "Deleted files" : "eyddar skrár",
+    "Restore" : "Endurheimta",
+    "Delete permanently" : "Eyða varanlega",
     "Error" : "Villa",
+    "restored" : "endurheimt",
+    "No deleted files" : "Engar eyddar skrár",
+    "You will be able to recover deleted files from here" : "Þú getur endurheimt eyddum skrám héðan",
+    "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
+    "Select all" : "Velja allt",
     "Name" : "Nafn",
+    "Deleted" : "Eytt",
     "Delete" : "Eyða"
 },
-"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);");
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/files_trashbin/l10n/is.json b/apps/files_trashbin/l10n/is.json
index 5ce58fc128..ea2257a68a 100644
--- a/apps/files_trashbin/l10n/is.json
+++ b/apps/files_trashbin/l10n/is.json
@@ -1,6 +1,17 @@
 { "translations": {
+    "Couldn't delete %s permanently" : "Ekki tókst að eyða %s varanlega",
+    "Couldn't restore %s" : "Gat ekki endurheimt %s",
+    "Deleted files" : "eyddar skrár",
+    "Restore" : "Endurheimta",
+    "Delete permanently" : "Eyða varanlega",
     "Error" : "Villa",
+    "restored" : "endurheimt",
+    "No deleted files" : "Engar eyddar skrár",
+    "You will be able to recover deleted files from here" : "Þú getur endurheimt eyddum skrám héðan",
+    "No entries found in this folder" : "Engar skrár fundust í þessari möppu",
+    "Select all" : "Velja allt",
     "Name" : "Nafn",
+    "Deleted" : "Eytt",
     "Delete" : "Eyða"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/sk.js b/apps/files_trashbin/l10n/sk.js
deleted file mode 100644
index 1b73b5f3af..0000000000
--- a/apps/files_trashbin/l10n/sk.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "files_trashbin",
-    {
-    "Delete" : "Odstrániť"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_trashbin/l10n/sk.json b/apps/files_trashbin/l10n/sk.json
deleted file mode 100644
index 418f8874a6..0000000000
--- a/apps/files_trashbin/l10n/sk.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Delete" : "Odstrániť"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ur.js b/apps/files_trashbin/l10n/ur.js
deleted file mode 100644
index cfdfd80274..0000000000
--- a/apps/files_trashbin/l10n/ur.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "files_trashbin",
-    {
-    "Error" : "خرابی"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/ur.json b/apps/files_trashbin/l10n/ur.json
deleted file mode 100644
index 1c1fc3d16c..0000000000
--- a/apps/files_trashbin/l10n/ur.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/zh_TW.js b/apps/files_trashbin/l10n/zh_TW.js
index 974c38d09a..85d0873edd 100644
--- a/apps/files_trashbin/l10n/zh_TW.js
+++ b/apps/files_trashbin/l10n/zh_TW.js
@@ -8,6 +8,8 @@ OC.L10N.register(
     "Delete permanently" : "永久刪除",
     "Error" : "錯誤",
     "restored" : "已還原",
+    "No entries found in this folder" : "在此資料夾中沒有任何項目",
+    "Select all" : "全選",
     "Name" : "名稱",
     "Deleted" : "已刪除",
     "Delete" : "刪除"
diff --git a/apps/files_trashbin/l10n/zh_TW.json b/apps/files_trashbin/l10n/zh_TW.json
index f944a8db39..5c744f828c 100644
--- a/apps/files_trashbin/l10n/zh_TW.json
+++ b/apps/files_trashbin/l10n/zh_TW.json
@@ -6,6 +6,8 @@
     "Delete permanently" : "永久刪除",
     "Error" : "錯誤",
     "restored" : "已還原",
+    "No entries found in this folder" : "在此資料夾中沒有任何項目",
+    "Select all" : "全選",
     "Name" : "名稱",
     "Deleted" : "已刪除",
     "Delete" : "刪除"
diff --git a/apps/files_trashbin/tests/js/filelistSpec.js b/apps/files_trashbin/tests/js/filelistSpec.js
index 9aa1f907fa..05caaf2786 100644
--- a/apps/files_trashbin/tests/js/filelistSpec.js
+++ b/apps/files_trashbin/tests/js/filelistSpec.js
@@ -212,6 +212,26 @@ describe('OCA.Trashbin.FileList tests', function() {
 	describe('breadcrumbs', function() {
 		// TODO: test label + URL
 	});
+	describe('elementToFile', function() {
+		var $tr;
+
+		beforeEach(function() {
+			fileList.setFiles(testFiles);
+			$tr = fileList.findFileEl('One.txt.d11111');
+		});
+
+		it('converts data attributes to file info structure', function() {
+			var fileInfo = fileList.elementToFile($tr);
+			expect(fileInfo.id).toEqual(1);
+			expect(fileInfo.name).toEqual('One.txt.d11111');
+			expect(fileInfo.displayName).toEqual('One.txt');
+			expect(fileInfo.mtime).toEqual(11111000);
+			expect(fileInfo.etag).toEqual('abc');
+			expect(fileInfo.permissions).toEqual(OC.PERMISSION_READ | OC.PERMISSION_DELETE);
+			expect(fileInfo.mimetype).toEqual('text/plain');
+			expect(fileInfo.type).toEqual('file');
+		});
+	});
 	describe('Global Actions', function() {
 		beforeEach(function() {
 			fileList.setFiles(testFiles);
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 20d6024017..59bd30f434 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -44,6 +44,6 @@ if( $versions ) {
 
 } else {
 
-	\OCP\JSON::success(array('data' => array('versions' => false, 'endReached' => true)));
+	\OCP\JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
 
 }
diff --git a/apps/files_versions/ajax/preview.php b/apps/files_versions/ajax/preview.php
index 8a9a5fba14..2f33f0278e 100644
--- a/apps/files_versions/ajax/preview.php
+++ b/apps/files_versions/ajax/preview.php
@@ -53,7 +53,10 @@ try {
 	$preview->setScalingUp($scalingUp);
 
 	$preview->showPreview();
-}catch(\Exception $e) {
+} catch (\OCP\Files\NotFoundException $e) {
+	\OC_Response::setStatus(404);
+	\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG);
+} catch (\Exception $e) {
 	\OC_Response::setStatus(500);
 	\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG);
 }
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 3bad0d8a94..967f2e73a3 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-OCP\Util::addscript('files_versions', 'versions');
 OCP\Util::addStyle('files_versions', 'versions');
 
 \OCA\Files_Versions\Hooks::connectHooks();
diff --git a/apps/files_versions/appinfo/application.php b/apps/files_versions/appinfo/application.php
index bab36b4851..b61b03dab1 100644
--- a/apps/files_versions/appinfo/application.php
+++ b/apps/files_versions/appinfo/application.php
@@ -22,6 +22,7 @@
 namespace OCA\Files_Versions\AppInfo;
 
 use OCP\AppFramework\App;
+use OCA\Files_Versions\Expiration;
 
 class Application extends App {
 	public function __construct(array $urlParams = array()) {
@@ -33,5 +34,15 @@ class Application extends App {
 		 * Register capabilities
 		 */
 		$container->registerCapability('OCA\Files_Versions\Capabilities');
+
+		/*
+		 * Register expiration
+		 */
+		$container->registerService('Expiration', function($c) {
+			return  new Expiration(
+				$c->query('ServerContainer')->getConfig(),
+				$c->query('OCP\AppFramework\Utility\ITimeFactory')
+			);
+		});
 	}
 }
diff --git a/apps/files_versions/css/versions.css b/apps/files_versions/css/versions.css
index e3ccfc3c86..ec0f0cc989 100644
--- a/apps/files_versions/css/versions.css
+++ b/apps/files_versions/css/versions.css
@@ -1,19 +1,18 @@
-#dropdown.drop-versions {
-	width: 360px;
+.versionsTabView .clear-float {
+	clear: both;
 }
-
-#found_versions li {
+.versionsTabView li {
 	width: 100%;
 	cursor: default;
 	height: 56px;
 	float: left;
 	border-bottom: 1px solid rgba(100,100,100,.1);
 }
-#found_versions li:last-child {
+.versionsTabView li:last-child {
 	border-bottom: none;
 }
 
-#found_versions li > * {
+.versionsTabView li > * {
 	padding: 7px;
 	float: left;
 	vertical-align: top;
@@ -22,34 +21,34 @@
 	opacity: .5;
 }
 
-#found_versions li > a,
-#found_versions li > span {
+.versionsTabView li > a,
+.versionsTabView li > span {
 	padding: 17px 7px;
 }
 
-#found_versions li > *:hover,
-#found_versions li > *:focus {
+.versionsTabView li > *:hover,
+.versionsTabView li > *:focus {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	filter: alpha(opacity=100);
 	opacity: 1;
 }
 
-#found_versions img {
+.versionsTabView img {
 	cursor: pointer;
 	padding-right: 4px;
 }
 
-#found_versions img.preview {
+.versionsTabView img.preview {
 	cursor: default;
 	opacity: 1;
 }
 
-#found_versions .versionDate {
+.versionsTabView .versionDate {
 	min-width: 100px;
 	vertical-align: text-bottom;
 }
 
-#found_versions .revertVersion {
+.versionsTabView .revertVersion {
 	cursor: pointer;
 	float: right;
 	max-width: 130px;
diff --git a/apps/files_versions/js/filesplugin.js b/apps/files_versions/js/filesplugin.js
new file mode 100644
index 0000000000..42075ce646
--- /dev/null
+++ b/apps/files_versions/js/filesplugin.js
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	OCA.Versions = OCA.Versions || {};
+
+	/**
+	 * @namespace
+	 */
+	OCA.Versions.Util = {
+		/**
+		 * Initialize the versions plugin.
+		 *
+		 * @param {OCA.Files.FileList} fileList file list to be extended
+		 */
+		attach: function(fileList) {
+			if (fileList.id === 'trashbin' || fileList.id === 'files.public') {
+				return;
+			}
+
+			fileList.registerTabView(new OCA.Versions.VersionsTabView('versionsTabView'));
+		}
+	};
+})();
+
+OC.Plugins.register('OCA.Files.FileList', OCA.Versions.Util);
+
diff --git a/apps/files_versions/js/versioncollection.js b/apps/files_versions/js/versioncollection.js
new file mode 100644
index 0000000000..3f8214cde8
--- /dev/null
+++ b/apps/files_versions/js/versioncollection.js
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	/**
+	 * @memberof OCA.Versions
+	 */
+	var VersionCollection = OC.Backbone.Collection.extend({
+		model: OCA.Versions.VersionModel,
+
+		/**
+		 * @var OCA.Files.FileInfoModel
+		 */
+		_fileInfo: null,
+
+		_endReached: false,
+		_currentIndex: 0,
+
+		url: function() {
+			var url = OC.generateUrl('/apps/files_versions/ajax/getVersions.php');
+			var query = {
+				source: this._fileInfo.getFullPath(),
+				start: this._currentIndex
+			};
+			return url + '?' + OC.buildQueryString(query);
+		},
+
+		setFileInfo: function(fileInfo) {
+			this._fileInfo = fileInfo;
+			// reset
+			this._endReached = false;
+			this._currentIndex = 0;
+		},
+
+		getFileInfo: function() {
+			return this._fileInfo;
+		},
+
+		hasMoreResults: function() {
+			return !this._endReached;
+		},
+
+		fetch: function(options) {
+			if (!options || options.remove) {
+				this._currentIndex = 0;
+			}
+			return OC.Backbone.Collection.prototype.fetch.apply(this, arguments);
+		},
+
+		/**
+		 * Fetch the next set of results
+		 */
+		fetchNext: function() {
+			if (!this.hasMoreResults()) {
+				return null;
+			}
+			if (this._currentIndex === 0) {
+				return this.fetch();
+			}
+			return this.fetch({remove: false});
+		},
+
+		parse: function(result) {
+			var results = _.map(result.data.versions, function(version) {
+				var revision = parseInt(version.version, 10);
+				return {
+					id: revision,
+					name: version.name,
+					fullPath: version.path,
+					timestamp: revision,
+					size: version.size
+				};
+			});
+			this._endReached = result.data.endReached;
+			this._currentIndex += results.length;
+			return results;
+		}
+	});
+
+	OCA.Versions = OCA.Versions || {};
+
+	OCA.Versions.VersionCollection = VersionCollection;
+})();
+
diff --git a/apps/files_versions/js/versionmodel.js b/apps/files_versions/js/versionmodel.js
new file mode 100644
index 0000000000..dc610fc214
--- /dev/null
+++ b/apps/files_versions/js/versionmodel.js
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	/**
+	 * @memberof OCA.Versions
+	 */
+	var VersionModel = OC.Backbone.Model.extend({
+
+		/**
+		 * Restores the original file to this revision
+		 */
+		revert: function(options) {
+			options = options ? _.clone(options) : {};
+			var model = this;
+			var file = this.getFullPath();
+			var revision = this.get('timestamp');
+
+			$.ajax({
+				type: 'GET',
+				url: OC.generateUrl('/apps/files_versions/ajax/rollbackVersion.php'),
+				dataType: 'json',
+				data: {
+					file: file,
+					revision: revision
+				},
+				success: function(response) {
+					if (response.status === 'error') {
+						if (options.error) {
+							options.error.call(options.context, model, response, options);
+						}
+						model.trigger('error', model, response, options);
+					} else {
+						if (options.success) {
+							options.success.call(options.context, model, response, options);
+						}
+						model.trigger('revert', model, response, options);
+					}
+				}
+			});
+		},
+
+		getFullPath: function() {
+			return this.get('fullPath');
+		},
+
+		getPreviewUrl: function() {
+			var url = OC.generateUrl('/apps/files_versions/preview');
+			var params = {
+				file: this.get('fullPath'),
+				version: this.get('timestamp')
+			};
+			return url + '?' + OC.buildQueryString(params);
+		},
+
+		getDownloadUrl: function() {
+			var url = OC.generateUrl('/apps/files_versions/download.php');
+			var params = {
+				file: this.get('fullPath'),
+				revision: this.get('timestamp')
+			};
+			return url + '?' + OC.buildQueryString(params);
+		}
+	});
+
+	OCA.Versions = OCA.Versions || {};
+
+	OCA.Versions.VersionModel = VersionModel;
+})();
+
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
deleted file mode 100644
index e86bb4c330..0000000000
--- a/apps/files_versions/js/versions.js
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2014
- *
- * This file is licensed under the Affero General Public License version 3
- * or later.
- *
- * See the COPYING-README file.
- *
- */
-
-/* global scanFiles, escapeHTML, formatDate */
-$(document).ready(function(){
-
-	// TODO: namespace all this as OCA.FileVersions
-
-	if ($('#isPublic').val()){
-		// no versions actions in public mode
-		// beware of https://github.com/owncloud/core/issues/4545
-		// as enabling this might hang Chrome
-		return;
-	}
-
-	if (OCA.Files) {
-		// Add versions button to 'files/index.php'
-		OCA.Files.fileActions.register(
-			'file',
-			'Versions',
-			OC.PERMISSION_UPDATE,
-			function() {
-				// Specify icon for hitory button
-				return OC.imagePath('core','actions/history');
-			}, function(filename, context){
-				// Action to perform when clicked
-				if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
-
-				var file = context.dir.replace(/(?!<=\/)$|\/$/, '/' + filename);
-				var createDropDown = true;
-				// Check if drop down is already visible for a different file
-				if (($('#dropdown').length > 0) ) {
-					if ( $('#dropdown').hasClass('drop-versions') && file == $('#dropdown').data('file')) {
-						createDropDown = false;
-					}
-					$('#dropdown').slideUp(OC.menuSpeed);
-					$('#dropdown').remove();
-					$('tr').removeClass('mouseOver');
-				}
-
-				if(createDropDown === true) {
-					createVersionsDropdown(filename, file, context.fileList);
-				}
-			}, t('files_versions', 'Versions')
-		);
-	}
-
-	$(document).on("click", 'span[class="revertVersion"]', function() {
-		var revision = $(this).attr('id');
-		var file = $(this).attr('value');
-		revertFile(file, revision);
-	});
-
-});
-
-function revertFile(file, revision) {
-
-	$.ajax({
-		type: 'GET',
-		url: OC.linkTo('files_versions', 'ajax/rollbackVersion.php'),
-		dataType: 'json',
-		data: {file: file, revision: revision},
-		async: false,
-		success: function(response) {
-			if (response.status === 'error') {
-				OC.Notification.show( t('files_version', 'Failed to revert {file} to revision {timestamp}.', {file:file, timestamp:formatDate(revision * 1000)}) );
-			} else {
-				$('#dropdown').slideUp(OC.menuSpeed, function() {
-					$('#dropdown').closest('tr').find('.modified:first').html(relative_modified_date(revision));
-					$('#dropdown').remove();
-					$('tr').removeClass('mouseOver');
-				});
-			}
-		}
-	});
-
-}
-
-function goToVersionPage(url){
-	window.location.assign(url);
-}
-
-function createVersionsDropdown(filename, files, fileList) {
-
-	var start = 0;
-	var fileEl;
-
-	var html = '<div id="dropdown" class="drop drop-versions" data-file="'+escapeHTML(files)+'">';
-	html += '<div id="private">';
-	html += '<ul id="found_versions">';
-	html += '</ul>';
-	html += '</div>';
-	html += '<input type="button" value="'+ t('files_versions', 'More versions...') + '" name="show-more-versions" id="show-more-versions" style="display: none;" />';
-
-	if (filename) {
-		fileEl = fileList.findFileEl(filename);
-		fileEl.addClass('mouseOver');
-		$(html).appendTo(fileEl.find('td.filename'));
-	} else {
-		$(html).appendTo($('thead .share'));
-	}
-
-	getVersions(start);
-	start = start + 5;
-
-	$("#show-more-versions").click(function() {
-		//get more versions
-		getVersions(start);
-		start = start + 5;
-	});
-
-	function getVersions(start) {
-		$.ajax({
-			type: 'GET',
-			url: OC.filePath('files_versions', 'ajax', 'getVersions.php'),
-			dataType: 'json',
-			data: {source: files, start: start},
-			async: false,
-			success: function(result) {
-				var versions = result.data.versions;
-				if (result.data.endReached === true) {
-					$("#show-more-versions").css("display", "none");
-				} else {
-					$("#show-more-versions").css("display", "block");
-				}
-				if (versions) {
-					$.each(versions, function(index, row) {
-						addVersion(row);
-					});
-				} else {
-					$('<div style="text-align:center;">'+ t('files_versions', 'No other versions available') + '</div>').appendTo('#dropdown');
-				}
-				$('#found_versions').change(function() {
-					var revision = parseInt($(this).val());
-					revertFile(files, revision);
-				});
-			}
-		});
-	}
-
-	function addVersion( revision ) {
-		var title = formatDate(revision.version*1000);
-		var name ='<span class="versionDate" title="' + title + '">' + revision.humanReadableTimestamp + '</span>';
-
-		var path = OC.filePath('files_versions', '', 'download.php');
-
-		var preview = '<img class="preview" src="'+revision.preview+'"/>';
-
-		var download ='<a href="' + path + "?file=" + encodeURIComponent(files) + '&revision=' + revision.version + '">';
-		download+='<img';
-		download+=' src="' + OC.imagePath('core', 'actions/download') + '"';
-		download+=' name="downloadVersion" />';
-		download+=name;
-		download+='</a>';
-
-		var revert='<span class="revertVersion"';
-		revert+=' id="' + revision.version + '">';
-		revert+='<img';
-		revert+=' src="' + OC.imagePath('core', 'actions/history') + '"';
-		revert+=' name="revertVersion"';
-		revert+='/>'+t('files_versions', 'Restore')+'</span>';
-
-		var version=$('<li/>');
-		version.attr('value', revision.version);
-		version.html(preview + download + revert);
-		// add file here for proper name escaping
-		version.find('span.revertVersion').attr('value', files);
-
-		version.appendTo('#found_versions');
-	}
-
-	$('#dropdown').slideDown(1000);
-}
-
-$(this).click(
-	function(event) {
-	if ($('#dropdown').has(event.target).length === 0 && $('#dropdown').hasClass('drop-versions')) {
-		$('#dropdown').slideUp(OC.menuSpeed, function() {
-			$('#dropdown').remove();
-			$('tr').removeClass('mouseOver');
-		});
-	}
-
-
-	}
-);
diff --git a/apps/files_versions/js/versionstabview.js b/apps/files_versions/js/versionstabview.js
new file mode 100644
index 0000000000..1f84428e61
--- /dev/null
+++ b/apps/files_versions/js/versionstabview.js
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+(function() {
+	var TEMPLATE_ITEM =
+		'<li data-revision="{{timestamp}}">' +
+		'<img class="preview" src="{{previewUrl}}"/>' +
+		'<a href="{{downloadUrl}}" class="downloadVersion"><img src="{{downloadIconUrl}}" />' +
+		'<span class="versiondate has-tooltip" title="{{formattedTimestamp}}">{{relativeTimestamp}}</span>' +
+		'</a>' +
+		'<a href="#" class="revertVersion"><img src="{{revertIconUrl}}" />{{revertLabel}}</a>' +
+		'</li>';
+
+	var TEMPLATE =
+		'<ul class="versions"></ul>' +
+		'<div class="clear-float"></div>' +
+		'<div class="empty hidden">{{emptyResultLabel}}</div>' +
+		'<input type="button" class="showMoreVersions hidden" value="{{moreVersionsLabel}}"' +
+		' name="show-more-versions" id="show-more-versions" />' +
+		'<div class="loading hidden" style="height: 50px"></div>';
+
+	/**
+	 * @memberof OCA.Versions
+	 */
+	var VersionsTabView = OCA.Files.DetailTabView.extend(
+		/** @lends OCA.Versions.VersionsTabView.prototype */ {
+		id: 'versionsTabView',
+		className: 'tab versionsTabView',
+
+		_template: null,
+
+		$versionsContainer: null,
+
+		events: {
+			'click .revertVersion': '_onClickRevertVersion',
+			'click .showMoreVersions': '_onClickShowMoreVersions'
+		},
+
+		initialize: function() {
+			this.collection = new OCA.Versions.VersionCollection();
+			this.collection.on('request', this._onRequest, this);
+			this.collection.on('sync', this._onEndRequest, this);
+			this.collection.on('update', this._onUpdate, this);
+			this.collection.on('error', this._onError, this);
+			this.collection.on('add', this._onAddModel, this);
+		},
+
+		getLabel: function() {
+			return t('files_versions', 'Versions');
+		},
+
+		nextPage: function() {
+			if (this._loading || !this.collection.hasMoreResults()) {
+				return;
+			}
+
+			if (this.collection.getFileInfo() && this.collection.getFileInfo().isDirectory()) {
+				return;
+			}
+			this.collection.fetchNext();
+		},
+
+		_onClickShowMoreVersions: function(ev) {
+			ev.preventDefault();
+			this.nextPage();
+		},
+
+		_onClickRevertVersion: function(ev) {
+			var self = this;
+			var $target = $(ev.target);
+			var fileInfoModel = this.collection.getFileInfo();
+			var revision;
+			if (!$target.is('li')) {
+				$target = $target.closest('li');
+			}
+
+			ev.preventDefault();
+			revision = $target.attr('data-revision');
+
+			var versionModel = this.collection.get(revision);
+			versionModel.revert({
+				success: function() {
+					// reset and re-fetch the updated collection
+					self.collection.setFileInfo(fileInfoModel);
+					self.collection.fetch();
+
+					// update original model
+					fileInfoModel.trigger('busy', fileInfoModel, false);
+					fileInfoModel.set({
+						size: versionModel.get('size'),
+						mtime: versionModel.get('timestamp') * 1000,
+						// temp dummy, until we can do a PROPFIND
+						etag: versionModel.get('id') + versionModel.get('timestamp')
+					});
+				},
+
+				error: function() {
+					OC.Notification.showTemporary(
+						t('files_version', 'Failed to revert {file} to revision {timestamp}.', {
+							file: versionModel.getFullPath(),
+							timestamp: OC.Util.formatDate(versionModel.get('timestamp') * 1000)
+						})
+					);
+				}
+			});
+
+			// spinner
+			this._toggleLoading(true);
+			fileInfoModel.trigger('busy', fileInfoModel, true);
+		},
+
+		_toggleLoading: function(state) {
+			this._loading = state;
+			this.$el.find('.loading').toggleClass('hidden', !state);
+		},
+
+		_onRequest: function() {
+			this._toggleLoading(true);
+			this.$el.find('.showMoreVersions').addClass('hidden');
+		},
+
+		_onEndRequest: function() {
+			this._toggleLoading(false);
+			this.$el.find('.empty').toggleClass('hidden', !!this.collection.length);
+			this.$el.find('.showMoreVersions').toggleClass('hidden', !this.collection.hasMoreResults());
+		},
+
+		_onAddModel: function(model) {
+			this.$versionsContainer.append(this.itemTemplate(this._formatItem(model)));
+		},
+
+		template: function(data) {
+			if (!this._template) {
+				this._template = Handlebars.compile(TEMPLATE);
+			}
+
+			return this._template(data);
+		},
+
+		itemTemplate: function(data) {
+			if (!this._itemTemplate) {
+				this._itemTemplate = Handlebars.compile(TEMPLATE_ITEM);
+			}
+
+			return this._itemTemplate(data);
+		},
+
+		setFileInfo: function(fileInfo) {
+			if (fileInfo) {
+				this.render();
+				this.collection.setFileInfo(fileInfo);
+				this.collection.reset({silent: true});
+				this.nextPage();
+			} else {
+				this.render();
+				this.collection.reset();
+			}
+		},
+
+		_formatItem: function(version) {
+			var timestamp = version.get('timestamp') * 1000;
+			return _.extend({
+				formattedTimestamp: OC.Util.formatDate(timestamp),
+				relativeTimestamp: OC.Util.relativeModifiedDate(timestamp),
+				downloadUrl: version.getDownloadUrl(),
+				downloadIconUrl: OC.imagePath('core', 'actions/download'),
+				revertIconUrl: OC.imagePath('core', 'actions/history'),
+				previewUrl: version.getPreviewUrl(),
+				revertLabel: t('files_versions', 'Restore'),
+			}, version.attributes);
+		},
+
+		/**
+		 * Renders this details view
+		 */
+		render: function() {
+			this.$el.html(this.template({
+				emptyResultLabel: t('files_versions', 'No other versions available'),
+				moreVersionsLabel: t('files_versions', 'More versions...')
+			}));
+			this.$el.find('.has-tooltip').tooltip();
+			this.$versionsContainer = this.$el.find('ul.versions');
+			this.delegateEvents();
+		}
+	});
+
+	OCA.Versions = OCA.Versions || {};
+
+	OCA.Versions.VersionsTabView = VersionsTabView;
+})();
+
diff --git a/apps/files_versions/l10n/de_CH.js b/apps/files_versions/l10n/de_CH.js
deleted file mode 100644
index 9e970501fb..0000000000
--- a/apps/files_versions/l10n/de_CH.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "files_versions",
-    {
-    "Could not revert: %s" : "Konnte %s nicht zurücksetzen",
-    "Versions" : "Versionen",
-    "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgänging machen.",
-    "More versions..." : "Mehrere Versionen...",
-    "No other versions available" : "Keine anderen Versionen verfügbar",
-    "Restore" : "Wiederherstellen"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/de_CH.json b/apps/files_versions/l10n/de_CH.json
deleted file mode 100644
index 8d4b76f8c2..0000000000
--- a/apps/files_versions/l10n/de_CH.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "Could not revert: %s" : "Konnte %s nicht zurücksetzen",
-    "Versions" : "Versionen",
-    "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgänging machen.",
-    "More versions..." : "Mehrere Versionen...",
-    "No other versions available" : "Keine anderen Versionen verfügbar",
-    "Restore" : "Wiederherstellen"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/is.js b/apps/files_versions/l10n/is.js
index bbfe2f42ab..69ce27ca3e 100644
--- a/apps/files_versions/l10n/is.js
+++ b/apps/files_versions/l10n/is.js
@@ -1,6 +1,11 @@
 OC.L10N.register(
     "files_versions",
     {
-    "Versions" : "Útgáfur"
+    "Could not revert: %s" : "Gat ekki endurheimt: %s",
+    "Versions" : "Útgáfur",
+    "Failed to revert {file} to revision {timestamp}." : "Mistókst að endurheimta {file} útgáfu {timestamp}.",
+    "More versions..." : "Fleiri útgáfur ...",
+    "No other versions available" : "Engar aðrar útgáfur í boði",
+    "Restore" : "Endurheimta"
 },
-"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);");
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/files_versions/l10n/is.json b/apps/files_versions/l10n/is.json
index 11d9d3383b..3059c07e1f 100644
--- a/apps/files_versions/l10n/is.json
+++ b/apps/files_versions/l10n/is.json
@@ -1,4 +1,9 @@
 { "translations": {
-    "Versions" : "Útgáfur"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"
+    "Could not revert: %s" : "Gat ekki endurheimt: %s",
+    "Versions" : "Útgáfur",
+    "Failed to revert {file} to revision {timestamp}." : "Mistókst að endurheimta {file} útgáfu {timestamp}.",
+    "More versions..." : "Fleiri útgáfur ...",
+    "No other versions available" : "Engar aðrar útgáfur í boði",
+    "Restore" : "Endurheimta"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/files_versions/lib/expiration.php b/apps/files_versions/lib/expiration.php
new file mode 100644
index 0000000000..d42c62f0ee
--- /dev/null
+++ b/apps/files_versions/lib/expiration.php
@@ -0,0 +1,185 @@
+<?php
+/**
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_Versions;
+
+use \OCP\IConfig;
+use \OCP\AppFramework\Utility\ITimeFactory;
+
+class Expiration {
+
+	// how long do we keep files a version if no other value is defined in the config file (unit: days)
+	const NO_OBLIGATION = -1;
+
+	/** @var ITimeFactory */
+	private $timeFactory;
+
+	/** @var string */
+	private $retentionObligation;
+
+	/** @var int */
+	private $minAge;
+
+	/** @var int */
+	private $maxAge;
+
+	/** @var bool */
+	private $canPurgeToSaveSpace;
+
+	public function __construct(IConfig $config,ITimeFactory $timeFactory){
+		$this->timeFactory = $timeFactory;
+		$this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto');
+
+		if ($this->retentionObligation !== 'disabled') {
+			$this->parseRetentionObligation();
+		}
+	}
+
+	/**
+	 * Is versions expiration enabled
+	 * @return bool
+	 */
+	public function isEnabled(){
+		return $this->retentionObligation !== 'disabled';
+	}
+
+	/**
+	 * Is default expiration active
+	 */
+	public function shouldAutoExpire(){
+		return $this->minAge === self::NO_OBLIGATION
+				|| $this->maxAge === self::NO_OBLIGATION;
+	}
+
+	/**
+	 * Check if given timestamp in expiration range
+	 * @param int $timestamp
+	 * @param bool $quotaExceeded
+	 * @return bool
+	 */
+	public function isExpired($timestamp, $quotaExceeded = false){
+		// No expiration if disabled
+		if (!$this->isEnabled()) {
+			return false;
+		}
+
+		// Purge to save space (if allowed)
+		if ($quotaExceeded && $this->canPurgeToSaveSpace) {
+			return true;
+		}
+
+		$time = $this->timeFactory->getTime();
+		// Never expire dates in future e.g. misconfiguration or negative time
+		// adjustment
+		if ($time<$timestamp) {
+			return false;
+		}
+
+		// Purge as too old
+		if ($this->maxAge !== self::NO_OBLIGATION) {
+			$maxTimestamp = $time - ($this->maxAge * 86400);
+			$isOlderThanMax = $timestamp < $maxTimestamp;
+		} else {
+			$isOlderThanMax = false;
+		}
+
+		if ($this->minAge !== self::NO_OBLIGATION) {
+			// older than Min obligation and we are running out of quota?
+			$minTimestamp = $time - ($this->minAge * 86400);
+			$isMinReached = ($timestamp < $minTimestamp) && $quotaExceeded;
+		} else {
+			$isMinReached = false;
+		}
+
+		return $isOlderThanMax || $isMinReached;
+	}
+
+	/**
+	* Read versions_retention_obligation, validate it 
+	* and set private members accordingly
+	*/
+	private function parseRetentionObligation(){
+		$splitValues = explode(',', $this->retentionObligation);
+		if (!isset($splitValues[0])) {
+			$minValue = 'auto';
+		} else {
+			$minValue = trim($splitValues[0]);
+		}
+
+		if (!isset($splitValues[1])) {
+			$maxValue = self::NO_OBLIGATION;
+		} else {
+			$maxValue = trim($splitValues[1]);
+		}
+
+		$isValid = true;
+		// Validate
+		if (!ctype_digit($minValue) && $minValue !== 'auto') {
+			$isValid = false;
+			\OC::$server->getLogger()->warning(
+					$minValue . ' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
+					['app'=>'files_versions']
+			);
+		}
+
+		if (!ctype_digit($maxValue) && $maxValue !== 'auto') {
+			$isValid = false;
+			\OC::$server->getLogger()->warning(
+					$maxValue . ' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.',
+					['app'=>'files_versions']
+			);
+		}
+
+		if (!$isValid){
+			$minValue = 'auto';
+			$maxValue = 'auto';
+		}
+
+
+		if ($minValue === 'auto' && $maxValue === 'auto') {
+			// Default: Delete anytime if space needed
+			$this->minAge = self::NO_OBLIGATION;
+			$this->maxAge = self::NO_OBLIGATION;
+			$this->canPurgeToSaveSpace = true;
+		} elseif ($minValue !== 'auto' && $maxValue === 'auto') {
+			// Keep for X days but delete anytime if space needed
+			$this->minAge = intval($minValue);
+			$this->maxAge = self::NO_OBLIGATION;
+			$this->canPurgeToSaveSpace = true;
+		} elseif ($minValue === 'auto' && $maxValue !== 'auto') {
+			// Delete anytime if space needed, Delete all older than max automatically
+			$this->minAge = self::NO_OBLIGATION;
+			$this->maxAge = intval($maxValue);
+			$this->canPurgeToSaveSpace = true;
+		} elseif ($minValue !== 'auto' && $maxValue !== 'auto') {
+			// Delete all older than max OR older than min if space needed
+
+			// Max < Min as per https://github.com/owncloud/core/issues/16301
+			if ($maxValue < $minValue) {
+				$maxValue = $minValue;
+			}
+
+			$this->minAge = intval($minValue);
+			$this->maxAge = intval($maxValue);
+			$this->canPurgeToSaveSpace = false;
+		}
+	}
+}
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index ccd89a4a14..5ef2cc3c7d 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -43,6 +43,9 @@ class Hooks {
 		\OCP\Util::connectHook('OC_Filesystem', 'post_copy', 'OCA\Files_Versions\Hooks', 'copy_hook');
 		\OCP\Util::connectHook('OC_Filesystem', 'rename', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
 		\OCP\Util::connectHook('OC_Filesystem', 'copy', 'OCA\Files_Versions\Hooks', 'pre_renameOrCopy_hook');
+
+		$eventDispatcher = \OC::$server->getEventDispatcher();
+		$eventDispatcher->addListener('OCA\Files::loadAdditionalScripts', ['OCA\Files_Versions\Hooks', 'onLoadFilesAppScripts']);
 	}
 
 	/**
@@ -154,4 +157,13 @@ class Hooks {
 		}
 	}
 
+	/**
+	 * Load additional scripts when the files app is visible
+	 */
+	public static function onLoadFilesAppScripts() {
+		\OCP\Util::addScript('files_versions', 'versionmodel');
+		\OCP\Util::addScript('files_versions', 'versioncollection');
+		\OCP\Util::addScript('files_versions', 'versionstabview');
+		\OCP\Util::addScript('files_versions', 'filesplugin');
+	}
 }
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index e0034f6165..ba2b78ff4d 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -40,6 +40,7 @@
 
 namespace OCA\Files_Versions;
 
+use OCA\Files_Versions\AppInfo\Application;
 use OCA\Files_Versions\Command\Expire;
 
 class Storage {
@@ -67,6 +68,9 @@ class Storage {
 		//until the end one version per week
 		6 => array('intervalEndsAfter' => -1,      'step' => 604800),
 	);
+	
+	/** @var \OCA\Files_Versions\AppInfo\Application */
+	private static $application;
 
 	public static function getUidAndFilename($filename) {
 		$uid = \OC\Files\Filesystem::getOwner($filename);
@@ -479,10 +483,36 @@ class Storage {
 	 * get list of files we want to expire
 	 * @param array $versions list of versions
 	 * @param integer $time
+	 * @param bool $quotaExceeded is versions storage limit reached
 	 * @return array containing the list of to deleted versions and the size of them
 	 */
-	protected static function getExpireList($time, $versions) {
+	protected static function getExpireList($time, $versions, $quotaExceeded = false) {
+		$expiration = self::getExpiration();
 
+		if ($expiration->shouldAutoExpire()) {
+			list($toDelete, $size) = self::getAutoExpireList($time, $versions);
+		} else {
+			$size = 0;
+			$toDelete = [];  // versions we want to delete
+		}
+
+		foreach ($versions as $key => $version) {
+			if ($expiration->isExpired($version['version'], $quotaExceeded) && !isset($toDelete[$key])) {
+				$size += $version['size'];
+				$toDelete[$key] = $version['path'] . '.v' . $version['version'];
+			}
+		}
+
+		return [$toDelete, $size];
+	}
+
+	/**
+	 * get list of files we want to expire
+	 * @param array $versions list of versions
+	 * @param integer $time
+	 * @return array containing the list of to deleted versions and the size of them
+	 */
+	protected static function getAutoExpireList($time, $versions) {
 		$size = 0;
 		$toDelete = array();  // versions we want to delete
 
@@ -529,7 +559,6 @@ class Storage {
 		}
 
 		return array($toDelete, $size);
-
 	}
 
 	/**
@@ -541,8 +570,12 @@ class Storage {
 	 * @param int $neededSpace requested versions size
 	 */
 	private static function scheduleExpire($uid, $fileName, $versionsSize = null, $neededSpace = 0) {
-		$command = new Expire($uid, $fileName, $versionsSize, $neededSpace);
-		\OC::$server->getCommandBus()->push($command);
+		// let the admin disable auto expire
+		$expiration = self::getExpiration();
+		if ($expiration->isEnabled()) {
+			$command = new Expire($uid, $fileName, $versionsSize, $neededSpace);
+			\OC::$server->getCommandBus()->push($command);
+		}
 	}
 
 	/**
@@ -555,7 +588,9 @@ class Storage {
 	 */
 	public static function expire($filename, $versionsSize = null, $offset = 0) {
 		$config = \OC::$server->getConfig();
-		if($config->getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+		$expiration = self::getExpiration();
+		
+		if($config->getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' && $expiration->isEnabled()) {
 			list($uid, $filename) = self::getUidAndFilename($filename);
 			if (empty($filename)) {
 				// file maybe renamed or deleted
@@ -599,7 +634,7 @@ class Storage {
 			$allVersions = Storage::getVersions($uid, $filename);
 
 			$time = time();
-			list($toDelete, $sizeOfDeletedVersions) = self::getExpireList($time, $allVersions);
+			list($toDelete, $sizeOfDeletedVersions) = self::getExpireList($time, $allVersions, $availableSpace <= 0);
 
 			$availableSpace = $availableSpace + $sizeOfDeletedVersions;
 			$versionsSize = $versionsSize - $sizeOfDeletedVersions;
@@ -610,7 +645,7 @@ class Storage {
 				$allVersions = $result['all'];
 
 				foreach ($result['by_file'] as $versions) {
-					list($toDeleteNew, $size) = self::getExpireList($time, $versions);
+					list($toDeleteNew, $size) = self::getExpireList($time, $versions, $availableSpace <= 0);
 					$toDelete = array_merge($toDelete, $toDeleteNew);
 					$sizeOfDeletedVersions += $size;
 				}
@@ -672,4 +707,15 @@ class Storage {
 		}
 	}
 
+	/**
+	 * Static workaround
+	 * @return Expiration
+	 */
+	protected static function getExpiration(){
+		if (is_null(self::$application)) {
+			self::$application = new Application();
+		}
+		return self::$application->getContainer()->query('Expiration');
+	}
+
 }
diff --git a/apps/files_versions/tests/expirationtest.php b/apps/files_versions/tests/expirationtest.php
new file mode 100644
index 0000000000..54024b85b7
--- /dev/null
+++ b/apps/files_versions/tests/expirationtest.php
@@ -0,0 +1,204 @@
+<?php
+/**
+ * @author Victor Dubiniuk <dubiniuk@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCA\Files_Versions\Tests;
+
+use \OCA\Files_Versions\Expiration;
+
+class Expiration_Test extends \Test\TestCase {
+	const SECONDS_PER_DAY = 86400; //60*60*24
+
+	public function expirationData(){
+		$today = 100*self::SECONDS_PER_DAY;
+		$back10Days = (100-10)*self::SECONDS_PER_DAY;
+		$back20Days = (100-20)*self::SECONDS_PER_DAY;
+		$back30Days = (100-30)*self::SECONDS_PER_DAY;
+		$back35Days = (100-35)*self::SECONDS_PER_DAY;
+
+		// it should never happen, but who knows :/
+		$ahead100Days = (100+100)*self::SECONDS_PER_DAY;
+
+		return [
+			// Expiration is disabled - always should return false
+			[ 'disabled', $today, $back10Days, false, false],
+			[ 'disabled', $today, $back10Days, true, false],
+			[ 'disabled', $today, $ahead100Days, true, false],
+
+			// Default: expire in 30 days or earlier when quota requirements are met
+			[ 'auto', $today, $back10Days, false, false],
+			[ 'auto', $today, $back35Days, false, false],
+			[ 'auto', $today, $back10Days, true, true],
+			[ 'auto', $today, $back35Days, true, true],
+			[ 'auto', $today, $ahead100Days, true, true],
+
+			// The same with 'auto'
+			[ 'auto, auto', $today, $back10Days, false, false],
+			[ 'auto, auto', $today, $back35Days, false, false],
+			[ 'auto, auto', $today, $back10Days, true, true],
+			[ 'auto, auto', $today, $back35Days, true, true],
+
+			// Keep for 15 days but expire anytime if space needed
+			[ '15, auto', $today, $back10Days, false, false],
+			[ '15, auto', $today, $back20Days, false, false],
+			[ '15, auto', $today, $back10Days, true, true],
+			[ '15, auto', $today, $back20Days, true, true],
+			[ '15, auto', $today, $ahead100Days, true, true],
+
+			// Expire anytime if space needed, Expire all older than max
+			[ 'auto, 15', $today, $back10Days, false, false],
+			[ 'auto, 15', $today, $back20Days, false, true],
+			[ 'auto, 15', $today, $back10Days, true, true],
+			[ 'auto, 15', $today, $back20Days, true, true],
+			[ 'auto, 15', $today, $ahead100Days, true, true],
+
+			// Expire all older than max OR older than min if space needed
+			[ '15, 25', $today, $back10Days, false, false],
+			[ '15, 25', $today, $back20Days, false, false],
+			[ '15, 25', $today, $back30Days, false, true],
+			[ '15, 25', $today, $back10Days, false, false],
+			[ '15, 25', $today, $back20Days, true, true],
+			[ '15, 25', $today, $back30Days, true, true],
+			[ '15, 25', $today, $ahead100Days, true, false],
+
+			// Expire all older than max OR older than min if space needed
+			// Max<Min case
+			[ '25, 15', $today, $back10Days, false, false],
+			[ '25, 15', $today, $back20Days, false, false],
+			[ '25, 15', $today, $back30Days, false, true],
+			[ '25, 15', $today, $back10Days, false, false],
+			[ '25, 15', $today, $back20Days, true, false],
+			[ '25, 15', $today, $back30Days, true, true],
+			[ '25, 15', $today, $ahead100Days, true, false],
+		];
+	}
+
+	/**
+	 * @dataProvider expirationData
+	 *
+	 * @param string $retentionObligation
+	 * @param int $timeNow
+	 * @param int $timestamp
+	 * @param bool $quotaExceeded
+	 * @param string $expectedResult
+	 */
+	public function testExpiration($retentionObligation, $timeNow, $timestamp, $quotaExceeded, $expectedResult){
+		$mockedConfig = $this->getMockedConfig($retentionObligation);
+		$mockedTimeFactory = $this->getMockedTimeFactory($timeNow);
+
+		$expiration = new Expiration($mockedConfig, $mockedTimeFactory);
+		$actualResult = $expiration->isExpired($timestamp, $quotaExceeded);
+
+		$this->assertEquals($expectedResult, $actualResult);
+	}
+
+
+	public function configData(){
+		return [
+			[ 'disabled', null, null, null],
+			[ 'auto', Expiration::NO_OBLIGATION, Expiration::NO_OBLIGATION, true ],
+			[ 'auto,auto', Expiration::NO_OBLIGATION, Expiration::NO_OBLIGATION, true ],
+			[ 'auto, auto', Expiration::NO_OBLIGATION, Expiration::NO_OBLIGATION, true ],
+			[ 'auto, 3', Expiration::NO_OBLIGATION, 3, true ],
+			[ '5, auto', 5, Expiration::NO_OBLIGATION, true ],
+			[ '3, 5', 3, 5, false ],
+			[ '10, 3', 10, 10, false ],
+			[ 'g,a,r,b,a,g,e',  Expiration::NO_OBLIGATION, Expiration::NO_OBLIGATION, true ],
+			[ '-3,8',  Expiration::NO_OBLIGATION, Expiration::NO_OBLIGATION, true ]
+		];
+	}
+
+
+	/**
+	 * @dataProvider configData
+	 *
+	 * @param string $configValue
+	 * @param int $expectedMinAge
+	 * @param int $expectedMaxAge
+	 * @param bool $expectedCanPurgeToSaveSpace
+	 */
+	public function testParseRetentionObligation($configValue, $expectedMinAge, $expectedMaxAge, $expectedCanPurgeToSaveSpace){
+		$mockedConfig = $this->getMockedConfig($configValue);
+		$mockedTimeFactory = $this->getMockedTimeFactory(
+				time()
+		);
+
+		$expiration = new Expiration($mockedConfig, $mockedTimeFactory);
+		$this->assertAttributeEquals($expectedMinAge, 'minAge', $expiration);
+		$this->assertAttributeEquals($expectedMaxAge, 'maxAge', $expiration);
+		$this->assertAttributeEquals($expectedCanPurgeToSaveSpace, 'canPurgeToSaveSpace', $expiration);
+	}
+
+	/**
+	 *
+	 * @param int $time
+	 * @return \OCP\AppFramework\Utility\ITimeFactory
+	 */
+	private function getMockedTimeFactory($time){
+		$mockedTimeFactory = $this->getMockBuilder('\OCP\AppFramework\Utility\ITimeFactory')
+				->disableOriginalConstructor()
+				->setMethods(['getTime'])
+				->getMock()
+		;
+		$mockedTimeFactory->expects($this->any())->method('getTime')->will(
+				$this->returnValue($time)
+		);
+
+		return $mockedTimeFactory;
+	}
+
+	/**
+	 *
+	 * @param string $returnValue
+	 * @return \OCP\IConfig
+	 */
+	private function getMockedConfig($returnValue){
+		$mockedConfig = $this->getMockBuilder('\OCP\IConfig')
+				->disableOriginalConstructor()
+				->setMethods(
+					[
+						'setSystemValues',
+						'setSystemValue',
+						'getSystemValue',
+						'deleteSystemValue',
+						'getAppKeys',
+						'setAppValue',
+						'getAppValue',
+						'deleteAppValue',
+						'deleteAppValues',
+						'setUserValue',
+						'getUserValue',
+						'getUserValueForUsers',
+						'getUserKeys',
+						'deleteUserValue',
+						'deleteAllUserValues',
+						'deleteAppFromAllUsers',
+						'getUsersForUserValue'
+					]
+				)
+				->getMock()
+		;
+		$mockedConfig->expects($this->any())->method('getSystemValue')->will(
+				$this->returnValue($returnValue)
+		);
+
+		return $mockedConfig;
+	}
+}
diff --git a/apps/files_versions/tests/js/versioncollectionSpec.js b/apps/files_versions/tests/js/versioncollectionSpec.js
new file mode 100644
index 0000000000..87065fa1d3
--- /dev/null
+++ b/apps/files_versions/tests/js/versioncollectionSpec.js
@@ -0,0 +1,161 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+describe('OCA.Versions.VersionCollection', function() {
+	var VersionCollection = OCA.Versions.VersionCollection;
+	var collection, fileInfoModel;
+
+	beforeEach(function() {
+		fileInfoModel = new OCA.Files.FileInfoModel({
+			path: '/subdir',
+			name: 'some file.txt'
+		});
+		collection = new VersionCollection();
+		collection.setFileInfo(fileInfoModel);
+	});
+	it('fetches the next page', function() {
+		collection.fetchNext();
+
+		expect(fakeServer.requests.length).toEqual(1);
+		expect(fakeServer.requests[0].url).toEqual(
+			OC.generateUrl('apps/files_versions/ajax/getVersions.php') +
+			'?source=%2Fsubdir%2Fsome%20file.txt&start=0'
+		);
+		fakeServer.requests[0].respond(
+			200,
+			{ 'Content-Type': 'application/json' },
+			JSON.stringify({
+				status: 'success',
+				data: {
+					endReached: false,
+					versions: [{
+						version: 10000000,
+						size: 123,
+						name: 'some file.txt',
+						fullPath: '/subdir/some file.txt'
+					},{
+						version: 15000000,
+						size: 150,
+						name: 'some file.txt',
+						path: '/subdir/some file.txt'
+					}]
+				}
+			})
+		);
+
+		expect(collection.length).toEqual(2);
+		expect(collection.hasMoreResults()).toEqual(true);
+
+		collection.fetchNext();
+
+		expect(fakeServer.requests.length).toEqual(2);
+		expect(fakeServer.requests[1].url).toEqual(
+			OC.generateUrl('apps/files_versions/ajax/getVersions.php') +
+			'?source=%2Fsubdir%2Fsome%20file.txt&start=2'
+		);
+		fakeServer.requests[1].respond(
+			200,
+			{ 'Content-Type': 'application/json' },
+			JSON.stringify({
+				status: 'success',
+				data: {
+					endReached: true,
+					versions: [{
+						version: 18000000,
+						size: 123,
+						name: 'some file.txt',
+						path: '/subdir/some file.txt'
+					}]
+				}
+			})
+		);
+
+		expect(collection.length).toEqual(3);
+		expect(collection.hasMoreResults()).toEqual(false);
+
+		collection.fetchNext();
+
+		// no further requests
+		expect(fakeServer.requests.length).toEqual(2);
+	});
+	it('properly parses the results', function() {
+		collection.fetchNext();
+
+		expect(fakeServer.requests.length).toEqual(1);
+		expect(fakeServer.requests[0].url).toEqual(
+			OC.generateUrl('apps/files_versions/ajax/getVersions.php') +
+			'?source=%2Fsubdir%2Fsome%20file.txt&start=0'
+		);
+		fakeServer.requests[0].respond(
+			200,
+			{ 'Content-Type': 'application/json' },
+			JSON.stringify({
+				status: 'success',
+				data: {
+					endReached: false,
+					versions: [{
+						version: 10000000,
+						size: 123,
+						name: 'some file.txt',
+						path: '/subdir/some file.txt'
+					},{
+						version: 15000000,
+						size: 150,
+						name: 'some file.txt',
+						path: '/subdir/some file.txt'
+					}]
+				}
+			})
+		);
+
+		expect(collection.length).toEqual(2);
+
+		var model = collection.at(0);
+		expect(model.get('id')).toEqual(10000000);
+		expect(model.get('timestamp')).toEqual(10000000);
+		expect(model.get('name')).toEqual('some file.txt');
+		expect(model.get('fullPath')).toEqual('/subdir/some file.txt');
+		expect(model.get('size')).toEqual(123);
+
+		model = collection.at(1);
+		expect(model.get('id')).toEqual(15000000);
+		expect(model.get('timestamp')).toEqual(15000000);
+		expect(model.get('name')).toEqual('some file.txt');
+		expect(model.get('fullPath')).toEqual('/subdir/some file.txt');
+		expect(model.get('size')).toEqual(150);
+	});
+	it('resets page counted when setting a new file info model', function() {
+		collection.fetchNext();
+
+		expect(fakeServer.requests.length).toEqual(1);
+		fakeServer.requests[0].respond(
+			200,
+			{ 'Content-Type': 'application/json' },
+			JSON.stringify({
+				status: 'success',
+				data: {
+					endReached: true,
+					versions: [{
+						version: 18000000,
+						size: 123,
+						name: 'some file.txt',
+						path: '/subdir/some file.txt'
+					}]
+				}
+			})
+		);
+
+		expect(collection.hasMoreResults()).toEqual(false);
+
+		collection.setFileInfo(fileInfoModel);
+
+		expect(collection.hasMoreResults()).toEqual(true);
+	});
+});
+
diff --git a/apps/files_versions/tests/js/versionmodelSpec.js b/apps/files_versions/tests/js/versionmodelSpec.js
new file mode 100644
index 0000000000..0f1c06581d
--- /dev/null
+++ b/apps/files_versions/tests/js/versionmodelSpec.js
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+describe('OCA.Versions.VersionModel', function() {
+	var VersionModel = OCA.Versions.VersionModel;
+	var model;
+
+	beforeEach(function() {
+		model = new VersionModel({
+			id: 10000000,
+			timestamp: 10000000,
+			fullPath: '/subdir/some file.txt',
+			name: 'some file.txt',
+			size: 150
+		});
+	});
+
+	it('returns the full path', function() {
+		expect(model.getFullPath()).toEqual('/subdir/some file.txt');
+	});
+	it('returns the preview url', function() {
+		expect(model.getPreviewUrl())
+			.toEqual(OC.generateUrl('/apps/files_versions/preview') +
+					'?file=%2Fsubdir%2Fsome%20file.txt&version=10000000'
+			);
+	});
+	it('returns the download url', function() {
+		expect(model.getDownloadUrl())
+			.toEqual(OC.generateUrl('/apps/files_versions/download.php') +
+					'?file=%2Fsubdir%2Fsome%20file.txt&revision=10000000'
+			);
+	});
+	describe('reverting', function() {
+		var revertEventStub;
+		var successStub;
+		var errorStub;
+
+		beforeEach(function() {
+			revertEventStub = sinon.stub();
+			errorStub = sinon.stub();
+			successStub = sinon.stub();
+
+			model.on('revert', revertEventStub);
+			model.on('error', errorStub);
+		});
+		it('tells the server to revert when calling the revert method', function() {
+			model.revert({
+				success: successStub
+			});
+
+			expect(fakeServer.requests.length).toEqual(1);
+			expect(fakeServer.requests[0].url)
+				.toEqual(
+					OC.generateUrl('/apps/files_versions/ajax/rollbackVersion.php') +
+					'?file=%2Fsubdir%2Fsome+file.txt&revision=10000000'
+				);
+
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					status: 'success',
+				})
+			);
+
+			expect(revertEventStub.calledOnce).toEqual(true);
+			expect(successStub.calledOnce).toEqual(true);
+			expect(errorStub.notCalled).toEqual(true);
+		});
+		it('triggers error event when server returns a failure', function() {
+			model.revert({
+				success: successStub
+			});
+
+			expect(fakeServer.requests.length).toEqual(1);
+			fakeServer.requests[0].respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					status: 'error',
+				})
+			);
+
+			expect(revertEventStub.notCalled).toEqual(true);
+			expect(successStub.notCalled).toEqual(true);
+			expect(errorStub.calledOnce).toEqual(true);
+		});
+	});
+});
+
diff --git a/apps/files_versions/tests/js/versionstabviewSpec.js b/apps/files_versions/tests/js/versionstabviewSpec.js
new file mode 100644
index 0000000000..4435f38ef7
--- /dev/null
+++ b/apps/files_versions/tests/js/versionstabviewSpec.js
@@ -0,0 +1,208 @@
+/*
+ * Copyright (c) 2015
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+describe('OCA.Versions.VersionsTabView', function() {
+	var VersionCollection = OCA.Versions.VersionCollection;
+	var VersionModel = OCA.Versions.VersionModel;
+	var VersionsTabView = OCA.Versions.VersionsTabView;
+
+	var fetchStub, fileInfoModel, tabView, testVersions, clock;
+
+	beforeEach(function() {
+		clock = sinon.useFakeTimers(Date.UTC(2015, 6, 17, 1, 2, 0, 3));
+		var time1 = Date.UTC(2015, 6, 17, 1, 2, 0, 3) / 1000;
+		var time2 = Date.UTC(2015, 6, 15, 1, 2, 0, 3) / 1000;
+
+		var version1 = new VersionModel({
+			id: time1,
+			timestamp: time1,
+			name: 'some file.txt',
+			size: 140,
+			fullPath: '/subdir/some file.txt'
+		});
+		var version2 = new VersionModel({
+			id: time2,
+			timestamp: time2,
+			name: 'some file.txt',
+			size: 150,
+			fullPath: '/subdir/some file.txt'
+		});
+
+		testVersions = [version1, version2];
+
+		fetchStub = sinon.stub(VersionCollection.prototype, 'fetch');
+		fileInfoModel = new OCA.Files.FileInfoModel({
+			id: 123,
+			name: 'test.txt'
+		});
+		tabView = new VersionsTabView();
+		tabView.render();
+	});
+
+	afterEach(function() {
+		fetchStub.restore();
+		tabView.remove();
+		clock.restore();
+	});
+
+	describe('rendering', function() {
+		it('reloads matching versions when setting file info model', function() {
+			tabView.setFileInfo(fileInfoModel);
+			expect(fetchStub.calledOnce).toEqual(true);
+		});
+
+		it('renders loading icon while fetching versions', function() {
+			tabView.setFileInfo(fileInfoModel);
+			tabView.collection.trigger('request');
+
+			expect(tabView.$el.find('.loading').length).toEqual(1);
+			expect(tabView.$el.find('.versions li').length).toEqual(0);
+		});
+
+		it('renders versions', function() {
+
+			tabView.setFileInfo(fileInfoModel);
+			tabView.collection.set(testVersions);
+
+			var version1 = testVersions[0];
+			var version2 = testVersions[1];
+			var $versions = tabView.$el.find('.versions>li');
+			expect($versions.length).toEqual(2);
+			var $item = $versions.eq(0);
+			expect($item.find('.downloadVersion').attr('href')).toEqual(version1.getDownloadUrl());
+			expect($item.find('.versiondate').text()).toEqual('a few seconds ago');
+			expect($item.find('.revertVersion').length).toEqual(1);
+			expect($item.find('.preview').attr('src')).toEqual(version1.getPreviewUrl());
+
+			$item = $versions.eq(1);
+			expect($item.find('.downloadVersion').attr('href')).toEqual(version2.getDownloadUrl());
+			expect($item.find('.versiondate').text()).toEqual('2 days ago');
+			expect($item.find('.revertVersion').length).toEqual(1);
+			expect($item.find('.preview').attr('src')).toEqual(version2.getPreviewUrl());
+		});
+	});
+
+	describe('More versions', function() {
+		var hasMoreResultsStub;
+
+		beforeEach(function() {
+			tabView.collection.set(testVersions);
+			hasMoreResultsStub = sinon.stub(VersionCollection.prototype, 'hasMoreResults');
+		});
+		afterEach(function() {
+			hasMoreResultsStub.restore();
+		});
+
+		it('shows "More versions" button when more versions are available', function() {
+			hasMoreResultsStub.returns(true);
+			tabView.collection.trigger('sync');
+
+			expect(tabView.$el.find('.showMoreVersions').hasClass('hidden')).toEqual(false);
+		});
+		it('does not show "More versions" button when more versions are available', function() {
+			hasMoreResultsStub.returns(false);
+			tabView.collection.trigger('sync');
+
+			expect(tabView.$el.find('.showMoreVersions').hasClass('hidden')).toEqual(true);
+		});
+		it('fetches and appends the next page when clicking the "More" button', function() {
+			hasMoreResultsStub.returns(true);
+
+			expect(fetchStub.notCalled).toEqual(true);
+
+			tabView.$el.find('.showMoreVersions').click();
+
+			expect(fetchStub.calledOnce).toEqual(true);
+		});
+		it('appends version to the list when added to collection', function() {
+			var time3 = Date.UTC(2015, 6, 10, 1, 0, 0, 0) / 1000;
+
+			var version3 = new VersionModel({
+				id: time3,
+				timestamp: time3,
+				name: 'some file.txt',
+				size: 54,
+				fullPath: '/subdir/some file.txt'
+			});
+
+			tabView.collection.add(version3);
+
+			expect(tabView.$el.find('.versions>li').length).toEqual(3);
+
+			var $item = tabView.$el.find('.versions>li').eq(2);
+			expect($item.find('.downloadVersion').attr('href')).toEqual(version3.getDownloadUrl());
+			expect($item.find('.versiondate').text()).toEqual('7 days ago');
+			expect($item.find('.revertVersion').length).toEqual(1);
+			expect($item.find('.preview').attr('src')).toEqual(version3.getPreviewUrl());
+		});
+	});
+
+	describe('Reverting', function() {
+		var revertStub;
+
+		beforeEach(function() {
+			revertStub = sinon.stub(VersionModel.prototype, 'revert');
+			tabView.setFileInfo(fileInfoModel);
+			tabView.collection.set(testVersions);
+		});
+		
+		afterEach(function() {
+			revertStub.restore();
+		});
+
+		it('tells the model to revert when clicking "Revert"', function() {
+			tabView.$el.find('.revertVersion').eq(1).click();
+
+			expect(revertStub.calledOnce).toEqual(true);
+		});
+		it('triggers busy state during revert', function() {
+			var busyStub = sinon.stub();
+			fileInfoModel.on('busy', busyStub);
+
+			tabView.$el.find('.revertVersion').eq(1).click();
+
+			expect(busyStub.calledOnce).toEqual(true);
+			expect(busyStub.calledWith(fileInfoModel, true)).toEqual(true);
+
+			busyStub.reset();
+			revertStub.getCall(0).args[0].success();
+
+			expect(busyStub.calledOnce).toEqual(true);
+			expect(busyStub.calledWith(fileInfoModel, false)).toEqual(true);
+		});
+		it('updates the file info model with the information from the reverted revision', function() {
+			var changeStub = sinon.stub();
+			fileInfoModel.on('change', changeStub);
+
+			tabView.$el.find('.revertVersion').eq(1).click();
+
+			expect(changeStub.notCalled).toEqual(true);
+
+			revertStub.getCall(0).args[0].success();
+
+			expect(changeStub.calledOnce).toEqual(true);
+			var changes = changeStub.getCall(0).args[0].changed;
+			expect(changes.size).toEqual(150);
+			expect(changes.mtime).toEqual(testVersions[1].get('timestamp') * 1000);
+			expect(changes.etag).toBeDefined();
+		});
+		it('shows notification on revert error', function() {
+			var notificationStub = sinon.stub(OC.Notification, 'showTemporary');
+
+			tabView.$el.find('.revertVersion').eq(1).click();
+
+			revertStub.getCall(0).args[0].error();
+
+			expect(notificationStub.calledOnce).toEqual(true);
+
+			notificationStub.restore();
+		});
+	});
+});
+
diff --git a/apps/provisioning_api/lib/apps.php b/apps/provisioning_api/lib/apps.php
index 168f6f3cad..80f6e7049c 100644
--- a/apps/provisioning_api/lib/apps.php
+++ b/apps/provisioning_api/lib/apps.php
@@ -31,13 +31,20 @@ class Apps {
 	/** @var \OCP\App\IAppManager */
 	private $appManager;
 
+	/**
+	 * @param \OCP\App\IAppManager $appManager
+	 */
 	public function __construct(\OCP\App\IAppManager $appManager) {
 		$this->appManager = $appManager;
 	}
 
-	public function getApps($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function getApps($parameters) {
 		$apps = OC_App::listAllApps();
-		$list = array();
+		$list = [];
 		foreach($apps as $app) {
 			$list[] = $app['id'];
 		}
@@ -62,7 +69,11 @@ class Apps {
 		}
 	}
 
-	public function getAppInfo($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function getAppInfo($parameters) {
 		$app = $parameters['appid'];
 		$info = \OCP\App::getAppInfo($app);
 		if(!is_null($info)) {
@@ -72,13 +83,21 @@ class Apps {
 		}
 	}
 
-	public function enable($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function enable($parameters) {
 		$app = $parameters['appid'];
 		$this->appManager->enableApp($app);
 		return new OC_OCS_Result(null, 100);
 	}
 
-	public function disable($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function disable($parameters) {
 		$app = $parameters['appid'];
 		$this->appManager->disableApp($app);
 		return new OC_OCS_Result(null, 100);
diff --git a/apps/provisioning_api/lib/groups.php b/apps/provisioning_api/lib/groups.php
index 91d0a1c634..c6fbe12b34 100644
--- a/apps/provisioning_api/lib/groups.php
+++ b/apps/provisioning_api/lib/groups.php
@@ -25,6 +25,8 @@ namespace OCA\Provisioning_API;
 
 use \OC_OCS_Result;
 use \OC_SubAdmin;
+use OCP\IGroup;
+use OCP\IUser;
 
 class Groups{
 
@@ -39,21 +41,25 @@ class Groups{
 	 * @param \OCP\IUserSession $userSession
 	 */
 	public function __construct(\OCP\IGroupManager $groupManager,
-	                            \OCP\IUserSession $userSession) {
+								\OCP\IUserSession $userSession) {
 		$this->groupManager = $groupManager;
 		$this->userSession = $userSession;
 	}
 
 	/**
 	 * returns a list of groups
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
-	public function getGroups($parameters){
+	public function getGroups($parameters) {
 		$search = !empty($_GET['search']) ? $_GET['search'] : '';
 		$limit = !empty($_GET['limit']) ? $_GET['limit'] : null;
 		$offset = !empty($_GET['offset']) ? $_GET['offset'] : null;
 
 		$groups = $this->groupManager->search($search, $limit, $offset);
 		$groups = array_map(function($group) {
+			/** @var IGroup $group */
 			return $group->getGID();
 		}, $groups);
 
@@ -62,6 +68,9 @@ class Groups{
 
 	/**
 	 * returns an array of users in the group specified
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
 	public function getGroup($parameters) {
 		// Check if user is logged in
@@ -71,7 +80,7 @@ class Groups{
 		}
 
 		// Check the group exists
-		if(!$this->groupManager->groupExists($parameters['groupid'])){
+		if(!$this->groupManager->groupExists($parameters['groupid'])) {
 			return new OC_OCS_Result(null, \OCP\API::RESPOND_NOT_FOUND, 'The requested group could not be found');
 		}
 		// Check subadmin has access to this group
@@ -79,6 +88,7 @@ class Groups{
 		   || in_array($parameters['groupid'], \OC_SubAdmin::getSubAdminsGroups($user->getUID()))){
 			$users = $this->groupManager->get($parameters['groupid'])->getUsers();
 			$users =  array_map(function($user) {
+				/** @var IUser $user */
 				return $user->getUID();
 			}, $users);
 			$users = array_values($users);
@@ -90,23 +100,30 @@ class Groups{
 
 	/**
 	 * creates a new group
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
-	public function addGroup($parameters){
+	public function addGroup($parameters) {
 		// Validate name
-		$groupid = isset($_POST['groupid']) ? $_POST['groupid'] : '';
-		if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $groupid ) || empty($groupid)){
+		$groupId = isset($_POST['groupid']) ? $_POST['groupid'] : '';
+		if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $groupId ) || empty($groupId)){
 			\OCP\Util::writeLog('provisioning_api', 'Attempt made to create group using invalid characters.', \OCP\Util::ERROR);
 			return new OC_OCS_Result(null, 101, 'Invalid group name');
 		}
 		// Check if it exists
-		if($this->groupManager->groupExists($groupid)){
+		if($this->groupManager->groupExists($groupId)){
 			return new OC_OCS_Result(null, 102);
 		}
-		$this->groupManager->createGroup($groupid);
+		$this->groupManager->createGroup($groupId);
 		return new OC_OCS_Result(null, 100);
 	}
 
-	public function deleteGroup($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function deleteGroup($parameters) {
 		// Check it exists
 		if(!$this->groupManager->groupExists($parameters['groupid'])){
 			return new OC_OCS_Result(null, 101);
@@ -118,6 +135,10 @@ class Groups{
 		}
 	}
 
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
 	public function getSubAdminsOfGroup($parameters) {
 		$group = $parameters['groupid'];
 		// Check group exists
diff --git a/apps/provisioning_api/lib/users.php b/apps/provisioning_api/lib/users.php
index f5b201a55e..617e50b403 100644
--- a/apps/provisioning_api/lib/users.php
+++ b/apps/provisioning_api/lib/users.php
@@ -48,10 +48,10 @@ class Users {
 	 * @param \OCP\IUserManager $userManager
 	 * @param \OCP\IConfig $config
 	 * @param \OCP\IGroupManager $groupManager
-	 * @param \OCP\IUserSession $user
+	 * @param \OCP\IUserSession $userSession
 	 */
 	public function __construct(\OCP\IUserManager $userManager,
-	                            \OCP\IConfig $config,
+								\OCP\IConfig $config,
 								\OCP\IGroupManager $groupManager,
 								\OCP\IUserSession $userSession) {
 		$this->userManager = $userManager;
@@ -62,8 +62,10 @@ class Users {
 
 	/**
 	 * returns a list of users
+	 *
+	 * @return OC_OCS_Result
 	 */
-	public function getUsers(){
+	public function getUsers() {
 		$search = !empty($_GET['search']) ? $_GET['search'] : '';
 		$limit = !empty($_GET['limit']) ? $_GET['limit'] : null;
 		$offset = !empty($_GET['offset']) ? $_GET['offset'] : null;
@@ -76,7 +78,10 @@ class Users {
 		]);
 	}
 
-	public function addUser(){
+	/**
+	 * @return OC_OCS_Result
+	 */
+	public function addUser() {
 		$userId = isset($_POST['userid']) ? $_POST['userid'] : null;
 		$password = isset($_POST['password']) ? $_POST['password'] : null;
 		if($this->userManager->userExists($userId)) {
@@ -96,6 +101,9 @@ class Users {
 
 	/**
 	 * gets user info
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
 	public function getUser($parameters){
 		$userId = $parameters['userid'];
@@ -150,8 +158,11 @@ class Users {
 
 	/** 
 	 * edit users
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
-	public function editUser($parameters){
+	public function editUser($parameters) {
 		$userId = $parameters['userid'];
 
 		// Check if user is logged in
@@ -230,7 +241,11 @@ class Users {
 		return new OC_OCS_Result(null, 100);
 	}
 
-	public function deleteUser($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function deleteUser($parameters) {
 		// Check if user is logged in
 		$user = $this->userSession->getUser();
 		if ($user === null) {
@@ -253,6 +268,10 @@ class Users {
 		}
 	}
 
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
 	public function getUsersGroups($parameters) {
 		// Check if user is logged in
 		$user = $this->userSession->getUser();
@@ -286,7 +305,11 @@ class Users {
 		
 	}
 
-	public function addToGroup($parameters){
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
+	public function addToGroup($parameters) {
 		// Check if user is logged in
 		$user = $this->userSession->getUser();
 		if ($user === null) {
@@ -317,6 +340,10 @@ class Users {
 		return new OC_OCS_Result(null, 100);
 	}
 
+	/**
+	 * @param array $parameters
+	 * @return OC_OCS_Result
+	 */
 	public function removeFromGroup($parameters) {
 		// Check if user is logged in
 		$user = $this->userSession->getUser();
@@ -362,6 +389,9 @@ class Users {
 
 	/**
 	 * Creates a subadmin
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
 	public function addSubAdmin($parameters) {
 		$group = $_POST['groupid'];
@@ -393,6 +423,9 @@ class Users {
 
 	/**
 	 * Removes a subadmin from a group
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
 	public function removeSubAdmin($parameters) {
 		$group = $parameters['_delete']['groupid'];
@@ -414,7 +447,10 @@ class Users {
 	}
 
 	/**
-	 * @Get the groups a user is a subadmin of
+	 * Get the groups a user is a subadmin of
+	 *
+	 * @param array $parameters
+	 * @return OC_OCS_Result
 	 */
 	public function getUserSubAdminGroups($parameters) {
 		$user = $parameters['userid'];
@@ -431,8 +467,8 @@ class Users {
 	}
 
 	/**
-	 * @param $userId
-	 * @param $data
+	 * @param string $userId
+	 * @param array $data
 	 * @return mixed
 	 * @throws \OCP\Files\NotFoundException
 	 */
diff --git a/apps/user_ldap/ajax/setConfiguration.php b/apps/user_ldap/ajax/setConfiguration.php
index 8e6994d8f9..9311d72d21 100644
--- a/apps/user_ldap/ajax/setConfiguration.php
+++ b/apps/user_ldap/ajax/setConfiguration.php
@@ -33,7 +33,7 @@ $prefix = (string)$_POST['ldap_serverconfig_chooser'];
 // only legacy checkboxes (Advanced and Expert tab) need to be handled here,
 // the Wizard-like tabs handle it on their own
 $chkboxes = array('ldap_configuration_active', 'ldap_override_main_server',
-				  'ldap_nocase', 'ldap_turn_off_cert_check');
+				  'ldap_turn_off_cert_check');
 foreach($chkboxes as $boxid) {
 	if(!isset($_POST[$boxid])) {
 		$_POST[$boxid] = 0;
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 68fd1b698e..60c2accdcc 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -59,9 +59,6 @@ if(count($configPrefixes) > 0) {
 	OC_Group::useBackend($groupBackend);
 }
 
-OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
-OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp');
-
 \OCP\Util::connectHook(
 	'\OCA\Files_Sharing\API\Server2Server',
 	'preLoginNameUsedAsUserName',
diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php
index 0b3f84b8ba..f70eb74648 100644
--- a/apps/user_ldap/appinfo/install.php
+++ b/apps/user_ldap/appinfo/install.php
@@ -23,3 +23,6 @@ $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet');
 if($state === 'doSet') {
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
 }
+
+OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
+OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp');
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index b904bce072..33a7219644 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -24,3 +24,16 @@ $installedVersion = \OC::$server->getConfig()->getAppValue('user_ldap', 'install
 if (version_compare($installedVersion, '0.6.1', '<')) {
 	\OC::$server->getConfig()->setAppValue('user_ldap', 'enforce_home_folder_naming_rule', false);
 }
+
+if(version_compare($installedVersion, '0.6.2', '<')) {
+	// Remove LDAP case insensitive setting from DB as it is no longer beeing used.
+	$helper = new \OCA\user_ldap\lib\Helper();
+	$prefixes = $helper->getServerConfigurationPrefixes();
+
+	foreach($prefixes as $prefix) {
+		\OC::$server->getConfig()->deleteAppValue('user_ldap', $prefix . "ldap_nocase");
+	}
+}
+
+OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
+OCP\Backgroundjob::registerJob('\OCA\User_LDAP\Jobs\CleanUp');
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index ee6cdce3c2..844f6a91ac 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.6.1
+0.6.3
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 1bc0392a7d..a5fc59d3b0 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -181,6 +181,36 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		return $allMembers;
 	}
 
+	/**
+	 * @param string $DN
+	 * @param array|null &$seen
+	 * @return array
+	 */
+	private function _getGroupDNsFromMemberOf($DN, &$seen = null) {
+		if ($seen === null) {
+			$seen = array();
+		}
+		if (array_key_exists($DN, $seen)) {
+			// avoid loops
+			return array();
+		}
+		$seen[$DN] = 1;
+		$groups = $this->access->readAttribute($DN, 'memberOf');
+		if (!is_array($groups)) {
+			return array();
+		}
+		$groups = $this->access->groupsMatchFilter($groups);
+		$allGroups =  $groups;
+		$nestedGroups = $this->access->connection->ldapNestedGroups;
+		if (intval($nestedGroups) === 1) {
+			foreach ($groups as $group) {
+				$subGroups = $this->_getGroupDNsFromMemberOf($group, $seen);
+				$allGroups = array_merge($allGroups, $subGroups);
+			}
+		}	
+		return $allGroups;	
+	}
+
 	/**
 	 * translates a primary group ID into an ownCloud internal name
 	 * @param string $gid as given by primaryGroupID on AD
@@ -377,10 +407,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		if(intval($this->access->connection->hasMemberOfFilterSupport) === 1
 			&& intval($this->access->connection->useMemberOfToDetectMembership) === 1
 		) {
-			$groupDNs = $this->access->readAttribute($userDN, 'memberOf');
-
+			$groupDNs = $this->_getGroupDNsFromMemberOf($userDN);
 			if (is_array($groupDNs)) {
-				$groupDNs = $this->access->groupsMatchFilter($groupDNs);
 				foreach ($groupDNs as $dn) {
 					$groupName = $this->access->dn2groupname($dn);
 					if(is_string($groupName)) {
@@ -390,6 +418,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 					}
 				}
 			}
+			
 			if($primaryGroup !== false) {
 				$groups[] = $primaryGroup;
 			}
diff --git a/apps/user_ldap/js/wizard/wizardTabAdvanced.js b/apps/user_ldap/js/wizard/wizardTabAdvanced.js
index a27ec87b7c..7367bfe87a 100644
--- a/apps/user_ldap/js/wizard/wizardTabAdvanced.js
+++ b/apps/user_ldap/js/wizard/wizardTabAdvanced.js
@@ -41,10 +41,6 @@ OCA = OCA || {};
 					$element: $('#ldap_override_main_server'),
 					setMethod: 'setOverrideMainServerState'
 				},
-				ldap_nocase: {
-					$element: $('#ldap_nocase'),
-					setMethod: 'setNoCase'
-				},
 				ldap_turn_off_cert_check: {
 					$element: $('#ldap_turn_off_cert_check'),
 					setMethod: 'setCertCheckDisabled'
@@ -165,16 +161,6 @@ OCA = OCA || {};
 			);
 		},
 
-		/**
-		 * whether the server is case insensitive. This setting does not play
-		 * a role anymore (probably never had).
-		 *
-		 * @param {string} noCase contains an int
-		 */
-		setNoCase: function(noCase) {
-			this.setElementValue(this.managedItems.ldap_nocase.$element, noCase);
-		},
-
 		/**
 		 * sets whether the SSL/TLS certification check shout be disabled
 		 *
diff --git a/apps/user_ldap/l10n/ast.js b/apps/user_ldap/l10n/ast.js
index 3cc4b7d6b0..5bdc52e47a 100644
--- a/apps/user_ldap/l10n/ast.js
+++ b/apps/user_ldap/l10n/ast.js
@@ -64,7 +64,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Puertu pa copies de seguranza (Réplica)",
     "Disable Main Server" : "Deshabilitar sirvidor principal",
     "Only connect to the replica server." : "Coneutar namái col sirvidor de réplica.",
-    "Case insensitive LDAP server (Windows)" : "Sirvidor de LDAP insensible a mayúscules/minúscules (Windows)",
     "Turn off SSL certificate validation." : "Apagar la validación del certificáu SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nun se recomienda, ¡úsalu namái pa pruebes! Si la conexón namái funciona con esta opción, importa'l certificáu SSL del sirvidor LDAP nel to sirvidor %s.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/ast.json b/apps/user_ldap/l10n/ast.json
index 19b8c5fad1..934065b7a4 100644
--- a/apps/user_ldap/l10n/ast.json
+++ b/apps/user_ldap/l10n/ast.json
@@ -62,7 +62,6 @@
     "Backup (Replica) Port" : "Puertu pa copies de seguranza (Réplica)",
     "Disable Main Server" : "Deshabilitar sirvidor principal",
     "Only connect to the replica server." : "Coneutar namái col sirvidor de réplica.",
-    "Case insensitive LDAP server (Windows)" : "Sirvidor de LDAP insensible a mayúscules/minúscules (Windows)",
     "Turn off SSL certificate validation." : "Apagar la validación del certificáu SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nun se recomienda, ¡úsalu namái pa pruebes! Si la conexón namái funciona con esta opción, importa'l certificáu SSL del sirvidor LDAP nel to sirvidor %s.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/bg_BG.js b/apps/user_ldap/l10n/bg_BG.js
index b2e12165de..3ba3f25bd1 100644
--- a/apps/user_ldap/l10n/bg_BG.js
+++ b/apps/user_ldap/l10n/bg_BG.js
@@ -66,7 +66,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Backup (Replica) Port",
     "Disable Main Server" : "Изключи Главиния Сървър",
     "Only connect to the replica server." : "Свържи се само с репликирания сървър.",
-    "Case insensitive LDAP server (Windows)" : "Нечувствителен към главни/малки букви LDAP сървър (Windows)",
     "Turn off SSL certificate validation." : "Изключи валидацията на SSL сертификата.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не е пропоръчително, ползвай само за тестване. Ако връзката работи само с тази опция, вмъкни LDAP сървърния SSL сертификат в твоя %s сървър.",
     "Cache Time-To-Live" : "Кеширай Time-To-Live",
diff --git a/apps/user_ldap/l10n/bg_BG.json b/apps/user_ldap/l10n/bg_BG.json
index 39fc9b1e49..1360e0cec1 100644
--- a/apps/user_ldap/l10n/bg_BG.json
+++ b/apps/user_ldap/l10n/bg_BG.json
@@ -64,7 +64,6 @@
     "Backup (Replica) Port" : "Backup (Replica) Port",
     "Disable Main Server" : "Изключи Главиния Сървър",
     "Only connect to the replica server." : "Свържи се само с репликирания сървър.",
-    "Case insensitive LDAP server (Windows)" : "Нечувствителен към главни/малки букви LDAP сървър (Windows)",
     "Turn off SSL certificate validation." : "Изключи валидацията на SSL сертификата.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не е пропоръчително, ползвай само за тестване. Ако връзката работи само с тази опция, вмъкни LDAP сървърния SSL сертификат в твоя %s сървър.",
     "Cache Time-To-Live" : "Кеширай Time-To-Live",
diff --git a/apps/user_ldap/l10n/bn_BD.js b/apps/user_ldap/l10n/bn_BD.js
index 3ee845c475..e7d34692f7 100644
--- a/apps/user_ldap/l10n/bn_BD.js
+++ b/apps/user_ldap/l10n/bn_BD.js
@@ -59,7 +59,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "ব্যাকআপ (নকল) পোর্ট",
     "Disable Main Server" : "মূল সার্ভারকে অকার্যকর কর",
     "Only connect to the replica server." : "শুধুমাত্র নকল সার্ভারে সংযোগ দাও।",
-    "Case insensitive LDAP server (Windows)" : "বর্ণ অসংবেদী LDAP  সার্ভার (উইন্ডোজ)",
     "Turn off SSL certificate validation." : "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।",
     "Cache Time-To-Live" : "ক্যাশে টাইম-টু-লিভ",
     "in seconds. A change empties the cache." : "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।",
diff --git a/apps/user_ldap/l10n/bn_BD.json b/apps/user_ldap/l10n/bn_BD.json
index 250565a3a8..e9b7cd0146 100644
--- a/apps/user_ldap/l10n/bn_BD.json
+++ b/apps/user_ldap/l10n/bn_BD.json
@@ -57,7 +57,6 @@
     "Backup (Replica) Port" : "ব্যাকআপ (নকল) পোর্ট",
     "Disable Main Server" : "মূল সার্ভারকে অকার্যকর কর",
     "Only connect to the replica server." : "শুধুমাত্র নকল সার্ভারে সংযোগ দাও।",
-    "Case insensitive LDAP server (Windows)" : "বর্ণ অসংবেদী LDAP  সার্ভার (উইন্ডোজ)",
     "Turn off SSL certificate validation." : "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।",
     "Cache Time-To-Live" : "ক্যাশে টাইম-টু-লিভ",
     "in seconds. A change empties the cache." : "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।",
diff --git a/apps/user_ldap/l10n/ca.js b/apps/user_ldap/l10n/ca.js
index cf25823642..ea01350ec2 100644
--- a/apps/user_ldap/l10n/ca.js
+++ b/apps/user_ldap/l10n/ca.js
@@ -59,7 +59,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Port de la còpia de seguretat (rèplica)",
     "Disable Main Server" : "Desactiva el servidor principal",
     "Only connect to the replica server." : "Connecta només al servidor rèplica.",
-    "Case insensitive LDAP server (Windows)" : "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
     "Turn off SSL certificate validation." : "Desactiva la validació de certificat SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció.",
     "Cache Time-To-Live" : "Memòria cau Time-To-Live",
diff --git a/apps/user_ldap/l10n/ca.json b/apps/user_ldap/l10n/ca.json
index 8703068865..62c842123e 100644
--- a/apps/user_ldap/l10n/ca.json
+++ b/apps/user_ldap/l10n/ca.json
@@ -57,7 +57,6 @@
     "Backup (Replica) Port" : "Port de la còpia de seguretat (rèplica)",
     "Disable Main Server" : "Desactiva el servidor principal",
     "Only connect to the replica server." : "Connecta només al servidor rèplica.",
-    "Case insensitive LDAP server (Windows)" : "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
     "Turn off SSL certificate validation." : "Desactiva la validació de certificat SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció.",
     "Cache Time-To-Live" : "Memòria cau Time-To-Live",
diff --git a/apps/user_ldap/l10n/ca@valencia.js b/apps/user_ldap/l10n/ca@valencia.js
deleted file mode 100644
index 37042a4f41..0000000000
--- a/apps/user_ldap/l10n/ca@valencia.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ca@valencia.json b/apps/user_ldap/l10n/ca@valencia.json
deleted file mode 100644
index 521de7ba1a..0000000000
--- a/apps/user_ldap/l10n/ca@valencia.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js
index 20269d7c40..77fef537f0 100644
--- a/apps/user_ldap/l10n/cs_CZ.js
+++ b/apps/user_ldap/l10n/cs_CZ.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Záložní (kopie) port",
     "Disable Main Server" : "Zakázat hlavní server",
     "Only connect to the replica server." : "Připojit jen k záložnímu serveru.",
-    "Case insensitive LDAP server (Windows)" : "LDAP server nerozlišující velikost znaků (Windows)",
     "Turn off SSL certificate validation." : "Vypnout ověřování SSL certifikátu.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nedoporučuje se, určeno pouze k testovacímu použití. Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s.",
     "Cache Time-To-Live" : "TTL vyrovnávací paměti",
diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json
index 776290918d..b1ffce2e02 100644
--- a/apps/user_ldap/l10n/cs_CZ.json
+++ b/apps/user_ldap/l10n/cs_CZ.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Záložní (kopie) port",
     "Disable Main Server" : "Zakázat hlavní server",
     "Only connect to the replica server." : "Připojit jen k záložnímu serveru.",
-    "Case insensitive LDAP server (Windows)" : "LDAP server nerozlišující velikost znaků (Windows)",
     "Turn off SSL certificate validation." : "Vypnout ověřování SSL certifikátu.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nedoporučuje se, určeno pouze k testovacímu použití. Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s.",
     "Cache Time-To-Live" : "TTL vyrovnávací paměti",
diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js
index a4fb384b2f..2f664ee6c2 100644
--- a/apps/user_ldap/l10n/da.js
+++ b/apps/user_ldap/l10n/da.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Port for sikkerhedskopi (replika)",
     "Disable Main Server" : "Deaktivér hovedserver",
     "Only connect to the replica server." : "Forbind kun til replika serveren.",
-    "Case insensitive LDAP server (Windows)" : "LDAP-server som ikke er følsom over for store/små bogstaver (Windows)",
     "Turn off SSL certificate validation." : "Deaktivér validering af SSL-certifikat.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Anbefales ikke - bruges kun til testformål! Hvis forbindelse udelukkende fungerer med dette tilvalg, så importér LDAP-serverens SSL-certifikat i din %s-server.",
     "Cache Time-To-Live" : "Cache levetid",
diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json
index 48611afbce..5de47b4abc 100644
--- a/apps/user_ldap/l10n/da.json
+++ b/apps/user_ldap/l10n/da.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Port for sikkerhedskopi (replika)",
     "Disable Main Server" : "Deaktivér hovedserver",
     "Only connect to the replica server." : "Forbind kun til replika serveren.",
-    "Case insensitive LDAP server (Windows)" : "LDAP-server som ikke er følsom over for store/små bogstaver (Windows)",
     "Turn off SSL certificate validation." : "Deaktivér validering af SSL-certifikat.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Anbefales ikke - bruges kun til testformål! Hvis forbindelse udelukkende fungerer med dette tilvalg, så importér LDAP-serverens SSL-certifikat i din %s-server.",
     "Cache Time-To-Live" : "Cache levetid",
diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js
index 44ed60fa04..9a25c8e5b9 100644
--- a/apps/user_ldap/l10n/de.js
+++ b/apps/user_ldap/l10n/de.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Backup Port",
     "Disable Main Server" : "Hauptserver deaktivieren",
     "Only connect to the replica server." : "Nur zum Replikat-Server verbinden.",
-    "Case insensitive LDAP server (Windows)" : "LDAP-Server ohne Unterscheidung von Groß-/Kleinschreibung (Windows)",
     "Turn off SSL certificate validation." : "Schalte die SSL-Zertifikatsprüfung aus.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server.",
     "Cache Time-To-Live" : "Speichere Time-To-Live zwischen",
diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json
index d6c89b20b7..dcea495adf 100644
--- a/apps/user_ldap/l10n/de.json
+++ b/apps/user_ldap/l10n/de.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Backup Port",
     "Disable Main Server" : "Hauptserver deaktivieren",
     "Only connect to the replica server." : "Nur zum Replikat-Server verbinden.",
-    "Case insensitive LDAP server (Windows)" : "LDAP-Server ohne Unterscheidung von Groß-/Kleinschreibung (Windows)",
     "Turn off SSL certificate validation." : "Schalte die SSL-Zertifikatsprüfung aus.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server.",
     "Cache Time-To-Live" : "Speichere Time-To-Live zwischen",
diff --git a/apps/user_ldap/l10n/de_CH.js b/apps/user_ldap/l10n/de_CH.js
deleted file mode 100644
index 2145f0d05e..0000000000
--- a/apps/user_ldap/l10n/de_CH.js
+++ /dev/null
@@ -1,80 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "Failed to clear the mappings." : "Löschen der Zuordnung fehlgeschlagen.",
-    "Failed to delete the server configuration" : "Löschen der Serverkonfiguration fehlgeschlagen",
-    "The configuration is valid and the connection could be established!" : "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "Cannot add server configuration" : "Das Hinzufügen der Serverkonfiguration schlug fehl",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Select groups" : "Wähle Gruppen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
-    "Do you really want to delete the current Server Configuration?" : "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?",
-    "Confirm Deletion" : "Löschung bestätigen",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
-    "Test Configuration" : "Testkonfiguration",
-    "Help" : "Hilfe",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Host" : "Host",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, ausser wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
-    "Port" : "Port",
-    "User DN" : "Benutzer-DN",
-    "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.",
-    "Password" : "Passwort",
-    "For anonymous access, leave DN and Password empty." : "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
-    "One Base DN per line" : "Ein Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reiter konfigurieren",
-    "Advanced" : "Erweitert",
-    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
-    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
-    "Connection Settings" : "Verbindungseinstellungen",
-    "Configuration Active" : "Konfiguration aktiv",
-    "When unchecked, this configuration will be skipped." : "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
-    "Backup (Replica) Host" : "Backup Host (Kopie)",
-    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
-    "Backup (Replica) Port" : "Backup Port",
-    "Disable Main Server" : "Hauptserver deaktivieren",
-    "Only connect to the replica server." : "Nur zum Replikat-Server verbinden.",
-    "Turn off SSL certificate validation." : "Schalten Sie die SSL-Zertifikatsprüfung aus.",
-    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
-    "Cache Time-To-Live" : "Speichere Time-To-Live zwischen",
-    "in seconds. A change empties the cache." : "in Sekunden. Eine Änderung leert den Cache.",
-    "Directory Settings" : "Ordnereinstellungen",
-    "User Display Name Field" : "Feld für den Anzeigenamen des Benutzers",
-    "The LDAP attribute to use to generate the user's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.",
-    "Base User Tree" : "Basis-Benutzerbaum",
-    "One User Base DN per line" : "Ein Benutzer Basis-DN pro Zeile",
-    "User Search Attributes" : "Benutzersucheigenschaften",
-    "Optional; one attribute per line" : "Optional; ein Attribut pro Zeile",
-    "Group Display Name Field" : "Feld für den Anzeigenamen der Gruppe",
-    "The LDAP attribute to use to generate the groups's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen.",
-    "Base Group Tree" : "Basis-Gruppenbaum",
-    "One Group Base DN per line" : "Ein Gruppen Basis-DN pro Zeile",
-    "Group Search Attributes" : "Gruppensucheigenschaften",
-    "Group-Member association" : "Assoziation zwischen Gruppe und Benutzer",
-    "Special Attributes" : "Spezielle Eigenschaften",
-    "Quota Field" : "Kontingent-Feld",
-    "Quota Default" : "Standard-Kontingent",
-    "in bytes" : "in Bytes",
-    "Email Field" : "E-Mail-Feld",
-    "User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
-    "Internal Username" : "Interner Benutzername",
-    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
-    "Internal Username Attribute:" : "Interne Eigenschaften des Benutzers:",
-    "Override UUID detection" : "UUID-Erkennung überschreiben",
-    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
-    "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
-    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
-    "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
-    "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/de_CH.json b/apps/user_ldap/l10n/de_CH.json
deleted file mode 100644
index b68fa0b234..0000000000
--- a/apps/user_ldap/l10n/de_CH.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{ "translations": {
-    "Failed to clear the mappings." : "Löschen der Zuordnung fehlgeschlagen.",
-    "Failed to delete the server configuration" : "Löschen der Serverkonfiguration fehlgeschlagen",
-    "The configuration is valid and the connection could be established!" : "Die Konfiguration ist gültig und die Verbindung konnte hergestellt werden!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Die Konfiguration ist gültig aber die Verbindung ist fehlgeschlagen. Bitte überprüfen Sie die Servereinstellungen und die Anmeldeinformationen.",
-    "Deletion failed" : "Löschen fehlgeschlagen",
-    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
-    "Keep settings?" : "Einstellungen beibehalten?",
-    "Cannot add server configuration" : "Das Hinzufügen der Serverkonfiguration schlug fehl",
-    "mappings cleared" : "Zuordnungen gelöscht",
-    "Success" : "Erfolg",
-    "Error" : "Fehler",
-    "Select groups" : "Wähle Gruppen",
-    "Connection test succeeded" : "Verbindungstest erfolgreich",
-    "Connection test failed" : "Verbindungstest fehlgeschlagen",
-    "Do you really want to delete the current Server Configuration?" : "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?",
-    "Confirm Deletion" : "Löschung bestätigen",
-    "Group Filter" : "Gruppen-Filter",
-    "Save" : "Speichern",
-    "Test Configuration" : "Testkonfiguration",
-    "Help" : "Hilfe",
-    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
-    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
-    "Host" : "Host",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, ausser wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
-    "Port" : "Port",
-    "User DN" : "Benutzer-DN",
-    "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.",
-    "Password" : "Passwort",
-    "For anonymous access, leave DN and Password empty." : "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
-    "One Base DN per line" : "Ein Basis-DN pro Zeile",
-    "You can specify Base DN for users and groups in the Advanced tab" : "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reiter konfigurieren",
-    "Advanced" : "Erweitert",
-    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
-    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
-    "Connection Settings" : "Verbindungseinstellungen",
-    "Configuration Active" : "Konfiguration aktiv",
-    "When unchecked, this configuration will be skipped." : "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
-    "Backup (Replica) Host" : "Backup Host (Kopie)",
-    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
-    "Backup (Replica) Port" : "Backup Port",
-    "Disable Main Server" : "Hauptserver deaktivieren",
-    "Only connect to the replica server." : "Nur zum Replikat-Server verbinden.",
-    "Turn off SSL certificate validation." : "Schalten Sie die SSL-Zertifikatsprüfung aus.",
-    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
-    "Cache Time-To-Live" : "Speichere Time-To-Live zwischen",
-    "in seconds. A change empties the cache." : "in Sekunden. Eine Änderung leert den Cache.",
-    "Directory Settings" : "Ordnereinstellungen",
-    "User Display Name Field" : "Feld für den Anzeigenamen des Benutzers",
-    "The LDAP attribute to use to generate the user's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.",
-    "Base User Tree" : "Basis-Benutzerbaum",
-    "One User Base DN per line" : "Ein Benutzer Basis-DN pro Zeile",
-    "User Search Attributes" : "Benutzersucheigenschaften",
-    "Optional; one attribute per line" : "Optional; ein Attribut pro Zeile",
-    "Group Display Name Field" : "Feld für den Anzeigenamen der Gruppe",
-    "The LDAP attribute to use to generate the groups's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen.",
-    "Base Group Tree" : "Basis-Gruppenbaum",
-    "One Group Base DN per line" : "Ein Gruppen Basis-DN pro Zeile",
-    "Group Search Attributes" : "Gruppensucheigenschaften",
-    "Group-Member association" : "Assoziation zwischen Gruppe und Benutzer",
-    "Special Attributes" : "Spezielle Eigenschaften",
-    "Quota Field" : "Kontingent-Feld",
-    "Quota Default" : "Standard-Kontingent",
-    "in bytes" : "in Bytes",
-    "Email Field" : "E-Mail-Feld",
-    "User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
-    "Internal Username" : "Interner Benutzername",
-    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
-    "Internal Username Attribute:" : "Interne Eigenschaften des Benutzers:",
-    "Override UUID detection" : "UUID-Erkennung überschreiben",
-    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
-    "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
-    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
-    "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
-    "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js
index 458b47a4cd..f7558f5ef0 100644
--- a/apps/user_ldap/l10n/de_DE.js
+++ b/apps/user_ldap/l10n/de_DE.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Backup Port",
     "Disable Main Server" : "Hauptserver deaktivieren",
     "Only connect to the replica server." : "Nur zum Replikat-Server verbinden.",
-    "Case insensitive LDAP server (Windows)" : "LDAP-Server ohne Unterscheidung von Groß-/Kleinschreibung (Windows)",
     "Turn off SSL certificate validation." : "Schalten Sie die SSL-Zertifikatsprüfung aus.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
     "Cache Time-To-Live" : "Speichere Time-To-Live zwischen",
diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json
index c0279e5296..fb39769309 100644
--- a/apps/user_ldap/l10n/de_DE.json
+++ b/apps/user_ldap/l10n/de_DE.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Backup Port",
     "Disable Main Server" : "Hauptserver deaktivieren",
     "Only connect to the replica server." : "Nur zum Replikat-Server verbinden.",
-    "Case insensitive LDAP server (Windows)" : "LDAP-Server ohne Unterscheidung von Groß-/Kleinschreibung (Windows)",
     "Turn off SSL certificate validation." : "Schalten Sie die SSL-Zertifikatsprüfung aus.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
     "Cache Time-To-Live" : "Speichere Time-To-Live zwischen",
diff --git a/apps/user_ldap/l10n/el.js b/apps/user_ldap/l10n/el.js
index 610fcc5af0..fc9d96aa61 100644
--- a/apps/user_ldap/l10n/el.js
+++ b/apps/user_ldap/l10n/el.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη",
     "Disable Main Server" : "Απενεργοποιηση του κεντρικου διακομιστη",
     "Only connect to the replica server." : "Σύνδεση μόνο με το διακομιστή-αντίγραφο.",
-    "Case insensitive LDAP server (Windows)" : "Διακομιστής LDAP με διάκριση πεζών-κεφαλαίων (Windows)",
     "Turn off SSL certificate validation." : "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Δεν προτείνεται, χρησιμοποιείστε το μόνο για δοκιμές! Εάν η σύνδεση λειτουργεί μόνο με αυτή την επιλογή, εισάγετε το πιστοποιητικό SSL του διακομιστή LDAP στο %s διακομιστή σας.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/el.json b/apps/user_ldap/l10n/el.json
index 03dbf973b5..bd5924586b 100644
--- a/apps/user_ldap/l10n/el.json
+++ b/apps/user_ldap/l10n/el.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη",
     "Disable Main Server" : "Απενεργοποιηση του κεντρικου διακομιστη",
     "Only connect to the replica server." : "Σύνδεση μόνο με το διακομιστή-αντίγραφο.",
-    "Case insensitive LDAP server (Windows)" : "Διακομιστής LDAP με διάκριση πεζών-κεφαλαίων (Windows)",
     "Turn off SSL certificate validation." : "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Δεν προτείνεται, χρησιμοποιείστε το μόνο για δοκιμές! Εάν η σύνδεση λειτουργεί μόνο με αυτή την επιλογή, εισάγετε το πιστοποιητικό SSL του διακομιστή LDAP στο %s διακομιστή σας.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js
index 6bd17dcba4..976e8a7e06 100644
--- a/apps/user_ldap/l10n/en_GB.js
+++ b/apps/user_ldap/l10n/en_GB.js
@@ -114,7 +114,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Backup (Replica) Port",
     "Disable Main Server" : "Disable Main Server",
     "Only connect to the replica server." : "Only connect to the replica server.",
-    "Case insensitive LDAP server (Windows)" : "Case insensitive LDAP server (Windows)",
     "Turn off SSL certificate validation." : "Turn off SSL certificate validation.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json
index 8c19e37154..8e0212f35c 100644
--- a/apps/user_ldap/l10n/en_GB.json
+++ b/apps/user_ldap/l10n/en_GB.json
@@ -112,7 +112,6 @@
     "Backup (Replica) Port" : "Backup (Replica) Port",
     "Disable Main Server" : "Disable Main Server",
     "Only connect to the replica server." : "Only connect to the replica server.",
-    "Case insensitive LDAP server (Windows)" : "Case insensitive LDAP server (Windows)",
     "Turn off SSL certificate validation." : "Turn off SSL certificate validation.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/en_NZ.js b/apps/user_ldap/l10n/en_NZ.js
deleted file mode 100644
index 37042a4f41..0000000000
--- a/apps/user_ldap/l10n/en_NZ.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/en_NZ.json b/apps/user_ldap/l10n/en_NZ.json
deleted file mode 100644
index 521de7ba1a..0000000000
--- a/apps/user_ldap/l10n/en_NZ.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js
index 02a45f1b44..c73f54b548 100644
--- a/apps/user_ldap/l10n/es.js
+++ b/apps/user_ldap/l10n/es.js
@@ -3,7 +3,7 @@ OC.L10N.register(
     {
     "Failed to clear the mappings." : "Ocurrió un fallo al borrar las asignaciones.",
     "Failed to delete the server configuration" : "No se pudo borrar la configuración del servidor",
-    "The configuration is invalid: anonymous bind is not allowed." : "La configuración no es válida: enlaces anónimos no están permitido.",
+    "The configuration is invalid: anonymous bind is not allowed." : "La configuración no es válida: no están permitidos enlaces anónimos.",
     "The configuration is valid and the connection could be established!" : "¡La configuración es válida y la conexión puede establecerse!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero falló el nexo. Por favor, compruebe la configuración del servidor y las credenciales.",
     "The configuration is invalid. Please have a look at the logs for further details." : "La configuración no es válida. Por favor, revise el registro para más detalles.",
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Puerto para copias de seguridad (Replica)",
     "Disable Main Server" : "Deshabilitar servidor principal",
     "Only connect to the replica server." : "Conectar sólo con el servidor de réplica.",
-    "Case insensitive LDAP server (Windows)" : "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)",
     "Turn off SSL certificate validation." : "Apagar la validación por certificado SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No se recomienda, ¡utilícelo únicamente para pruebas! Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor %s.",
     "Cache Time-To-Live" : "Cache TTL",
diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json
index f836e54c06..8666d1efdd 100644
--- a/apps/user_ldap/l10n/es.json
+++ b/apps/user_ldap/l10n/es.json
@@ -1,7 +1,7 @@
 { "translations": {
     "Failed to clear the mappings." : "Ocurrió un fallo al borrar las asignaciones.",
     "Failed to delete the server configuration" : "No se pudo borrar la configuración del servidor",
-    "The configuration is invalid: anonymous bind is not allowed." : "La configuración no es válida: enlaces anónimos no están permitido.",
+    "The configuration is invalid: anonymous bind is not allowed." : "La configuración no es válida: no están permitidos enlaces anónimos.",
     "The configuration is valid and the connection could be established!" : "¡La configuración es válida y la conexión puede establecerse!",
     "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero falló el nexo. Por favor, compruebe la configuración del servidor y las credenciales.",
     "The configuration is invalid. Please have a look at the logs for further details." : "La configuración no es válida. Por favor, revise el registro para más detalles.",
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Puerto para copias de seguridad (Replica)",
     "Disable Main Server" : "Deshabilitar servidor principal",
     "Only connect to the replica server." : "Conectar sólo con el servidor de réplica.",
-    "Case insensitive LDAP server (Windows)" : "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)",
     "Turn off SSL certificate validation." : "Apagar la validación por certificado SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No se recomienda, ¡utilícelo únicamente para pruebas! Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor %s.",
     "Cache Time-To-Live" : "Cache TTL",
diff --git a/apps/user_ldap/l10n/es_AR.js b/apps/user_ldap/l10n/es_AR.js
index 2c64848eee..e56510323e 100644
--- a/apps/user_ldap/l10n/es_AR.js
+++ b/apps/user_ldap/l10n/es_AR.js
@@ -54,7 +54,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Puerto para copia de seguridad (réplica)",
     "Disable Main Server" : "Deshabilitar el Servidor Principal",
     "Only connect to the replica server." : "Conectarse únicamente al servidor de réplica.",
-    "Case insensitive LDAP server (Windows)" : "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)",
     "Turn off SSL certificate validation." : "Desactivar la validación por certificado SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s.",
     "Cache Time-To-Live" : "Tiempo de vida del caché",
diff --git a/apps/user_ldap/l10n/es_AR.json b/apps/user_ldap/l10n/es_AR.json
index 5fc5d32029..f62e717ded 100644
--- a/apps/user_ldap/l10n/es_AR.json
+++ b/apps/user_ldap/l10n/es_AR.json
@@ -52,7 +52,6 @@
     "Backup (Replica) Port" : "Puerto para copia de seguridad (réplica)",
     "Disable Main Server" : "Deshabilitar el Servidor Principal",
     "Only connect to the replica server." : "Conectarse únicamente al servidor de réplica.",
-    "Case insensitive LDAP server (Windows)" : "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)",
     "Turn off SSL certificate validation." : "Desactivar la validación por certificado SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s.",
     "Cache Time-To-Live" : "Tiempo de vida del caché",
diff --git a/apps/user_ldap/l10n/es_BO.js b/apps/user_ldap/l10n/es_BO.js
deleted file mode 100644
index 37042a4f41..0000000000
--- a/apps/user_ldap/l10n/es_BO.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_BO.json b/apps/user_ldap/l10n/es_BO.json
deleted file mode 100644
index 521de7ba1a..0000000000
--- a/apps/user_ldap/l10n/es_BO.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_CO.js b/apps/user_ldap/l10n/es_CO.js
deleted file mode 100644
index 37042a4f41..0000000000
--- a/apps/user_ldap/l10n/es_CO.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_CO.json b/apps/user_ldap/l10n/es_CO.json
deleted file mode 100644
index 521de7ba1a..0000000000
--- a/apps/user_ldap/l10n/es_CO.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_CR.js b/apps/user_ldap/l10n/es_CR.js
deleted file mode 100644
index 37042a4f41..0000000000
--- a/apps/user_ldap/l10n/es_CR.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_CR.json b/apps/user_ldap/l10n/es_CR.json
deleted file mode 100644
index 521de7ba1a..0000000000
--- a/apps/user_ldap/l10n/es_CR.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_EC.js b/apps/user_ldap/l10n/es_EC.js
deleted file mode 100644
index 37042a4f41..0000000000
--- a/apps/user_ldap/l10n/es_EC.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_EC.json b/apps/user_ldap/l10n/es_EC.json
deleted file mode 100644
index 521de7ba1a..0000000000
--- a/apps/user_ldap/l10n/es_EC.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_PE.js b/apps/user_ldap/l10n/es_PE.js
deleted file mode 100644
index 37042a4f41..0000000000
--- a/apps/user_ldap/l10n/es_PE.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_PE.json b/apps/user_ldap/l10n/es_PE.json
deleted file mode 100644
index 521de7ba1a..0000000000
--- a/apps/user_ldap/l10n/es_PE.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_PY.js b/apps/user_ldap/l10n/es_PY.js
deleted file mode 100644
index 37042a4f41..0000000000
--- a/apps/user_ldap/l10n/es_PY.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_PY.json b/apps/user_ldap/l10n/es_PY.json
deleted file mode 100644
index 521de7ba1a..0000000000
--- a/apps/user_ldap/l10n/es_PY.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_US.js b/apps/user_ldap/l10n/es_US.js
deleted file mode 100644
index 37042a4f41..0000000000
--- a/apps/user_ldap/l10n/es_US.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_US.json b/apps/user_ldap/l10n/es_US.json
deleted file mode 100644
index 521de7ba1a..0000000000
--- a/apps/user_ldap/l10n/es_US.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_UY.js b/apps/user_ldap/l10n/es_UY.js
deleted file mode 100644
index 37042a4f41..0000000000
--- a/apps/user_ldap/l10n/es_UY.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_UY.json b/apps/user_ldap/l10n/es_UY.json
deleted file mode 100644
index 521de7ba1a..0000000000
--- a/apps/user_ldap/l10n/es_UY.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/et_EE.js b/apps/user_ldap/l10n/et_EE.js
index 1e0057c2f4..1fc38d62d9 100644
--- a/apps/user_ldap/l10n/et_EE.js
+++ b/apps/user_ldap/l10n/et_EE.js
@@ -84,7 +84,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Varuserveri (replika) port",
     "Disable Main Server" : "Ära kasuta peaserverit",
     "Only connect to the replica server." : "Ühendu ainult replitseeriva serveriga.",
-    "Case insensitive LDAP server (Windows)" : "Tõusutundetu LDAP server (Windows)",
     "Turn off SSL certificate validation." : "Lülita SSL sertifikaadi kontrollimine välja.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Pole soovitatav, kasuta seda ainult testimiseks! Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse.",
     "Cache Time-To-Live" : "Puhvri iga",
diff --git a/apps/user_ldap/l10n/et_EE.json b/apps/user_ldap/l10n/et_EE.json
index ea93ccb0ef..46c7de9652 100644
--- a/apps/user_ldap/l10n/et_EE.json
+++ b/apps/user_ldap/l10n/et_EE.json
@@ -82,7 +82,6 @@
     "Backup (Replica) Port" : "Varuserveri (replika) port",
     "Disable Main Server" : "Ära kasuta peaserverit",
     "Only connect to the replica server." : "Ühendu ainult replitseeriva serveriga.",
-    "Case insensitive LDAP server (Windows)" : "Tõusutundetu LDAP server (Windows)",
     "Turn off SSL certificate validation." : "Lülita SSL sertifikaadi kontrollimine välja.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Pole soovitatav, kasuta seda ainult testimiseks! Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse.",
     "Cache Time-To-Live" : "Puhvri iga",
diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js
index 096973d2f1..44ce45a1b9 100644
--- a/apps/user_ldap/l10n/eu.js
+++ b/apps/user_ldap/l10n/eu.js
@@ -63,7 +63,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Babeskopia (Replica) Ataka",
     "Disable Main Server" : "Desgaitu Zerbitzari Nagusia",
     "Only connect to the replica server." : "Konektatu bakarrik erreplika zerbitzarira",
-    "Case insensitive LDAP server (Windows)" : "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (Windows)",
     "Turn off SSL certificate validation." : "Ezgaitu SSL ziurtagirien egiaztapena.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Ez da gomendagarria, erabili bakarrik probarako! Konexioak aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure %s zerbitzarian.",
     "Cache Time-To-Live" : "Katxearen Bizi-Iraupena",
diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json
index 84e8650d21..64539c16e1 100644
--- a/apps/user_ldap/l10n/eu.json
+++ b/apps/user_ldap/l10n/eu.json
@@ -61,7 +61,6 @@
     "Backup (Replica) Port" : "Babeskopia (Replica) Ataka",
     "Disable Main Server" : "Desgaitu Zerbitzari Nagusia",
     "Only connect to the replica server." : "Konektatu bakarrik erreplika zerbitzarira",
-    "Case insensitive LDAP server (Windows)" : "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (Windows)",
     "Turn off SSL certificate validation." : "Ezgaitu SSL ziurtagirien egiaztapena.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Ez da gomendagarria, erabili bakarrik probarako! Konexioak aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure %s zerbitzarian.",
     "Cache Time-To-Live" : "Katxearen Bizi-Iraupena",
diff --git a/apps/user_ldap/l10n/eu_ES.js b/apps/user_ldap/l10n/eu_ES.js
deleted file mode 100644
index e2907d4495..0000000000
--- a/apps/user_ldap/l10n/eu_ES.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "Save" : "Gorde"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/eu_ES.json b/apps/user_ldap/l10n/eu_ES.json
deleted file mode 100644
index 7a78f4bece..0000000000
--- a/apps/user_ldap/l10n/eu_ES.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Gorde"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/fi.js b/apps/user_ldap/l10n/fi.js
deleted file mode 100644
index 7e8944002b..0000000000
--- a/apps/user_ldap/l10n/fi.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "Error" : "Virhe",
-    "Server" : "Palvelin",
-    "Save" : "Tallenna",
-    "Help" : "Apua",
-    "Password" : "Salasana",
-    "Back" : "Takaisin"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/fi.json b/apps/user_ldap/l10n/fi.json
deleted file mode 100644
index 7b82cac2bd..0000000000
--- a/apps/user_ldap/l10n/fi.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "Error" : "Virhe",
-    "Server" : "Palvelin",
-    "Save" : "Tallenna",
-    "Help" : "Apua",
-    "Password" : "Salasana",
-    "Back" : "Takaisin"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/fi_FI.js b/apps/user_ldap/l10n/fi_FI.js
index ab7d74e0b4..5091cb1d88 100644
--- a/apps/user_ldap/l10n/fi_FI.js
+++ b/apps/user_ldap/l10n/fi_FI.js
@@ -45,7 +45,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Varmuuskopioinnin (replikoinnin) portti",
     "Disable Main Server" : "Poista pääpalvelin käytöstä",
     "Only connect to the replica server." : "Yhdistä vain replikointipalvelimeen.",
-    "Case insensitive LDAP server (Windows)" : "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
     "Turn off SSL certificate validation." : "Poista käytöstä SSL-varmenteen vahvistus",
     "in seconds. A change empties the cache." : "sekunneissa. Muutos tyhjentää välimuistin.",
     "Directory Settings" : "Hakemistoasetukset",
diff --git a/apps/user_ldap/l10n/fi_FI.json b/apps/user_ldap/l10n/fi_FI.json
index ce8e20c56e..54e1265016 100644
--- a/apps/user_ldap/l10n/fi_FI.json
+++ b/apps/user_ldap/l10n/fi_FI.json
@@ -43,7 +43,6 @@
     "Backup (Replica) Port" : "Varmuuskopioinnin (replikoinnin) portti",
     "Disable Main Server" : "Poista pääpalvelin käytöstä",
     "Only connect to the replica server." : "Yhdistä vain replikointipalvelimeen.",
-    "Case insensitive LDAP server (Windows)" : "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
     "Turn off SSL certificate validation." : "Poista käytöstä SSL-varmenteen vahvistus",
     "in seconds. A change empties the cache." : "sekunneissa. Muutos tyhjentää välimuistin.",
     "Directory Settings" : "Hakemistoasetukset",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index 2c4f4bfb5f..3bf26f0e3e 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -39,7 +39,7 @@ OC.L10N.register(
     "Select attributes" : "Sélectionner les attributs",
     "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilisateur introuvable. Veuillez vérifier les attributs de login et le nom d'utilisateur. Filtre effectif (à copier-coller pour valider en ligne de commande):<br/>",
     "User found and settings verified." : "Utilisateur trouvé et paramètres vérifiés.",
-    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres vérifiés, mais seul le premier utilisateur pourra se connecter. Considérez utiliser un filtre moins restrictif.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres vérifiés, mais seul le premier utilisateur pourra se connecter. Utilisez plutôt un filtre moins restrictif.",
     "An unspecified error occurred. Please check the settings and the log." : "Une erreur inconnue s'est produite. Veuillez vérifier les paramètres et le log.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Le filtre de recherche n'est pas valide, probablement à cause de problèmes de syntaxe tels que des parenthèses manquantes. Veuillez le corriger.",
     "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Une erreur s'est produite lors de la connexion au LDAP / AD. Veuillez vérifier l'hôte, le port et les informations d'identification.",
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Port du serveur de backup (réplique)",
     "Disable Main Server" : "Désactiver le serveur principal",
     "Only connect to the replica server." : "Se connecter uniquement à la réplique",
-    "Case insensitive LDAP server (Windows)" : "Serveur LDAP non sensible à la casse (Windows)",
     "Turn off SSL certificate validation." : "Désactiver la validation des certificats SSL",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.",
     "Cache Time-To-Live" : "Durée de vie du cache (TTL)",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 43519556e1..87cf780e82 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -37,7 +37,7 @@
     "Select attributes" : "Sélectionner les attributs",
     "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Utilisateur introuvable. Veuillez vérifier les attributs de login et le nom d'utilisateur. Filtre effectif (à copier-coller pour valider en ligne de commande):<br/>",
     "User found and settings verified." : "Utilisateur trouvé et paramètres vérifiés.",
-    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres vérifiés, mais seul le premier utilisateur pourra se connecter. Considérez utiliser un filtre moins restrictif.",
+    "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Paramètres vérifiés, mais seul le premier utilisateur pourra se connecter. Utilisez plutôt un filtre moins restrictif.",
     "An unspecified error occurred. Please check the settings and the log." : "Une erreur inconnue s'est produite. Veuillez vérifier les paramètres et le log.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Le filtre de recherche n'est pas valide, probablement à cause de problèmes de syntaxe tels que des parenthèses manquantes. Veuillez le corriger.",
     "A connection error to LDAP / AD occurred, please check host, port and credentials." : "Une erreur s'est produite lors de la connexion au LDAP / AD. Veuillez vérifier l'hôte, le port et les informations d'identification.",
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Port du serveur de backup (réplique)",
     "Disable Main Server" : "Désactiver le serveur principal",
     "Only connect to the replica server." : "Se connecter uniquement à la réplique",
-    "Case insensitive LDAP server (Windows)" : "Serveur LDAP non sensible à la casse (Windows)",
     "Turn off SSL certificate validation." : "Désactiver la validation des certificats SSL",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.",
     "Cache Time-To-Live" : "Durée de vie du cache (TTL)",
diff --git a/apps/user_ldap/l10n/fr_CA.js b/apps/user_ldap/l10n/fr_CA.js
deleted file mode 100644
index 95c97db2f9..0000000000
--- a/apps/user_ldap/l10n/fr_CA.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_ldap/l10n/fr_CA.json b/apps/user_ldap/l10n/fr_CA.json
deleted file mode 100644
index 8e0cd6f678..0000000000
--- a/apps/user_ldap/l10n/fr_CA.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/gl.js b/apps/user_ldap/l10n/gl.js
index 6ab06bb4b9..fac8aedc4a 100644
--- a/apps/user_ldap/l10n/gl.js
+++ b/apps/user_ldap/l10n/gl.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Porto da copia de seguranza (Réplica)",
     "Disable Main Server" : "Desactivar o servidor principal",
     "Only connect to the replica server." : "Conectar só co servidor de réplica.",
-    "Case insensitive LDAP server (Windows)" : "Servidor LDAP non sensíbel a maiúsculas (Windows)",
     "Turn off SSL certificate validation." : "Desactiva a validación do certificado SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recomendado, utilizar só para probas! Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor %s.",
     "Cache Time-To-Live" : "Tempo de persistencia da caché",
diff --git a/apps/user_ldap/l10n/gl.json b/apps/user_ldap/l10n/gl.json
index b1e4ffc05c..b168f9d305 100644
--- a/apps/user_ldap/l10n/gl.json
+++ b/apps/user_ldap/l10n/gl.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Porto da copia de seguranza (Réplica)",
     "Disable Main Server" : "Desactivar o servidor principal",
     "Only connect to the replica server." : "Conectar só co servidor de réplica.",
-    "Case insensitive LDAP server (Windows)" : "Servidor LDAP non sensíbel a maiúsculas (Windows)",
     "Turn off SSL certificate validation." : "Desactiva a validación do certificado SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recomendado, utilizar só para probas! Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor %s.",
     "Cache Time-To-Live" : "Tempo de persistencia da caché",
diff --git a/apps/user_ldap/l10n/hi_IN.js b/apps/user_ldap/l10n/hi_IN.js
deleted file mode 100644
index 37042a4f41..0000000000
--- a/apps/user_ldap/l10n/hi_IN.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/hi_IN.json b/apps/user_ldap/l10n/hi_IN.json
deleted file mode 100644
index 521de7ba1a..0000000000
--- a/apps/user_ldap/l10n/hi_IN.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/hu_HU.js b/apps/user_ldap/l10n/hu_HU.js
index 6d3ad2600f..25035fb32c 100644
--- a/apps/user_ldap/l10n/hu_HU.js
+++ b/apps/user_ldap/l10n/hu_HU.js
@@ -61,7 +61,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "A másodkiszolgáló (replika) portszáma",
     "Disable Main Server" : "A fő szerver kihagyása",
     "Only connect to the replica server." : "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk.",
-    "Case insensitive LDAP server (Windows)" : "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)",
     "Turn off SSL certificate validation." : "Ne ellenőrizzük az SSL-tanúsítvány érvényességét",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát a(z) %s kiszolgálóra!",
     "Cache Time-To-Live" : "A gyorsítótár tárolási időtartama",
diff --git a/apps/user_ldap/l10n/hu_HU.json b/apps/user_ldap/l10n/hu_HU.json
index 19552648b7..0778e627e2 100644
--- a/apps/user_ldap/l10n/hu_HU.json
+++ b/apps/user_ldap/l10n/hu_HU.json
@@ -59,7 +59,6 @@
     "Backup (Replica) Port" : "A másodkiszolgáló (replika) portszáma",
     "Disable Main Server" : "A fő szerver kihagyása",
     "Only connect to the replica server." : "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk.",
-    "Case insensitive LDAP server (Windows)" : "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)",
     "Turn off SSL certificate validation." : "Ne ellenőrizzük az SSL-tanúsítvány érvényességét",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát a(z) %s kiszolgálóra!",
     "Cache Time-To-Live" : "A gyorsítótár tárolási időtartama",
diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js
index a89323bc3c..402219f12b 100644
--- a/apps/user_ldap/l10n/id.js
+++ b/apps/user_ldap/l10n/id.js
@@ -82,7 +82,7 @@ OC.L10N.register(
     "Copy current configuration into new directory binding" : "Salin konfigurasi saat ini kedalam direktori baru",
     "Delete the current configuration" : "Hapus konfigurasi saat ini",
     "Host" : "Host",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali Anda menggunakan SSL. Lalu jalankan dengan ldaps://",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Anda dapat mengabaikan protokol, kecuali Anda membutuhkan SSL. Lalu jalankan dengan ldaps://",
     "Port" : "Port",
     "Detect Port" : "Deteksi Port",
     "User DN" : "Pengguna DN",
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Cadangkan (Replika) Port",
     "Disable Main Server" : "Nonaktifkan Server Utama",
     "Only connect to the replica server." : "Hanya terhubung ke server replika.",
-    "Case insensitive LDAP server (Windows)" : "Server LDAP tidak sensitif kata (Windows)",
     "Turn off SSL certificate validation." : "Matikan validasi sertifikat SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Tidak dianjurkan, gunakan ini hanya untuk percobaan! Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL milik server LDAP kedalam server %s Anda.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json
index fc41e5d2c7..bf8f0509fa 100644
--- a/apps/user_ldap/l10n/id.json
+++ b/apps/user_ldap/l10n/id.json
@@ -80,7 +80,7 @@
     "Copy current configuration into new directory binding" : "Salin konfigurasi saat ini kedalam direktori baru",
     "Delete the current configuration" : "Hapus konfigurasi saat ini",
     "Host" : "Host",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali Anda menggunakan SSL. Lalu jalankan dengan ldaps://",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Anda dapat mengabaikan protokol, kecuali Anda membutuhkan SSL. Lalu jalankan dengan ldaps://",
     "Port" : "Port",
     "Detect Port" : "Deteksi Port",
     "User DN" : "Pengguna DN",
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Cadangkan (Replika) Port",
     "Disable Main Server" : "Nonaktifkan Server Utama",
     "Only connect to the replica server." : "Hanya terhubung ke server replika.",
-    "Case insensitive LDAP server (Windows)" : "Server LDAP tidak sensitif kata (Windows)",
     "Turn off SSL certificate validation." : "Matikan validasi sertifikat SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Tidak dianjurkan, gunakan ini hanya untuk percobaan! Jika koneksi hanya bekerja dengan opsi ini, impor sertifikat SSL milik server LDAP kedalam server %s Anda.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/is.js b/apps/user_ldap/l10n/is.js
index b880fd3b05..ed3ac95aae 100644
--- a/apps/user_ldap/l10n/is.js
+++ b/apps/user_ldap/l10n/is.js
@@ -7,6 +7,7 @@ OC.L10N.register(
     "Help" : "Hjálp",
     "Host" : "Netþjónn",
     "Password" : "Lykilorð",
+    "Continue" : "Halda áfram",
     "Advanced" : "Ítarlegt"
 },
-"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);");
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/user_ldap/l10n/is.json b/apps/user_ldap/l10n/is.json
index f9c82ebf49..aa48708e8b 100644
--- a/apps/user_ldap/l10n/is.json
+++ b/apps/user_ldap/l10n/is.json
@@ -5,6 +5,7 @@
     "Help" : "Hjálp",
     "Host" : "Netþjónn",
     "Password" : "Lykilorð",
+    "Continue" : "Halda áfram",
     "Advanced" : "Ítarlegt"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js
index 80bdfdc177..608bc3ebf2 100644
--- a/apps/user_ldap/l10n/it.js
+++ b/apps/user_ldap/l10n/it.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Porta di backup (Replica)",
     "Disable Main Server" : "Disabilita server principale",
     "Only connect to the replica server." : "Collegati solo al server di replica.",
-    "Case insensitive LDAP server (Windows)" : "Server LDAP non sensibile alle maiuscole (Windows)",
     "Turn off SSL certificate validation." : "Disattiva il controllo del certificato SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non consigliata, da utilizzare solo per test! Se la connessione funziona solo con questa opzione, importa il certificate SSL del server LDAP sul tuo server %s.",
     "Cache Time-To-Live" : "Tempo di vita della cache",
diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json
index 8eea02f2c8..93bc5522d3 100644
--- a/apps/user_ldap/l10n/it.json
+++ b/apps/user_ldap/l10n/it.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Porta di backup (Replica)",
     "Disable Main Server" : "Disabilita server principale",
     "Only connect to the replica server." : "Collegati solo al server di replica.",
-    "Case insensitive LDAP server (Windows)" : "Server LDAP non sensibile alle maiuscole (Windows)",
     "Turn off SSL certificate validation." : "Disattiva il controllo del certificato SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non consigliata, da utilizzare solo per test! Se la connessione funziona solo con questa opzione, importa il certificate SSL del server LDAP sul tuo server %s.",
     "Cache Time-To-Live" : "Tempo di vita della cache",
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
index 049d723641..43402d94ac 100644
--- a/apps/user_ldap/l10n/ja.js
+++ b/apps/user_ldap/l10n/ja.js
@@ -87,7 +87,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "バックアップ（レプリカ）ポート",
     "Disable Main Server" : "メインサーバーを無効にする",
     "Only connect to the replica server." : "レプリカサーバーにのみ接続します。",
-    "Case insensitive LDAP server (Windows)" : "大文字と小文字を区別しないLDAPサーバー (Windows)",
     "Turn off SSL certificate validation." : "SSL証明書の確認を無効にする。",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバーのSSL証明書を %s サーバーにインポートしてください。",
     "Cache Time-To-Live" : "キャッシュのTTL",
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
index 8e44a9fedf..81a918eae0 100644
--- a/apps/user_ldap/l10n/ja.json
+++ b/apps/user_ldap/l10n/ja.json
@@ -85,7 +85,6 @@
     "Backup (Replica) Port" : "バックアップ（レプリカ）ポート",
     "Disable Main Server" : "メインサーバーを無効にする",
     "Only connect to the replica server." : "レプリカサーバーにのみ接続します。",
-    "Case insensitive LDAP server (Windows)" : "大文字と小文字を区別しないLDAPサーバー (Windows)",
     "Turn off SSL certificate validation." : "SSL証明書の確認を無効にする。",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバーのSSL証明書を %s サーバーにインポートしてください。",
     "Cache Time-To-Live" : "キャッシュのTTL",
diff --git a/apps/user_ldap/l10n/ko.js b/apps/user_ldap/l10n/ko.js
index db5105165e..566b67bf98 100644
--- a/apps/user_ldap/l10n/ko.js
+++ b/apps/user_ldap/l10n/ko.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "백업(복제) 포트",
     "Disable Main Server" : "주 서버 비활성화",
     "Only connect to the replica server." : "복제 서버에만 연결합니다.",
-    "Case insensitive LDAP server (Windows)" : "LDAP 서버에서 대소문자 구분하지 않음(Windows)",
     "Turn off SSL certificate validation." : "SSL 인증서 유효성 검사를 해제합니다.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "테스트 목적으로만 사용하십시오! 이 옵션을 사용해야만 연결할 수 있으면 %s 서버에 LDAP 서버의 SSL 인증서를 설치하십시오.",
     "Cache Time-To-Live" : "캐시 유지 시간",
diff --git a/apps/user_ldap/l10n/ko.json b/apps/user_ldap/l10n/ko.json
index b2135d4e2a..b8f649bc24 100644
--- a/apps/user_ldap/l10n/ko.json
+++ b/apps/user_ldap/l10n/ko.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "백업(복제) 포트",
     "Disable Main Server" : "주 서버 비활성화",
     "Only connect to the replica server." : "복제 서버에만 연결합니다.",
-    "Case insensitive LDAP server (Windows)" : "LDAP 서버에서 대소문자 구분하지 않음(Windows)",
     "Turn off SSL certificate validation." : "SSL 인증서 유효성 검사를 해제합니다.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "테스트 목적으로만 사용하십시오! 이 옵션을 사용해야만 연결할 수 있으면 %s 서버에 LDAP 서버의 SSL 인증서를 설치하십시오.",
     "Cache Time-To-Live" : "캐시 유지 시간",
diff --git a/apps/user_ldap/l10n/nb_NO.js b/apps/user_ldap/l10n/nb_NO.js
index 25670ce73a..f92e361319 100644
--- a/apps/user_ldap/l10n/nb_NO.js
+++ b/apps/user_ldap/l10n/nb_NO.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Reserve (Replika) Port",
     "Disable Main Server" : "Deaktiver hovedtjeneren",
     "Only connect to the replica server." : "Koble til bare replika-tjeneren.",
-    "Case insensitive LDAP server (Windows)" : "LDAP-server som ikke skiller mellom store og små bokstaver (Windows)",
     "Turn off SSL certificate validation." : "Slå av SSL-sertifikat validering",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Ikke anbefalt, bruk kun for testing! Hvis tilkobling bare virker med dette valget, importer LDAP-tjenerens SSL-sertifikat i %s-serveren din.",
     "Cache Time-To-Live" : "Levetid i mellomlager",
diff --git a/apps/user_ldap/l10n/nb_NO.json b/apps/user_ldap/l10n/nb_NO.json
index 588c9f6c21..268faa899c 100644
--- a/apps/user_ldap/l10n/nb_NO.json
+++ b/apps/user_ldap/l10n/nb_NO.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Reserve (Replika) Port",
     "Disable Main Server" : "Deaktiver hovedtjeneren",
     "Only connect to the replica server." : "Koble til bare replika-tjeneren.",
-    "Case insensitive LDAP server (Windows)" : "LDAP-server som ikke skiller mellom store og små bokstaver (Windows)",
     "Turn off SSL certificate validation." : "Slå av SSL-sertifikat validering",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Ikke anbefalt, bruk kun for testing! Hvis tilkobling bare virker med dette valget, importer LDAP-tjenerens SSL-sertifikat i %s-serveren din.",
     "Cache Time-To-Live" : "Levetid i mellomlager",
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
index b12f3a0242..1606f1de12 100644
--- a/apps/user_ldap/l10n/nl.js
+++ b/apps/user_ldap/l10n/nl.js
@@ -63,7 +63,7 @@ OC.L10N.register(
     "Search groups" : "Zoeken groepen",
     "Available groups" : "Beschikbare groepen",
     "Selected groups" : "Geselecteerde groepen",
-    "Edit LDAP Query" : "Bewerken LDAP bevraging",
+    "Edit LDAP Query" : "Bewerken LDAP opvraging",
     "LDAP Filter:" : "LDAP Filter:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Dit filter geeft aan welke LDAP groepen toegang hebben tot %s.",
     "Verify settings and count groups" : "Verifiëren instellingen en tel groepen",
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Backup (Replica) Poort",
     "Disable Main Server" : "Deactiveren hoofdserver",
     "Only connect to the replica server." : "Maak alleen een verbinding met de replica server.",
-    "Case insensitive LDAP server (Windows)" : "Niet-hoofdlettergevoelige LDAP server (Windows)",
     "Turn off SSL certificate validation." : "Schakel SSL certificaat validatie uit.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Niet aanbevolen, gebruik alleen om te testen! Als de connectie alleen werkt met deze optie, importeer dan het SSL-certificaat van de LDAP-server naar uw %s server.",
     "Cache Time-To-Live" : "Cache time-to-live",
@@ -143,7 +142,7 @@ OC.L10N.register(
     "in bytes" : "in bytes",
     "Email Field" : "E-mailveld",
     "User Home Folder Naming Rule" : "Gebruikers Home map naamgevingsregel",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laat leeg voor de gebruikersnaam (standaard). Of specificeer een LDAP/AD attribuut.",
     "Internal Username" : "Interne gebruikersnaam",
     "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standaard wordt de interne gebruikersnaam aangemaakt op basis van het UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle *DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van vóór ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op gekoppelde (toegevoegde) LDAP-gebruikers.",
     "Internal Username Attribute:" : "Interne gebruikersnaam attribuut:",
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
index 1b7b665781..4b930d7b4c 100644
--- a/apps/user_ldap/l10n/nl.json
+++ b/apps/user_ldap/l10n/nl.json
@@ -61,7 +61,7 @@
     "Search groups" : "Zoeken groepen",
     "Available groups" : "Beschikbare groepen",
     "Selected groups" : "Geselecteerde groepen",
-    "Edit LDAP Query" : "Bewerken LDAP bevraging",
+    "Edit LDAP Query" : "Bewerken LDAP opvraging",
     "LDAP Filter:" : "LDAP Filter:",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Dit filter geeft aan welke LDAP groepen toegang hebben tot %s.",
     "Verify settings and count groups" : "Verifiëren instellingen en tel groepen",
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Backup (Replica) Poort",
     "Disable Main Server" : "Deactiveren hoofdserver",
     "Only connect to the replica server." : "Maak alleen een verbinding met de replica server.",
-    "Case insensitive LDAP server (Windows)" : "Niet-hoofdlettergevoelige LDAP server (Windows)",
     "Turn off SSL certificate validation." : "Schakel SSL certificaat validatie uit.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Niet aanbevolen, gebruik alleen om te testen! Als de connectie alleen werkt met deze optie, importeer dan het SSL-certificaat van de LDAP-server naar uw %s server.",
     "Cache Time-To-Live" : "Cache time-to-live",
@@ -141,7 +140,7 @@
     "in bytes" : "in bytes",
     "Email Field" : "E-mailveld",
     "User Home Folder Naming Rule" : "Gebruikers Home map naamgevingsregel",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut.",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laat leeg voor de gebruikersnaam (standaard). Of specificeer een LDAP/AD attribuut.",
     "Internal Username" : "Interne gebruikersnaam",
     "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standaard wordt de interne gebruikersnaam aangemaakt op basis van het UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle *DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van vóór ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op gekoppelde (toegevoegde) LDAP-gebruikers.",
     "Internal Username Attribute:" : "Interne gebruikersnaam attribuut:",
diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js
index e609253281..e2e3a44d29 100644
--- a/apps/user_ldap/l10n/pl.js
+++ b/apps/user_ldap/l10n/pl.js
@@ -82,7 +82,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Kopia zapasowa (repliki) Port",
     "Disable Main Server" : "Wyłącz serwer główny",
     "Only connect to the replica server." : "Połącz tylko do repliki serwera.",
-    "Case insensitive LDAP server (Windows)" : "Serwer LDAP nie rozróżniający wielkości liter (Windows)",
     "Turn off SSL certificate validation." : "Wyłączyć sprawdzanie poprawności certyfikatu SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nie polecane, używać tylko w celu testowania! Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP na swój %s.",
     "Cache Time-To-Live" : "Przechowuj czas życia",
diff --git a/apps/user_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json
index feb4564409..1e518980da 100644
--- a/apps/user_ldap/l10n/pl.json
+++ b/apps/user_ldap/l10n/pl.json
@@ -80,7 +80,6 @@
     "Backup (Replica) Port" : "Kopia zapasowa (repliki) Port",
     "Disable Main Server" : "Wyłącz serwer główny",
     "Only connect to the replica server." : "Połącz tylko do repliki serwera.",
-    "Case insensitive LDAP server (Windows)" : "Serwer LDAP nie rozróżniający wielkości liter (Windows)",
     "Turn off SSL certificate validation." : "Wyłączyć sprawdzanie poprawności certyfikatu SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nie polecane, używać tylko w celu testowania! Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP na swój %s.",
     "Cache Time-To-Live" : "Przechowuj czas życia",
diff --git a/apps/user_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js
index 87c78e3d2f..f2ad0ca8a3 100644
--- a/apps/user_ldap/l10n/pt_BR.js
+++ b/apps/user_ldap/l10n/pt_BR.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Porta do Backup (Réplica)",
     "Disable Main Server" : "Desativar Servidor Principal",
     "Only connect to the replica server." : "Conectar-se somente ao servidor de réplica.",
-    "Case insensitive LDAP server (Windows)" : "Servidor LDAP(Windows) não distigue maiúscula de minúscula",
     "Turn off SSL certificate validation." : "Desligar validação de certificado SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Não recomendado, use-o somente para teste! Se a conexão só funciona com esta opção, importar o certificado SSL do servidor LDAP em seu servidor %s.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json
index 169ff1db41..752fd65388 100644
--- a/apps/user_ldap/l10n/pt_BR.json
+++ b/apps/user_ldap/l10n/pt_BR.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Porta do Backup (Réplica)",
     "Disable Main Server" : "Desativar Servidor Principal",
     "Only connect to the replica server." : "Conectar-se somente ao servidor de réplica.",
-    "Case insensitive LDAP server (Windows)" : "Servidor LDAP(Windows) não distigue maiúscula de minúscula",
     "Turn off SSL certificate validation." : "Desligar validação de certificado SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Não recomendado, use-o somente para teste! Se a conexão só funciona com esta opção, importar o certificado SSL do servidor LDAP em seu servidor %s.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
index 0c37960e82..2170def292 100644
--- a/apps/user_ldap/l10n/pt_PT.js
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -82,7 +82,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Porta do servidor de backup (Replica)",
     "Disable Main Server" : "Desactivar servidor principal",
     "Only connect to the replica server." : "Ligar apenas ao servidor de réplicas.",
-    "Case insensitive LDAP server (Windows)" : "Servidor LDAP (Windows) não é sensível a maiúsculas.",
     "Turn off SSL certificate validation." : "Desligar a validação de certificado SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Não recomendado, use-o somente para teste! ligação só funciona com esta opção, importar o certificado SSL do servidor LDAP para o seu servidor %s.",
     "Cache Time-To-Live" : "Cache do tempo de vida dos objetos no servidor",
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
index b95eb4ce2c..f6fd6e4806 100644
--- a/apps/user_ldap/l10n/pt_PT.json
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -80,7 +80,6 @@
     "Backup (Replica) Port" : "Porta do servidor de backup (Replica)",
     "Disable Main Server" : "Desactivar servidor principal",
     "Only connect to the replica server." : "Ligar apenas ao servidor de réplicas.",
-    "Case insensitive LDAP server (Windows)" : "Servidor LDAP (Windows) não é sensível a maiúsculas.",
     "Turn off SSL certificate validation." : "Desligar a validação de certificado SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Não recomendado, use-o somente para teste! ligação só funciona com esta opção, importar o certificado SSL do servidor LDAP para o seu servidor %s.",
     "Cache Time-To-Live" : "Cache do tempo de vida dos objetos no servidor",
diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js
index 8ddf80841a..81078d595f 100644
--- a/apps/user_ldap/l10n/ru.js
+++ b/apps/user_ldap/l10n/ru.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Порт резервного сервера",
     "Disable Main Server" : "Отключить главный сервер",
     "Only connect to the replica server." : "Подключаться только к резервному серверу",
-    "Case insensitive LDAP server (Windows)" : "Нечувствительный к регистру сервер LDAP (Windows)",
     "Turn off SSL certificate validation." : "Отключить проверку сертификата SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер SSL-сертификат сервера LDAP.",
     "Cache Time-To-Live" : "Кэш времени жизни (TTL)",
diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json
index ede0d5357d..834a9b7c05 100644
--- a/apps/user_ldap/l10n/ru.json
+++ b/apps/user_ldap/l10n/ru.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Порт резервного сервера",
     "Disable Main Server" : "Отключить главный сервер",
     "Only connect to the replica server." : "Подключаться только к резервному серверу",
-    "Case insensitive LDAP server (Windows)" : "Нечувствительный к регистру сервер LDAP (Windows)",
     "Turn off SSL certificate validation." : "Отключить проверку сертификата SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер SSL-сертификат сервера LDAP.",
     "Cache Time-To-Live" : "Кэш времени жизни (TTL)",
diff --git a/apps/user_ldap/l10n/sk.js b/apps/user_ldap/l10n/sk.js
deleted file mode 100644
index 33b6d85e73..0000000000
--- a/apps/user_ldap/l10n/sk.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "Save" : "Uložiť",
-    "Advanced" : "Pokročilé"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/user_ldap/l10n/sk.json b/apps/user_ldap/l10n/sk.json
deleted file mode 100644
index 52c7f32624..0000000000
--- a/apps/user_ldap/l10n/sk.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Save" : "Uložiť",
-    "Advanced" : "Pokročilé"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/sk_SK.js b/apps/user_ldap/l10n/sk_SK.js
index 654f0cfee3..4a41059ff3 100644
--- a/apps/user_ldap/l10n/sk_SK.js
+++ b/apps/user_ldap/l10n/sk_SK.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Záložný server (kópia) port",
     "Disable Main Server" : "Zakázať hlavný server",
     "Only connect to the replica server." : "Pripojiť sa len k záložnému serveru.",
-    "Case insensitive LDAP server (Windows)" : "LDAP server je citlivý na veľkosť písmen (Windows)",
     "Turn off SSL certificate validation." : "Vypnúť overovanie SSL certifikátu.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.",
     "Cache Time-To-Live" : "Životnosť objektov vo vyrovnávacej pamäti",
diff --git a/apps/user_ldap/l10n/sk_SK.json b/apps/user_ldap/l10n/sk_SK.json
index 441ca4fd06..126c86c8c3 100644
--- a/apps/user_ldap/l10n/sk_SK.json
+++ b/apps/user_ldap/l10n/sk_SK.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Záložný server (kópia) port",
     "Disable Main Server" : "Zakázať hlavný server",
     "Only connect to the replica server." : "Pripojiť sa len k záložnému serveru.",
-    "Case insensitive LDAP server (Windows)" : "LDAP server je citlivý na veľkosť písmen (Windows)",
     "Turn off SSL certificate validation." : "Vypnúť overovanie SSL certifikátu.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.",
     "Cache Time-To-Live" : "Životnosť objektov vo vyrovnávacej pamäti",
diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js
index f965cf658c..86a372efd9 100644
--- a/apps/user_ldap/l10n/sl.js
+++ b/apps/user_ldap/l10n/sl.js
@@ -76,7 +76,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Vrata varnostne kopije (replike)",
     "Disable Main Server" : "Onemogoči glavni strežnik",
     "Only connect to the replica server." : "Poveži le s podvojenim strežnikom.",
-    "Case insensitive LDAP server (Windows)" : "Strežnik LDAP (brez upoštevanja velikosti črk) (Windows)",
     "Turn off SSL certificate validation." : "Onemogoči določanje veljavnosti potrdila SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Možnosti ni priporočljivo uporabiti; namenjena je zgolj preizkušanju! Če deluje povezava le s to možnostjo, je treba uvoziti potrdilo SSL strežnika LDAP na strežnik %s.",
     "Cache Time-To-Live" : "Predpomni podatke TTL",
diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json
index efb51bad00..268d5f09c9 100644
--- a/apps/user_ldap/l10n/sl.json
+++ b/apps/user_ldap/l10n/sl.json
@@ -74,7 +74,6 @@
     "Backup (Replica) Port" : "Vrata varnostne kopije (replike)",
     "Disable Main Server" : "Onemogoči glavni strežnik",
     "Only connect to the replica server." : "Poveži le s podvojenim strežnikom.",
-    "Case insensitive LDAP server (Windows)" : "Strežnik LDAP (brez upoštevanja velikosti črk) (Windows)",
     "Turn off SSL certificate validation." : "Onemogoči določanje veljavnosti potrdila SSL.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Možnosti ni priporočljivo uporabiti; namenjena je zgolj preizkušanju! Če deluje povezava le s to možnostjo, je treba uvoziti potrdilo SSL strežnika LDAP na strežnik %s.",
     "Cache Time-To-Live" : "Predpomni podatke TTL",
diff --git a/apps/user_ldap/l10n/sr.js b/apps/user_ldap/l10n/sr.js
index 89ec30d6af..e95d656d68 100644
--- a/apps/user_ldap/l10n/sr.js
+++ b/apps/user_ldap/l10n/sr.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Порт Резервне копије (Реплике)",
     "Disable Main Server" : "Онемогући главни сервер",
     "Only connect to the replica server." : "Повезано само на сервер за копирање.",
-    "Case insensitive LDAP server (Windows)" : "LDAP сервер неосетљив на велика и мала слова (Windows)",
     "Turn off SSL certificate validation." : "Искључите потврду ССЛ сертификата.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Није препоручено, користите само за тестирање! Ако веза ради само са овом опцијом, увезите SSL сертификате LDAP сервера на ваш %s сервер.",
     "Cache Time-To-Live" : "Трајност кеша",
diff --git a/apps/user_ldap/l10n/sr.json b/apps/user_ldap/l10n/sr.json
index 20de66c500..a52d7184b3 100644
--- a/apps/user_ldap/l10n/sr.json
+++ b/apps/user_ldap/l10n/sr.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "Порт Резервне копије (Реплике)",
     "Disable Main Server" : "Онемогући главни сервер",
     "Only connect to the replica server." : "Повезано само на сервер за копирање.",
-    "Case insensitive LDAP server (Windows)" : "LDAP сервер неосетљив на велика и мала слова (Windows)",
     "Turn off SSL certificate validation." : "Искључите потврду ССЛ сертификата.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Није препоручено, користите само за тестирање! Ако веза ради само са овом опцијом, увезите SSL сертификате LDAP сервера на ваш %s сервер.",
     "Cache Time-To-Live" : "Трајност кеша",
diff --git a/apps/user_ldap/l10n/sv.js b/apps/user_ldap/l10n/sv.js
index 95921f2046..dd75c83633 100644
--- a/apps/user_ldap/l10n/sv.js
+++ b/apps/user_ldap/l10n/sv.js
@@ -64,7 +64,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Säkerhetskopierins-port (Replika)",
     "Disable Main Server" : "Inaktivera huvudserver",
     "Only connect to the replica server." : "Anslut endast till replikaservern.",
-    "Case insensitive LDAP server (Windows)" : "om okänslig LDAP-server (Windows)",
     "Turn off SSL certificate validation." : "Stäng av verifiering av SSL-certifikat.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/sv.json b/apps/user_ldap/l10n/sv.json
index 3f2b74e8da..d71e94b305 100644
--- a/apps/user_ldap/l10n/sv.json
+++ b/apps/user_ldap/l10n/sv.json
@@ -62,7 +62,6 @@
     "Backup (Replica) Port" : "Säkerhetskopierins-port (Replika)",
     "Disable Main Server" : "Inaktivera huvudserver",
     "Only connect to the replica server." : "Anslut endast till replikaservern.",
-    "Case insensitive LDAP server (Windows)" : "om okänslig LDAP-server (Windows)",
     "Turn off SSL certificate validation." : "Stäng av verifiering av SSL-certifikat.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.",
     "Cache Time-To-Live" : "Cache Time-To-Live",
diff --git a/apps/user_ldap/l10n/th_TH.js b/apps/user_ldap/l10n/th_TH.js
index ea55c7c493..d088d01f6c 100644
--- a/apps/user_ldap/l10n/th_TH.js
+++ b/apps/user_ldap/l10n/th_TH.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "สำรองข้อมูลพอร์ต (จำลอง) ",
     "Disable Main Server" : "ปิดใช้งานเซิร์ฟเวอร์หลัก",
     "Only connect to the replica server." : "เฉพาะเชื่อมต่อกับเซิร์ฟเวอร์แบบจำลอง",
-    "Case insensitive LDAP server (Windows)" : "กรณีเซิร์ฟเวอร์ LDAP ไม่ตอบสนอง (วินโดว์ส)",
     "Turn off SSL certificate validation." : "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "ไม่แนะนำ ควรใช้สำหรับการทดสอบเท่านั้น! ถ้าการเชื่อมต่อใช้งานได้เฉพาะกับตัวเลือกนี้ นำเข้าใบรับรอง SSL เซิร์ฟเวอร์ LDAP ในเซิร์ฟเวอร์ %s ของคุณ ",
     "Cache Time-To-Live" : "แคช TTL",
diff --git a/apps/user_ldap/l10n/th_TH.json b/apps/user_ldap/l10n/th_TH.json
index ace0e5517a..87afedbeeb 100644
--- a/apps/user_ldap/l10n/th_TH.json
+++ b/apps/user_ldap/l10n/th_TH.json
@@ -113,7 +113,6 @@
     "Backup (Replica) Port" : "สำรองข้อมูลพอร์ต (จำลอง) ",
     "Disable Main Server" : "ปิดใช้งานเซิร์ฟเวอร์หลัก",
     "Only connect to the replica server." : "เฉพาะเชื่อมต่อกับเซิร์ฟเวอร์แบบจำลอง",
-    "Case insensitive LDAP server (Windows)" : "กรณีเซิร์ฟเวอร์ LDAP ไม่ตอบสนอง (วินโดว์ส)",
     "Turn off SSL certificate validation." : "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "ไม่แนะนำ ควรใช้สำหรับการทดสอบเท่านั้น! ถ้าการเชื่อมต่อใช้งานได้เฉพาะกับตัวเลือกนี้ นำเข้าใบรับรอง SSL เซิร์ฟเวอร์ LDAP ในเซิร์ฟเวอร์ %s ของคุณ ",
     "Cache Time-To-Live" : "แคช TTL",
diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js
index 7f6945468f..944d39928d 100644
--- a/apps/user_ldap/l10n/tr.js
+++ b/apps/user_ldap/l10n/tr.js
@@ -32,11 +32,20 @@ OC.L10N.register(
     "Mappings cleared successfully!" : "Eşleştirmeler başarıyla temizlendi!",
     "Error while clearing the mappings." : "Eşleşmeler temizlenirken hata.",
     "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonim atamaya izin verilmiyor. Lütfen bir Kullanıcı DN ve Parola sağlayın.",
+    "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP İşlem hatası. Anonim bağlamaya izin verilmiyor.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Kaydetme başarısız oldu. Veritabanının işlemde olduğundan emin olun. Devam etmeden yeniden yükleyin.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Kipi değiştirmek otomatik LDAP sorgularını etkinleştirecektir. LDAP'ınızın boyutlarına göre bu bir süre alacaktır. Kipi yine de değiştirmek istiyor musunuz?",
     "Mode switch" : "Kip değişimi",
     "Select attributes" : "Nitelikleri seç",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Kullanıcı bulunamadı. Lütfen oturum açtığınız nitelikleri ve kullanıcı adını kontrol edin. Etkili filtre (komut satırı doğrulaması için kopyala-yapıştır için): <br/>",
+    "User found and settings verified." : "Kullanıcı bulundu ve ayarlar doğrulandı.",
     "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Ayarlar doğrulandı ancak tek kullanıcı bulundu. Sadece ilk kullanıcı oturum açabilecek. Lütfen daha dar bir filtre seçin.",
     "An unspecified error occurred. Please check the settings and the log." : "Belirtilmeyen bir hata oluştu. Lütfen ayarları ve günlüğü denetleyin.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Arama filtresi, eşleşmeyen parantez sayısı sebebiyle oluşabilen sözdizimi sorunlarından dolayı geçersiz. Lütfen gözden geçirin.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "LDAP / AD için bir bağlantı hatası oluştu, lütfen istemci, port ve kimlik bilgilerini kontrol edin.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "%uid yer tutucusu eksik. LDAP / AD sorgularında kullanıcı adı ile değiştirilecek.",
+    "Please provide a login name to test against" : "Lütfen deneme için kullanılacak bir kullanıcı adı girin",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "LDAP / AD sunucusu memberOf desteklemediğinden grup kutusu kapatıldı.",
     "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"],
     "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Görüntülenecek kullanıcı adı özelliği algılanamadı. Lütfen gelişmiş ldap ayarlarına girerek kendiniz belirleyin.",
@@ -60,6 +69,9 @@ OC.L10N.register(
     "Verify settings and count groups" : "Ayarları doğrula ve grupları say",
     "When logging in, %s will find the user based on the following attributes:" : "Oturum açılırken, %s, aşağıdaki özniteliklere bağlı kullanıcıyı bulacak:",
     "LDAP / AD Username:" : "LDAP / AD Kullanıcı Adı:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "LDAP / AD kullanıcı adı ile oturum açmaya izin verir.",
+    "LDAP / AD Email Address:" : "LDAP / AD Eposta Adresi:",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Bir eposta kimliği ile oturum açmaya izin verir. Mail ve mailPrimaryAddress'e izin verilir.",
     "Other Attributes:" : "Diğer Nitelikler:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"",
     "Test Loginname" : "Oturum açma adını sına",
@@ -103,7 +115,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Yedek (Replica) Bağlantı Noktası",
     "Disable Main Server" : "Ana Sunucuyu Devre Dışı Bırak",
     "Only connect to the replica server." : "Sadece yedek sunucuya bağlan.",
-    "Case insensitive LDAP server (Windows)" : "Büyük küçük harf duyarsız LDAP sunucusu (Windows)",
     "Turn off SSL certificate validation." : "SSL sertifika doğrulamasını kapat.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Önerilmez, sadece test için kullanın! Eğer bağlantı sadece bu seçenekle çalışıyorsa %s sunucunuza LDAP sunucusunun SSL sertifikasını ekleyin.",
     "Cache Time-To-Live" : "Önbellek Time-To-Live Değeri",
diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json
index 47203b4818..553dfe6cdb 100644
--- a/apps/user_ldap/l10n/tr.json
+++ b/apps/user_ldap/l10n/tr.json
@@ -30,11 +30,20 @@
     "Mappings cleared successfully!" : "Eşleştirmeler başarıyla temizlendi!",
     "Error while clearing the mappings." : "Eşleşmeler temizlenirken hata.",
     "Anonymous bind is not allowed. Please provide a User DN and Password." : "Anonim atamaya izin verilmiyor. Lütfen bir Kullanıcı DN ve Parola sağlayın.",
+    "LDAP Operations error. Anonymous bind might not be allowed." : "LDAP İşlem hatası. Anonim bağlamaya izin verilmiyor.",
+    "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "Kaydetme başarısız oldu. Veritabanının işlemde olduğundan emin olun. Devam etmeden yeniden yükleyin.",
+    "Switching the mode will enable automatic LDAP queries. Depending on your LDAP size they may take a while. Do you still want to switch the mode?" : "Kipi değiştirmek otomatik LDAP sorgularını etkinleştirecektir. LDAP'ınızın boyutlarına göre bu bir süre alacaktır. Kipi yine de değiştirmek istiyor musunuz?",
     "Mode switch" : "Kip değişimi",
     "Select attributes" : "Nitelikleri seç",
+    "User not found. Please check your login attributes and username. Effective filter (to copy-and-paste for command line validation): <br/>" : "Kullanıcı bulunamadı. Lütfen oturum açtığınız nitelikleri ve kullanıcı adını kontrol edin. Etkili filtre (komut satırı doğrulaması için kopyala-yapıştır için): <br/>",
+    "User found and settings verified." : "Kullanıcı bulundu ve ayarlar doğrulandı.",
     "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Ayarlar doğrulandı ancak tek kullanıcı bulundu. Sadece ilk kullanıcı oturum açabilecek. Lütfen daha dar bir filtre seçin.",
     "An unspecified error occurred. Please check the settings and the log." : "Belirtilmeyen bir hata oluştu. Lütfen ayarları ve günlüğü denetleyin.",
     "The search filter is invalid, probably due to syntax issues like uneven number of opened and closed brackets. Please revise." : "Arama filtresi, eşleşmeyen parantez sayısı sebebiyle oluşabilen sözdizimi sorunlarından dolayı geçersiz. Lütfen gözden geçirin.",
+    "A connection error to LDAP / AD occurred, please check host, port and credentials." : "LDAP / AD için bir bağlantı hatası oluştu, lütfen istemci, port ve kimlik bilgilerini kontrol edin.",
+    "The %uid placeholder is missing. It will be replaced with the login name when querying LDAP / AD." : "%uid yer tutucusu eksik. LDAP / AD sorgularında kullanıcı adı ile değiştirilecek.",
+    "Please provide a login name to test against" : "Lütfen deneme için kullanılacak bir kullanıcı adı girin",
+    "The group box was disabled, because the LDAP / AD server does not support memberOf." : "LDAP / AD sunucusu memberOf desteklemediğinden grup kutusu kapatıldı.",
     "_%s group found_::_%s groups found_" : ["%s grup bulundu","%s grup bulundu"],
     "_%s user found_::_%s users found_" : ["%s kullanıcı bulundu","%s kullanıcı bulundu"],
     "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Görüntülenecek kullanıcı adı özelliği algılanamadı. Lütfen gelişmiş ldap ayarlarına girerek kendiniz belirleyin.",
@@ -58,6 +67,9 @@
     "Verify settings and count groups" : "Ayarları doğrula ve grupları say",
     "When logging in, %s will find the user based on the following attributes:" : "Oturum açılırken, %s, aşağıdaki özniteliklere bağlı kullanıcıyı bulacak:",
     "LDAP / AD Username:" : "LDAP / AD Kullanıcı Adı:",
+    "Allows login against the LDAP / AD username, which is either uid or samaccountname and will be detected." : "LDAP / AD kullanıcı adı ile oturum açmaya izin verir.",
+    "LDAP / AD Email Address:" : "LDAP / AD Eposta Adresi:",
+    "Allows login against an email attribute. Mail and mailPrimaryAddress will be allowed." : "Bir eposta kimliği ile oturum açmaya izin verir. Mail ve mailPrimaryAddress'e izin verilir.",
     "Other Attributes:" : "Diğer Nitelikler:",
     "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Oturum açma girişimi olduğunda uygulanacak filtreyi tanımlar. %%uid, oturum işleminde kullanıcı adı ile değiştirilir. Örneğin: \"uid=%%uid\"",
     "Test Loginname" : "Oturum açma adını sına",
@@ -101,7 +113,6 @@
     "Backup (Replica) Port" : "Yedek (Replica) Bağlantı Noktası",
     "Disable Main Server" : "Ana Sunucuyu Devre Dışı Bırak",
     "Only connect to the replica server." : "Sadece yedek sunucuya bağlan.",
-    "Case insensitive LDAP server (Windows)" : "Büyük küçük harf duyarsız LDAP sunucusu (Windows)",
     "Turn off SSL certificate validation." : "SSL sertifika doğrulamasını kapat.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Önerilmez, sadece test için kullanın! Eğer bağlantı sadece bu seçenekle çalışıyorsa %s sunucunuza LDAP sunucusunun SSL sertifikasını ekleyin.",
     "Cache Time-To-Live" : "Önbellek Time-To-Live Değeri",
diff --git a/apps/user_ldap/l10n/uk.js b/apps/user_ldap/l10n/uk.js
index de7bcf5faf..fe2b587fec 100644
--- a/apps/user_ldap/l10n/uk.js
+++ b/apps/user_ldap/l10n/uk.js
@@ -76,7 +76,6 @@ OC.L10N.register(
     "Backup (Replica) Port" : "Порт сервера для резервних копій",
     "Disable Main Server" : "Вимкнути Головний Сервер",
     "Only connect to the replica server." : "Підключити тільки до сервера реплік.",
-    "Case insensitive LDAP server (Windows)" : "Без урахування регістра LDAP сервер (Windows)",
     "Turn off SSL certificate validation." : "Вимкнути перевірку SSL сертифіката.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендується, використовувати його тільки для тестування!\nЯкщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший %s сервер.",
     "Cache Time-To-Live" : "Час актуальності Кеша",
diff --git a/apps/user_ldap/l10n/uk.json b/apps/user_ldap/l10n/uk.json
index 6590a639df..b43de37ab3 100644
--- a/apps/user_ldap/l10n/uk.json
+++ b/apps/user_ldap/l10n/uk.json
@@ -74,7 +74,6 @@
     "Backup (Replica) Port" : "Порт сервера для резервних копій",
     "Disable Main Server" : "Вимкнути Головний Сервер",
     "Only connect to the replica server." : "Підключити тільки до сервера реплік.",
-    "Case insensitive LDAP server (Windows)" : "Без урахування регістра LDAP сервер (Windows)",
     "Turn off SSL certificate validation." : "Вимкнути перевірку SSL сертифіката.",
     "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендується, використовувати його тільки для тестування!\nЯкщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший %s сервер.",
     "Cache Time-To-Live" : "Час актуальності Кеша",
diff --git a/apps/user_ldap/l10n/ur.js b/apps/user_ldap/l10n/ur.js
deleted file mode 100644
index 7dfbc33c3e..0000000000
--- a/apps/user_ldap/l10n/ur.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "Error" : "خرابی"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ur.json b/apps/user_ldap/l10n/ur.json
deleted file mode 100644
index 1c1fc3d16c..0000000000
--- a/apps/user_ldap/l10n/ur.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index 0af819ff66..1cbe45a82c 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -43,7 +43,6 @@ class Configuration {
 		'ldapAgentName' => null,
 		'ldapAgentPassword' => null,
 		'ldapTLS' => null,
-		'ldapNoCase' => null,
 		'turnOffCertCheck' => null,
 		'ldapIgnoreNamingRules' => null,
 		'ldapUserDisplayName' => null,
@@ -379,7 +378,6 @@ class Configuration {
 			'ldap_display_name'                 => 'displayName',
 			'ldap_group_display_name'           => 'cn',
 			'ldap_tls'                          => 0,
-			'ldap_nocase'                       => 0,
 			'ldap_quota_def'                    => '',
 			'ldap_quota_attr'                   => '',
 			'ldap_email_attr'                   => '',
@@ -436,7 +434,6 @@ class Configuration {
 			'ldap_display_name'                 => 'ldapUserDisplayName',
 			'ldap_group_display_name'           => 'ldapGroupDisplayName',
 			'ldap_tls'                          => 'ldapTLS',
-			'ldap_nocase'                       => 'ldapNoCase',
 			'ldap_quota_def'                    => 'ldapQuotaDefault',
 			'ldap_quota_attr'                   => 'ldapQuotaAttribute',
 			'ldap_email_attr'                   => 'ldapEmailAttribute',
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 6f2fdce1b5..f6b123babd 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -206,7 +206,7 @@ class Connection extends LDAPUtility {
 		}
 		$key = $this->getCacheKey($key);
 
-		return unserialize(base64_decode($this->cache->get($key)));
+		return json_decode(base64_decode($this->cache->get($key)));
 	}
 
 	/**
@@ -240,7 +240,7 @@ class Connection extends LDAPUtility {
 			return null;
 		}
 		$key   = $this->getCacheKey($key);
-		$value = base64_encode(serialize($value));
+		$value = base64_encode(json_encode($value));
 		$this->cache->set($key, $value, $this->configuration->ldapCacheTTL);
 	}
 
diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php
index ef01213990..2a423cb0e4 100644
--- a/apps/user_ldap/lib/proxy.php
+++ b/apps/user_ldap/lib/proxy.php
@@ -161,7 +161,7 @@ abstract class Proxy {
 		}
 		$key = $this->getCacheKey($key);
 
-		return unserialize(base64_decode($this->cache->get($key)));
+		return json_decode(base64_decode($this->cache->get($key)));
 	}
 
 	/**
@@ -185,7 +185,7 @@ abstract class Proxy {
 			return;
 		}
 		$key   = $this->getCacheKey($key);
-		$value = base64_encode(serialize($value));
+		$value = base64_encode(json_encode($value));
 		$this->cache->set($key, $value, '2592000');
 	}
 
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index f40eba005d..88900e22bf 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -78,7 +78,6 @@ style('user_ldap', 'settings');
 				<p><label for="ldap_backup_host"><?php p($l->t('Backup (Replica) Host'));?></label><input type="text" id="ldap_backup_host" name="ldap_backup_host" data-default="<?php p($_['ldap_backup_host_default']); ?>" title="<?php p($l->t('Give an optional backup host. It must be a replica of the main LDAP/AD server.'));?>"></p>
 				<p><label for="ldap_backup_port"><?php p($l->t('Backup (Replica) Port'));?></label><input type="number" id="ldap_backup_port" name="ldap_backup_port" data-default="<?php p($_['ldap_backup_port_default']); ?>"  /></p>
 				<p><label for="ldap_override_main_server"><?php p($l->t('Disable Main Server'));?></label><input type="checkbox" id="ldap_override_main_server" name="ldap_override_main_server" value="1" data-default="<?php p($_['ldap_override_main_server_default']); ?>"  title="<?php p($l->t('Only connect to the replica server.'));?>" /></p>
-				<p><label for="ldap_nocase"><?php p($l->t('Case insensitive LDAP server (Windows)'));?></label><input type="checkbox" id="ldap_nocase" name="ldap_nocase" data-default="<?php p($_['ldap_nocase_default']); ?>"  value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) p(' checked'); ?>></p>
 				<p><label for="ldap_turn_off_cert_check"><?php p($l->t('Turn off SSL certificate validation.'));?></label><input type="checkbox" id="ldap_turn_off_cert_check" name="ldap_turn_off_cert_check" title="<?php p($l->t('Not recommended, use it for testing only! If connection only works with this option, import the LDAP server\'s SSL certificate in your %s server.', $theme->getName() ));?>" data-default="<?php p($_['ldap_turn_off_cert_check_default']); ?>" value="1"><br/></p>
 				<p><label for="ldap_cache_ttl"><?php p($l->t('Cache Time-To-Live'));?></label><input type="number" id="ldap_cache_ttl" name="ldap_cache_ttl" title="<?php p($l->t('in seconds. A change empties the cache.'));?>" data-default="<?php p($_['ldap_cache_ttl_default']); ?>" /></p>
 			</div>
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index f716618ce4..805238e7d3 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -395,16 +395,15 @@ class Test_Group_Ldap extends \Test\TestCase {
 			->method('username2dn')
 			->will($this->returnValue($dn));
 
-		$access->expects($this->once())
+		$access->expects($this->exactly(3))
 			->method('readAttribute')
-			->with($dn, 'memberOf')
-			->will($this->returnValue(['cn=groupA,dc=foobar', 'cn=groupB,dc=foobar']));
+			->will($this->onConsecutiveCalls(['cn=groupA,dc=foobar', 'cn=groupB,dc=foobar'], [], []));
 
 		$access->expects($this->exactly(2))
 			->method('dn2groupname')
 			->will($this->returnArgument(0));
 
-		$access->expects($this->once())
+		$access->expects($this->exactly(3))
 			->method('groupsMatchFilter')
 			->will($this->returnArgument(0));
 
diff --git a/apps/user_webdavauth/l10n/de_CH.js b/apps/user_webdavauth/l10n/de_CH.js
deleted file mode 100644
index 84bcb9d4ef..0000000000
--- a/apps/user_webdavauth/l10n/de_CH.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "WebDAV Authentication" : "WebDAV-Authentifizierung",
-    "Save" : "Speichern",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/de_CH.json b/apps/user_webdavauth/l10n/de_CH.json
deleted file mode 100644
index 1c47d57a34..0000000000
--- a/apps/user_webdavauth/l10n/de_CH.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "WebDAV Authentication" : "WebDAV-Authentifizierung",
-    "Save" : "Speichern",
-    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Die Benutzerdaten werden an diese Adresse gesendet. Dieses Plugin prüft die Antwort und wird die HTTP-Statuscodes 401 und 403 als ungültige Daten interpretieren und alle anderen Antworten als gültige Daten."
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/eu_ES.json b/apps/user_webdavauth/l10n/eu_ES.json
deleted file mode 100644
index 7a78f4bece..0000000000
--- a/apps/user_webdavauth/l10n/eu_ES.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Gorde"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/fi.js b/apps/user_webdavauth/l10n/fi.js
deleted file mode 100644
index 09bd8e55e7..0000000000
--- a/apps/user_webdavauth/l10n/fi.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "Tallenna"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/fi.json b/apps/user_webdavauth/l10n/fi.json
deleted file mode 100644
index f4a8647859..0000000000
--- a/apps/user_webdavauth/l10n/fi.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Tallenna"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/is.js b/apps/user_webdavauth/l10n/is.js
index cc9515a945..1a09c2729e 100644
--- a/apps/user_webdavauth/l10n/is.js
+++ b/apps/user_webdavauth/l10n/is.js
@@ -2,6 +2,8 @@ OC.L10N.register(
     "user_webdavauth",
     {
     "WebDAV Authentication" : "WebDAV Auðkenni",
-    "Save" : "Vista"
+    "Address:" : "Netfang:",
+    "Save" : "Vista",
+    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Notanda auðkenni verður sent á þetta netfang. Þessi viðbót fer yfir viðbrögð og túlkar HTTP statuscodes 401 og 403 sem ógilda auðkenni, og öll önnur svör sem gilt auðkenni."
 },
-"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);");
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/apps/user_webdavauth/l10n/is.json b/apps/user_webdavauth/l10n/is.json
index e59f045773..08ff2d6df3 100644
--- a/apps/user_webdavauth/l10n/is.json
+++ b/apps/user_webdavauth/l10n/is.json
@@ -1,5 +1,7 @@
 { "translations": {
     "WebDAV Authentication" : "WebDAV Auðkenni",
-    "Save" : "Vista"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"
+    "Address:" : "Netfang:",
+    "Save" : "Vista",
+    "The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." : "Notanda auðkenni verður sent á þetta netfang. Þessi viðbót fer yfir viðbrögð og túlkar HTTP statuscodes 401 og 403 sem ógilda auðkenni, og öll önnur svör sem gilt auðkenni."
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sk.js b/apps/user_webdavauth/l10n/sk.js
deleted file mode 100644
index 299b57be67..0000000000
--- a/apps/user_webdavauth/l10n/sk.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "user_webdavauth",
-    {
-    "Save" : "Uložiť"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/user_webdavauth/l10n/sk.json b/apps/user_webdavauth/l10n/sk.json
deleted file mode 100644
index 48cd128194..0000000000
--- a/apps/user_webdavauth/l10n/sk.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Save" : "Uložiť"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/autotest-external.sh b/autotest-external.sh
index 65d53aaa95..cb5a3dad50 100755
--- a/autotest-external.sh
+++ b/autotest-external.sh
@@ -17,6 +17,9 @@ BASEDIR=$PWD
 DBCONFIGS="sqlite mysql pgsql oci"
 PHPUNIT=$(which phpunit)
 
+_XDEBUG_CONFIG=$XDEBUG_CONFIG
+unset XDEBUG_CONFIG
+
 function print_syntax {
 	echo -e "Syntax: ./autotest-external.sh [dbconfigname] [startfile]\n" >&2
 	echo -e "\t\"dbconfigname\" can be one of: $DBCONFIGS" >&2
@@ -159,6 +162,9 @@ EOF
 	mkdir "coverage-external-html-$1"
 	# just enable files_external
 	php ../occ app:enable files_external
+	if [[ "$_XDEBUG_CONFIG" ]]; then
+		export XDEBUG_CONFIG=$_XDEBUG_CONFIG
+	fi
 	if [ -z "$NOCOVERAGE" ]; then
 		"$PHPUNIT" --configuration phpunit-autotest-external.xml --log-junit "autotest-external-results-$1.xml" --coverage-clover "autotest-external-clover-$1.xml" --coverage-html "coverage-external-html-$1"
 		RESULT=$?
diff --git a/autotest.sh b/autotest.sh
index 0e112bfda3..6a09fbfaba 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -32,6 +32,9 @@ fi
 PHP=$(which "$PHP_EXE")
 PHPUNIT=$(which phpunit)
 
+_XDEBUG_CONFIG=$XDEBUG_CONFIG
+unset XDEBUG_CONFIG
+
 function print_syntax {
 	echo -e "Syntax: ./autotest.sh [dbconfigname] [testfile]\n" >&2
 	echo -e "\t\"dbconfigname\" can be one of: $DBCONFIGS" >&2
@@ -217,6 +220,9 @@ function execute_tests {
 	rm -rf "coverage-html-$DB"
 	mkdir "coverage-html-$DB"
 	"$PHP" -f enable_all.php | grep -i -C9999 error && echo "Error during setup" && exit 101
+	if [[ "$_XDEBUG_CONFIG" ]]; then
+		export XDEBUG_CONFIG=$_XDEBUG_CONFIG
+	fi
 	if [ -z "$NOCOVERAGE" ]; then
 		"${PHPUNIT[@]}" --configuration phpunit-autotest.xml --log-junit "autotest-results-$DB.xml" --coverage-clover "autotest-clover-$DB.xml" --coverage-html "coverage-html-$DB" "$2" "$3"
 		RESULT=$?
diff --git a/config/config.sample.php b/config/config.sample.php
index 522cf02ceb..b9035e3988 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -20,12 +20,6 @@
  *  * use RST syntax
  */
 
-/**
- * Only enable this for local development and not in production environments
- * This will disable the minifier and outputs some additional debug informations
- */
-define('DEBUG', true);
-
 $CONFIG = array(
 
 
@@ -85,6 +79,16 @@ $CONFIG = array(
  */
 'datadirectory' => '/var/www/owncloud/data',
 
+/**
+ * Override where ownCloud stores temporary files. Useful in situations where
+ * the system temporary directory is on a limited space ramdisk or is otherwise
+ * restricted, or if external storages which do not support streaming are in
+ * use.
+ *
+ * The web server user must have write access to this directory.
+ */
+'tempdirectory' => '/tmp/owncloudtemp',
+
 /**
  * The current version number of your ownCloud installation. This is set up
  * during installation and update, so you shouldn't need to change it.
@@ -430,6 +434,33 @@ $CONFIG = array(
 'trashbin_retention_obligation' => 'auto',
 
 
+/**
+ * If the versions app is enabled (default), this setting defines the policy
+ * for when versions will be permanently deleted.
+ * The app allows for two settings, a minimum time for version retention,
+ * and a maximum time for version retention.
+ * Minimum time is the number of days a version will be kept, after which it
+ * may be deleted. Maximum time is the number of days at which it is guaranteed
+ * to be deleted.
+ * Both minimum and maximum times can be set together to explicitly define
+ * version deletion. For migration purposes, this setting is installed
+ * initially set to "auto", which is equivalent to the default setting in
+ * ownCloud 8.1 and before.
+ *
+ * Available values:
+ *   ``auto``      default setting. Automatically expire versions according to
+ *                 expire rules. Please refer to Files_versions online documentation 
+ *                 for more info.
+ *   ``D, auto``   keep versions at least for D days, apply expire rules to all
+ *                 versions that older than D days
+ * * ``auto, D``   delete all versions that are older than D days automatically,
+ *                 delete other versions according to expire rules
+ * * ``D1, D2``    keep versions for at least D1 days and delete when exceeds D2 days
+ *   ``disabled``  versions auto clean disabled, versions will be kept forever
+ */
+'versions_retention_obligation' => 'auto',
+
+
 /**
  * ownCloud Verifications
  *
@@ -1059,17 +1090,15 @@ $CONFIG = array(
 
 /**
  * Enables transactional file locking.
- * This is disabled by default as it is still beta.
+ * This is enabled by default.
  *
  * Prevents concurrent processes from accessing the same files
  * at the same time. Can help prevent side effects that would
  * be caused by concurrent operations. Mainly relevant for
  * very large installations with many users working with
  * shared files.
- *
- * WARNING: BETA quality
  */
-'filelocking.enabled' => false,
+'filelocking.enabled' => true,
 
 /**
  * Memory caching backend for file locking
@@ -1079,6 +1108,14 @@ $CONFIG = array(
  */
 'memcache.locking' => '\\OC\\Memcache\\Redis',
 
+/**
+ * Set this ownCloud instance to debugging mode
+ *
+ * Only enable this for local development and not in production environments
+ * This will disable the minifier and outputs some additional debug information
+ */
+'debug' => false,
+
 /**
  * This entry is just here to show a warning in case somebody copied the sample
  * configuration. DO NOT ADD THIS SWITCH TO YOUR CONFIGURATION!
diff --git a/core/ajax/preview.php b/core/ajax/preview.php
index fc98d80eb0..baa0ed4ec6 100644
--- a/core/ajax/preview.php
+++ b/core/ajax/preview.php
@@ -31,6 +31,7 @@ $maxY = array_key_exists('y', $_GET) ? (int)$_GET['y'] : '36';
 $scalingUp = array_key_exists('scalingup', $_GET) ? (bool)$_GET['scalingup'] : true;
 $keepAspect = array_key_exists('a', $_GET) ? true : false;
 $always = array_key_exists('forceIcon', $_GET) ? (bool)$_GET['forceIcon'] : true;
+$mode = array_key_exists('mode', $_GET) ? $_GET['mode'] : 'fill';
 
 if ($file === '') {
 	//400 Bad Request
@@ -56,6 +57,7 @@ if (!$info instanceof OCP\Files\FileInfo || !$always && !\OC::$server->getPrevie
 	$preview->setMaxX($maxX);
 	$preview->setMaxY($maxY);
 	$preview->setScalingUp($scalingUp);
+	$preview->setMode($mode);
 	$preview->setKeepAspect($keepAspect);
 	$preview->showPreview();
 }
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 14b4f913f7..a693deeb9c 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -28,15 +28,19 @@
 set_time_limit(0);
 require_once '../../lib/base.php';
 
-\OCP\JSON::callCheck();
+$l = \OC::$server->getL10N('core');
+
+$eventSource = \OC::$server->createEventSource();
+// need to send an initial message to force-init the event source,
+// which will then trigger its own CSRF check and produces its own CSRF error
+// message
+$eventSource->send('success', (string)$l->t('Preparing update'));
 
 if (OC::checkUpgrade(false)) {
 	// if a user is currently logged in, their session must be ignored to
 	// avoid side effects
 	\OC_User::setIncognitoMode(true);
 
-	$l = new \OC_L10N('core');
-	$eventSource = \OC::$server->createEventSource();
 	$logger = \OC::$server->getLogger();
 	$updater = new \OC\Updater(
 			\OC::$server->getHTTPHelper(),
@@ -85,7 +89,13 @@ if (OC::checkUpgrade(false)) {
 		OC_Config::setValue('maintenance', false);
 	});
 
-	$updater->upgrade();
+	try {
+		$updater->upgrade();
+	} catch (\Exception $e) {
+		$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
+		$eventSource->close();
+		exit();
+	}
 
 	if (!empty($incompatibleApps)) {
 		$eventSource->send('notice',
@@ -96,6 +106,10 @@ if (OC::checkUpgrade(false)) {
 			(string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledThirdPartyApps)));
 	}
 
-	$eventSource->send('done', '');
-	$eventSource->close();
+} else {
+	$eventSource->send('notice', (string)$l->t('Already up to date'));
 }
+
+$eventSource->send('done', '');
+$eventSource->close();
+
diff --git a/core/application.php b/core/application.php
index 373965e7fd..12ec6b63fd 100644
--- a/core/application.php
+++ b/core/application.php
@@ -27,6 +27,7 @@
 namespace OC\Core;
 
 use OC\AppFramework\Utility\SimpleContainer;
+use OC\AppFramework\Utility\TimeFactory;
 use \OCP\AppFramework\App;
 use OC\Core\LostPassword\Controller\LostController;
 use OC\Core\User\UserController;
@@ -63,7 +64,8 @@ class Application extends App {
 				$c->query('SecureRandom'),
 				$c->query('DefaultEmailAddress'),
 				$c->query('IsEncryptionEnabled'),
-				$c->query('Mailer')
+				$c->query('Mailer'),
+				$c->query('TimeFactory')
 			);
 		});
 		$container->registerService('UserController', function(SimpleContainer $c) {
@@ -120,15 +122,15 @@ class Application extends App {
 		$container->registerService('UserFolder', function(SimpleContainer $c) {
 			return $c->query('ServerContainer')->getUserFolder();
 		});
-
-
-
 		$container->registerService('Defaults', function() {
 			return new \OC_Defaults;
 		});
 		$container->registerService('Mailer', function(SimpleContainer $c) {
 			return $c->query('ServerContainer')->getMailer();
 		});
+		$container->registerService('TimeFactory', function(SimpleContainer $c) {
+			return new TimeFactory();
+		});
 		$container->registerService('DefaultEmailAddress', function() {
 			return Util::getDefaultEmailAddress('lostpassword-noreply');
 		});
diff --git a/core/avatar/avatarcontroller.php b/core/avatar/avatarcontroller.php
index a0c9ebbd78..0c270bee53 100644
--- a/core/avatar/avatarcontroller.php
+++ b/core/avatar/avatarcontroller.php
@@ -90,13 +90,18 @@ class AvatarController extends Controller {
 	}
 
 	/**
-	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 * @PublicPage
 	 *
 	 * @param string $userId
 	 * @param int $size
 	 * @return DataResponse|DataDisplayResponse
 	 */
 	public function getAvatar($userId, $size) {
+		if (!$this->userManager->userExists($userId)) {
+			return new DataResponse([], Http::STATUS_NOT_FOUND);
+		}
+
 		if ($size > 2048) {
 			$size = 2048;
 		} elseif ($size <= 0) {
diff --git a/core/command/encryption/changekeystorageroot.php b/core/command/encryption/changekeystorageroot.php
new file mode 100644
index 0000000000..662e0a3161
--- /dev/null
+++ b/core/command/encryption/changekeystorageroot.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Core\Command\Encryption;
+
+use OC\Encryption\Keys\Storage;
+use OC\Encryption\Util;
+use OC\Files\Filesystem;
+use OC\Files\View;
+use OCP\IConfig;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+class ChangeKeyStorageRoot extends Command {
+
+	/** @var View  */
+	protected $rootView;
+
+	/** @var IUserManager */
+	protected $userManager;
+
+	/** @var IConfig  */
+	protected $config;
+
+	/** @var Util  */
+	protected $util;
+
+	/** @var QuestionHelper */
+	protected $questionHelper;
+
+	/**
+	 * @param View $view
+	 * @param IUserManager $userManager
+	 * @param IConfig $config
+	 * @param Util $util
+	 * @param QuestionHelper $questionHelper
+	 */
+	public function __construct(View $view, IUserManager $userManager, IConfig $config, Util $util, QuestionHelper $questionHelper) {
+		parent::__construct();
+		$this->rootView = $view;
+		$this->userManager = $userManager;
+		$this->config = $config;
+		$this->util = $util;
+		$this->questionHelper = $questionHelper;
+	}
+
+	protected function configure() {
+		parent::configure();
+		$this
+			->setName('encryption:change-key-storage-root')
+			->setDescription('Change key storage root')
+			->addArgument(
+				'newRoot',
+				InputArgument::OPTIONAL,
+				'new root of the key storage relative to the data folder'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$oldRoot = $this->util->getKeyStorageRoot();
+		$newRoot = $input->getArgument('newRoot');
+
+		if ($newRoot === null) {
+			$question = new ConfirmationQuestion('No storage root given, do you want to reset the key storage root to the default location? (y/n) ', false);
+			if (!$this->questionHelper->ask($input, $output, $question)) {
+				return;
+			}
+			$newRoot = '';
+		}
+
+		$oldRootDescription = $oldRoot !== '' ? $oldRoot : 'default storage location';
+		$newRootDescription = $newRoot !== '' ? $newRoot : 'default storage location';
+		$output->writeln("Change key storage root from <info>$oldRootDescription</info> to <info>$newRootDescription</info>");
+		$success = $this->moveAllKeys($oldRoot, $newRoot, $output);
+		if ($success) {
+			$this->util->setKeyStorageRoot($newRoot);
+			$output->writeln('');
+			$output->writeln("Key storage root successfully changed to <info>$newRootDescription</info>");
+		}
+	}
+
+	/**
+	 * move keys to new key storage root
+	 *
+	 * @param string $oldRoot
+	 * @param string $newRoot
+	 * @param OutputInterface $output
+	 * @return bool
+	 * @throws \Exception
+	 */
+	protected function moveAllKeys($oldRoot, $newRoot, OutputInterface $output) {
+
+		$output->writeln("Start to move keys:");
+
+		if ($this->rootView->is_dir(($oldRoot)) === false) {
+			$output->writeln("No old keys found: Nothing needs to be moved");
+			return false;
+		}
+
+		$this->prepareNewRoot($newRoot);
+		$this->moveSystemKeys($oldRoot, $newRoot);
+		$this->moveUserKeys($oldRoot, $newRoot, $output);
+
+		return true;
+	}
+
+	/**
+	 * prepare new key storage
+	 *
+	 * @param string $newRoot
+	 * @throws \Exception
+	 */
+	protected function prepareNewRoot($newRoot) {
+		if ($this->rootView->is_dir($newRoot) === false) {
+			throw new \Exception("New root folder doesn't exist. Please create the folder or check the permissions and try again.");
+		}
+
+		$result = $this->rootView->file_put_contents(
+			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
+			'ownCloud will detect this folder as key storage root only if this file exists'
+		);
+
+		if ($result === false) {
+			throw new \Exception("Can't write to new root folder. Please check the permissions and try again");
+		}
+
+	}
+
+
+	/**
+	 * move system key folder
+	 *
+	 * @param string $oldRoot
+	 * @param string $newRoot
+	 */
+	protected function moveSystemKeys($oldRoot, $newRoot) {
+		if (
+			$this->rootView->is_dir($oldRoot . '/files_encryption') &&
+			$this->targetExists($newRoot . '/files_encryption') === false
+		) {
+			$this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
+		}
+	}
+
+
+	/**
+	 * setup file system for the given user
+	 *
+	 * @param string $uid
+	 */
+	protected function setupUserFS($uid) {
+		\OC_Util::tearDownFS();
+		\OC_Util::setupFS($uid);
+	}
+
+
+	/**
+	 * iterate over each user and move the keys to the new storage
+	 *
+	 * @param string $oldRoot
+	 * @param string $newRoot
+	 * @param OutputInterface $output
+	 */
+	protected function moveUserKeys($oldRoot, $newRoot, OutputInterface $output) {
+
+		$progress = new ProgressBar($output);
+		$progress->start();
+
+
+		foreach($this->userManager->getBackends() as $backend) {
+			$limit = 500;
+			$offset = 0;
+			do {
+				$users = $backend->getUsers('', $limit, $offset);
+				foreach ($users as $user) {
+					$progress->advance();
+					$this->setupUserFS($user);
+					$this->moveUserEncryptionFolder($user, $oldRoot, $newRoot);
+				}
+				$offset += $limit;
+			} while(count($users) >= $limit);
+		}
+		$progress->finish();
+	}
+
+	/**
+	 * move user encryption folder to new root folder
+	 *
+	 * @param string $user
+	 * @param string $oldRoot
+	 * @param string $newRoot
+	 * @throws \Exception
+	 */
+	protected function moveUserEncryptionFolder($user, $oldRoot, $newRoot) {
+
+		if ($this->userManager->userExists($user)) {
+
+			$source = $oldRoot . '/' . $user . '/files_encryption';
+			$target = $newRoot . '/' . $user . '/files_encryption';
+			if (
+				$this->rootView->is_dir($source) &&
+				$this->targetExists($target) === false
+			) {
+				$this->prepareParentFolder($newRoot . '/' . $user);
+				$this->rootView->rename($source, $target);
+			}
+		}
+	}
+
+	/**
+	 * Make preparations to filesystem for saving a key file
+	 *
+	 * @param string $path relative to data/
+	 */
+	protected function prepareParentFolder($path) {
+		$path = Filesystem::normalizePath($path);
+		// If the file resides within a subdirectory, create it
+		if ($this->rootView->file_exists($path) === false) {
+			$sub_dirs = explode('/', ltrim($path, '/'));
+			$dir = '';
+			foreach ($sub_dirs as $sub_dir) {
+				$dir .= '/' . $sub_dir;
+				if ($this->rootView->file_exists($dir) === false) {
+					$this->rootView->mkdir($dir);
+				}
+			}
+		}
+	}
+
+	/**
+	 * check if target already exists
+	 *
+	 * @param $path
+	 * @return bool
+	 * @throws \Exception
+	 */
+	protected function targetExists($path) {
+		if ($this->rootView->file_exists($path)) {
+			throw new \Exception("new folder '$path' already exists");
+		}
+
+		return false;
+	}
+
+}
diff --git a/core/command/encryption/encryptall.php b/core/command/encryption/encryptall.php
new file mode 100644
index 0000000000..7f33e18ecb
--- /dev/null
+++ b/core/command/encryption/encryptall.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Core\Command\Encryption;
+
+use OCP\App\IAppManager;
+use OCP\Encryption\IManager;
+use OCP\IConfig;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ConfirmationQuestion;
+
+class EncryptAll extends Command {
+
+	/** @var IManager */
+	protected $encryptionManager;
+
+	/** @var  IAppManager */
+	protected $appManager;
+
+	/** @var IConfig */
+	protected $config;
+
+	/** @var  QuestionHelper */
+	protected $questionHelper;
+
+	/** @var bool */
+	protected $wasTrashbinEnabled;
+
+	/** @var  bool */
+	protected $wasSingleUserModeEnabled;
+
+	/**
+	 * @param IManager $encryptionManager
+	 * @param IAppManager $appManager
+	 * @param IConfig $config
+	 * @param QuestionHelper $questionHelper
+	 */
+	public function __construct(
+		IManager $encryptionManager,
+		IAppManager $appManager,
+		IConfig $config,
+		QuestionHelper $questionHelper
+	) {
+		parent::__construct();
+		$this->appManager = $appManager;
+		$this->encryptionManager = $encryptionManager;
+		$this->config = $config;
+		$this->questionHelper = $questionHelper;
+		$this->wasTrashbinEnabled = $this->appManager->isEnabledForUser('files_trashbin');
+		$this->wasSingleUserModeEnabled = $this->config->getSystemValue('singleUser', false);
+		$this->config->setSystemValue('singleUser', true);
+		$this->appManager->disableApp('files_trashbin');
+	}
+
+	public function __destruct() {
+		$this->config->setSystemValue('singleUser', $this->wasSingleUserModeEnabled);
+		if ($this->wasTrashbinEnabled) {
+			$this->appManager->enableApp('files_trashbin');
+		}
+	}
+
+	protected function configure() {
+		parent::configure();
+
+		$this->setName('encryption:encrypt-all');
+		$this->setDescription(
+			'This will encrypt all files for all users. '
+			. 'Please make sure that no user access his files during this process!'
+		);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+
+		if ($this->encryptionManager->isEnabled() === false) {
+			throw new \Exception('Server side encryption is not enabled');
+		}
+
+		$output->writeln("\n");
+		$output->writeln('You are about to start to encrypt all files stored in your ownCloud.');
+		$output->writeln('It will depend on the encryption module you use which files get encrypted.');
+		$output->writeln('Depending on the number and size of your files this can take some time');
+		$output->writeln('Please make sure that no user access his files during this process!');
+		$output->writeln('');
+		$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
+		if ($this->questionHelper->ask($input, $output, $question)) {
+			$defaultModule = $this->encryptionManager->getEncryptionModule();
+			$defaultModule->encryptAll($input, $output);
+		} else {
+			$output->writeln('aborted');
+		}
+	}
+
+}
diff --git a/core/command/encryption/showkeystorageroot.php b/core/command/encryption/showkeystorageroot.php
new file mode 100644
index 0000000000..acb2e75a6a
--- /dev/null
+++ b/core/command/encryption/showkeystorageroot.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Core\Command\Encryption;
+
+use OC\Encryption\Util;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ShowKeyStorageRoot extends Command{
+
+	/** @var Util  */
+	protected $util;
+
+	/**
+	 * @param Util $util
+	 */
+	public function __construct(Util $util) {
+		parent::__construct();
+		$this->util = $util;
+	}
+
+	protected function configure() {
+		parent::configure();
+		$this
+			->setName('encryption:show-key-storage-root')
+			->setDescription('Show current key storage root');
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$currentRoot = $this->util->getKeyStorageRoot();
+
+		$rootDescription = $currentRoot !== '' ? $currentRoot : 'default storage location (data/)';
+
+		$output->writeln("Current key storage root:  <info>$rootDescription</info>");
+	}
+
+}
diff --git a/core/command/maintenance/mimetype/updatedb.php b/core/command/maintenance/mimetype/updatedb.php
new file mode 100644
index 0000000000..37c401c033
--- /dev/null
+++ b/core/command/maintenance/mimetype/updatedb.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Core\Command\Maintenance\Mimetype;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputOption;
+
+use OCP\Files\IMimeTypeDetector;
+use OCP\Files\IMimeTypeLoader;
+
+class UpdateDB extends Command {
+
+	const DEFAULT_MIMETYPE = 'application/octet-stream';
+
+	/** @var IMimeTypeDetector */
+	protected $mimetypeDetector;
+
+	/** @var IMimeTypeLoader */
+	protected $mimetypeLoader;
+
+	public function __construct(
+		IMimeTypeDetector $mimetypeDetector,
+		IMimeTypeLoader $mimetypeLoader
+	) {
+		parent::__construct();
+		$this->mimetypeDetector = $mimetypeDetector;
+		$this->mimetypeLoader = $mimetypeLoader;
+	}
+
+	protected function configure() {
+		$this
+			->setName('maintenance:mimetype:update-db')
+			->setDescription('Update database mimetypes and update filecache')
+			->addOption(
+				'repair-filecache',
+				null,
+				InputOption::VALUE_NONE,
+				'Repair filecache for all mimetypes, not just new ones'
+			)
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$mappings = $this->mimetypeDetector->getAllMappings();
+
+		$totalFilecacheUpdates = 0;
+		$totalNewMimetypes = 0;
+
+		foreach ($mappings as $ext => $mimetypes) {
+			if ($ext[0] === '_') {
+				// comment
+				continue;
+			}
+			$mimetype = $mimetypes[0];
+			$existing = $this->mimetypeLoader->exists($mimetype);
+			// this will add the mimetype if it didn't exist
+			$mimetypeId = $this->mimetypeLoader->getId($mimetype);
+
+			if (!$existing) {
+				$output->writeln('Added mimetype "'.$mimetype.'" to database');
+				$totalNewMimetypes++;
+			}
+
+			if (!$existing || $input->getOption('repair-filecache')) {
+				$touchedFilecacheRows = $this->mimetypeLoader->updateFilecache($ext, $mimetypeId);
+				if ($touchedFilecacheRows > 0) {
+					$output->writeln('Updated '.$touchedFilecacheRows.' filecache rows for mimetype "'.$mimetype.'"');
+				}
+				$totalFilecacheUpdates += $touchedFilecacheRows;
+			}
+		}
+
+		$output->writeln('Added '.$totalNewMimetypes.' new mimetypes');
+		$output->writeln('Updated '.$totalFilecacheUpdates.' filecache rows');
+	}
+}
diff --git a/core/command/maintenance/mimetypesjs.php b/core/command/maintenance/mimetype/updatejs.php
similarity index 75%
rename from core/command/maintenance/mimetypesjs.php
rename to core/command/maintenance/mimetype/updatejs.php
index 8b01f0acf7..5de75d53a3 100644
--- a/core/command/maintenance/mimetypesjs.php
+++ b/core/command/maintenance/mimetype/updatejs.php
@@ -18,27 +18,35 @@
  *
  */
 
-namespace OC\Core\Command\Maintenance;
+namespace OC\Core\Command\Maintenance\Mimetype;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class MimeTypesJS extends Command {
+use OCP\Files\IMimeTypeDetector;
+
+class UpdateJS extends Command {
+
+	/** @var IMimeTypeDetector */
+	protected $mimetypeDetector;
+
+	public function __construct(
+		IMimeTypeDetector $mimetypeDetector
+	) {
+		parent::__construct();
+		$this->mimetypeDetector = $mimetypeDetector;
+	}
+
 	protected function configure() {
 		$this
-			->setName('maintenance:mimetypesjs')
+			->setName('maintenance:mimetype:update-js')
 			->setDescription('Update mimetypelist.js');
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		// Fetch all the aliases
-		$aliases = json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mimetypealiases.dist.json'), true);
-
-		if (file_exists(\OC::$SERVERROOT . '/config/mimetypealiases.json')) {
-			$custom = get_object_vars(json_decode(file_get_contents(\OC::$SERVERROOT . '/config/mimetypealiases.json')));
-			$aliases = array_merge($aliases, $custom);
-		}
+		$aliases = $this->mimetypeDetector->getAllAliases();
 
 		// Remove comments
 		$keys = array_filter(array_keys($aliases), function($k) {
@@ -49,23 +57,22 @@ class MimeTypesJS extends Command {
 		}
 
 		// Fetch all files
-		$dir = new \DirectoryIterator(dirname(__DIR__) . '/../img/filetypes');
+		$dir = new \DirectoryIterator(\OC::$SERVERROOT.'/core/img/filetypes');
 
 		$files = [];
 		foreach($dir as $fileInfo) {
-		    if ($fileInfo->isFile()) {
-        		$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
-		        $files[] = $file;
-		    }  
+			if ($fileInfo->isFile()) {
+				$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+				$files[] = $file;
+			}
 		}
 
 		//Remove duplicates
 		$files = array_values(array_unique($files));
 
-
 		// Fetch all themes!
 		$themes = [];
-		$dirs = new \DirectoryIterator(dirname(__DIR__) . '/../../themes/');
+		$dirs = new \DirectoryIterator(\OC::$SERVERROOT.'/themes/');
 		foreach($dirs as $dir) {
 			//Valid theme dir
 			if ($dir->isFile() || $dir->isDot()) {
@@ -84,7 +91,7 @@ class MimeTypesJS extends Command {
 			$themeIt = new \DirectoryIterator($themeDir);
 			foreach ($themeIt as $fileInfo) {
 				if ($fileInfo->isFile()) {
- 		       		$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
+					$file = preg_replace('/.[^.]*$/', '', $fileInfo->getFilename());
 					$themes[$theme][] = $file;
 				}
 			}
@@ -110,7 +117,7 @@ OC.MimeTypeList={
 ';
 
 		//Output the JS
-		file_put_contents(dirname(__DIR__) . '/../js/mimetypelist.js', $js);
+		file_put_contents(\OC::$SERVERROOT.'/core/js/mimetypelist.js', $js);
 
 		$output->writeln('<info>mimetypelist.js is updated');
 	}
diff --git a/core/css/apps.css b/core/css/apps.css
index 300b186bba..0371f2bbde 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -22,12 +22,13 @@
 	height: 100%;
 	float: left;
 	-moz-box-sizing: border-box; box-sizing: border-box;
-	background-color: #f5f5f5;
+	background-color: #fff;
 	padding-bottom: 44px;
 	-webkit-user-select: none;
 	-moz-user-select: none;
 	-ms-user-select: none;
 	user-select: none;
+	border-right: 1px solid #eee;
 }
 #app-navigation > ul {
 	position: relative;
@@ -42,10 +43,6 @@
 	width: 100%;
 	-moz-box-sizing: border-box; box-sizing: border-box;
 }
-#app-navigation .active,
-#app-navigation .active a {
-	background-color: #ddd;
-}
 
 #app-navigation .active.with-menu > a,
 #app-navigation .with-counter > a {
@@ -56,14 +53,6 @@
 	padding-right: 90px;
 }
 
-#app-navigation li:hover > a,
-#app-navigation li:focus > a,
-#app-navigation a:focus,
-#app-navigation .selected,
-#app-navigation .selected a {
-	background-color: #ddd;
-}
-
 #app-navigation .with-icon a,
 #app-navigation .app-navigation-entry-loading a {
 	padding-left: 44px;
@@ -82,7 +71,17 @@
 	-moz-box-sizing: border-box; box-sizing: border-box;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-	color: #333;
+	color: #000;
+	opacity: .5;
+}
+#app-navigation .active,
+#app-navigation .active a,
+#app-navigation li:hover > a,
+#app-navigation li:focus > a,
+#app-navigation a:focus,
+#app-navigation .selected,
+#app-navigation .selected a {
+	opacity: 1;
 }
 
 #app-navigation .collapse {
@@ -292,37 +291,26 @@
 		list-style-type: none;
 	}
 
+/* menu bubble / popover */
 .bubble,
 #app-navigation .app-navigation-entry-menu {
 	position: absolute;
-	background-color: #eee;
+	background-color: #fff;
 	color: #333;
 	border-radius: 3px;
 	border-top-right-radius: 0;
 	z-index: 110;
 	margin: -5px 14px 5px 10px;
 	right: 0;
-	border: 1px solid #bbb;
 	-webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 	-moz-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 	-ms-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 	-o-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 	filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
 }
-
-#app-navigation .app-navigation-entry-menu {
-	display: none;
-}
-
-#app-navigation .app-navigation-entry-menu.open {
-	display: block;
-}
-
 /* miraculous border arrow stuff */
 .bubble:after,
-.bubble:before,
-#app-navigation .app-navigation-entry-menu:after,
-#app-navigation .app-navigation-entry-menu:before {
+#app-navigation .app-navigation-entry-menu:after {
 	bottom: 100%;
 	right: 0; /* change this to adjust the arrow position */
 	border: solid transparent;
@@ -332,21 +320,31 @@
 	position: absolute;
 	pointer-events: none;
 }
-
 .bubble:after,
 #app-navigation .app-navigation-entry-menu:after {
 	border-color: rgba(238, 238, 238, 0);
-	border-bottom-color: #eee;
+	border-bottom-color: #fff;
 	border-width: 10px;
 	margin-left: -10px;
 }
+.bubble .action {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)" !important;
+	filter: alpha(opacity=50) !important;
+	opacity: .5 !important;
+}
+.bubble .action:hover,
+.bubble .action:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important;
+	filter: alpha(opacity=100) !important;
+	opacity: 1 !important;
+}
 
-.bubble:before,
-#app-navigation .app-navigation-entry-menu:before {
-	border-color: rgba(187, 187, 187, 0);
-	border-bottom-color: #bbb;
-	border-width: 11px;
-	margin-left: -11px;
+#app-navigation .app-navigation-entry-menu {
+	display: none;
+}
+
+#app-navigation .app-navigation-entry-menu.open {
+	display: block;
 }
 
 	/* list of options for an entry */
@@ -440,8 +438,10 @@
 	left: auto;
 	bottom: 0;
 	width: 27%;
+	min-width: 250px;
 	display: block;
-	background: #eee;
+	background: #fff;
+	border-left: 1px solid #eee;
 	-webkit-transition: margin-right 300ms;
 	-moz-transition: margin-right 300ms;
 	-o-transition: margin-right 300ms;
@@ -472,13 +472,10 @@
 #app-settings.opened #app-settings-content {
 	display: block;
 }
-#app-settings-header {
-	background-color: #eee;
-}
 #app-settings-content {
 	display: none;
 	padding: 10px;
-	background-color: #eee;
+	background-color: #fff;
 }
 #app-settings.open #app-settings-content {
 	display: block;
@@ -486,6 +483,10 @@
 	max-height: 300px;
 	overflow-y: auto;
 }
+#app-settings-content,
+#app-settings-header {
+	border-right: 1px solid #eee;
+}
 
 /* display input fields at full width */
 #app-settings-content input[type='text'] {
@@ -498,7 +499,7 @@
 	width: 100%;
 	padding: 0;
 	margin: 0;
-	background-color: transparent;
+	background-color: #fff;
 	background-image: url('../img/actions/settings.svg');
 	background-position: 14px center;
 	background-repeat: no-repeat;
@@ -511,11 +512,11 @@
 }
 .settings-button:hover,
 .settings-button:focus {
-	background-color: #ddd;
+	background-color: #fff;
 }
 .settings-button.opened:hover,
 .settings-button.opened:focus {
-	background-color: transparent;
+	background-color: #fff;
 }
 
 /* buttons */
@@ -531,7 +532,7 @@ button.loading {
 	display: block;
 	padding: 30px;
 	color: #555;
-	border-top: 1px solid #ddd;
+	margin-bottom: 24px;
 }
 .section.hidden {
 	display: none !important;
@@ -600,47 +601,96 @@ em {
 /* generic tab styles */
 .tabHeaders {
 	margin: 15px;
-	background-color: #1D2D44;
 }
-
 .tabHeaders .tabHeader {
 	float: left;
-	border: 1px solid #ddd;
 	padding: 5px;
 	cursor: pointer;
-	background-color: #f8f8f8;
-	font-weight: bold;
 }
 .tabHeaders .tabHeader, .tabHeaders .tabHeader a {
 	color: #888;
 }
-
-.tabHeaders .tabHeader:first-child {
-	border-top-left-radius: 4px;
-	border-bottom-left-radius: 4px;
+.tabHeaders .tabHeader.selected {
+	font-weight: 600;
 }
-
-.tabHeaders .tabHeader:last-child {
-	border-top-right-radius: 4px;
-	border-bottom-right-radius: 4px;
-}
-
 .tabHeaders .tabHeader.selected,
 .tabHeaders .tabHeader:hover {
-	background-color: #e8e8e8;
+	border-bottom: 1px solid #333;
 }
-
 .tabHeaders .tabHeader.selected,
 .tabHeaders .tabHeader.selected a,
 .tabHeaders .tabHeader:hover,
 .tabHeaders .tabHeader:hover a {
 	color: #000;
 }
-
 .tabsContainer {
 	clear: left;
 }
-
 .tabsContainer .tab {
 	padding: 15px;
 }
+
+/* popover menu styles (use together with "bubble" class) */
+.popovermenu .menuitem,
+.popovermenu .menuitem>span {
+	cursor: pointer;
+}
+
+.popovermenu .menuitem {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+	filter: alpha(opacity=50);
+	opacity: .5;
+}
+
+.popovermenu .menuitem:hover,
+.popovermenu .menuitem:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter: alpha(opacity=100);
+	opacity: 1;
+}
+
+.popovermenu {
+	padding: 4px 12px;
+}
+
+.popovermenu li {
+	padding: 5px 0;
+}
+
+.popovermenu .menuitem img {
+	padding: initial;
+}
+
+.popovermenu a.menuitem,
+.popovermenu label.menuitem,
+.popovermenu .menuitem {
+	padding: 10px;
+	margin: -10px;
+}
+
+.popovermenu.hidden {
+	display: none;
+}
+
+.popovermenu .menuitem {
+	display: block;
+	line-height: 30px;
+	padding-left: 5px;
+	color: #000;
+	padding: 0;
+}
+
+.popovermenu .menuitem .icon,
+.popovermenu .menuitem .no-icon {
+	display: inline-block;
+	width: 16px;
+	margin-right: 10px;
+}
+
+.popovermenu .menuitem {
+	opacity: 0.5;
+}
+
+.popovermenu li:hover .menuitem {
+	opacity: 1;
+}
diff --git a/core/css/fonts.css b/core/css/fonts.css
index aa6e71bef2..de2742c636 100644
--- a/core/css/fonts.css
+++ b/core/css/fonts.css
@@ -1,13 +1,13 @@
 @font-face {
 	font-family: 'Open Sans';
 	font-style: normal;
-	font-weight: normal;
-	src: local('Open Sans'), local('OpenSans'), url(../fonts/OpenSans-Regular.woff) format('woff');
+	font-weight: 300;
+	src: local('Open Sans Light'), local('OpenSans-Light'), url(../fonts/OpenSans-Light.woff) format('woff');
 }
 
 @font-face {
 	font-family: 'Open Sans';
 	font-style: normal;
-	font-weight: bold;
-	src: local('Open Sans Bold'), local('OpenSans-Bold'), url(../fonts/OpenSans-Bold.woff) format('woff');
-}
\ No newline at end of file
+	font-weight: 600;
+	src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(../fonts/OpenSans-Semibold.woff) format('woff');
+}
diff --git a/core/css/header.css b/core/css/header.css
index 466022e9f7..369750251c 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -70,8 +70,10 @@
 }
 
 #header .logo {
-	background-image: url(../img/logo.svg);
+	background-image: url(../img/logo-icon.svg);
 	background-repeat: no-repeat;
+	background-size: 175px;
+	background-position: center 30px;
 	width: 252px;
 	height: 120px;
 	margin: 0 auto;
@@ -294,7 +296,7 @@
 }
 #expand {
 	display: block;
-	padding: 7px 30px 6px 22px;
+	padding: 7px 30px 6px 10px;
 	cursor: pointer;
 }
 #expand * {
diff --git a/core/css/icons.css b/core/css/icons.css
index e44f988005..a3819ba9d4 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -23,6 +23,10 @@
 .icon-loading-small {
 	background-image: url('../img/loading-small.gif');
 }
+.icon-32 {
+	-webkit-background-size: 32px !important;
+	background-size: 32px !important;
+}
 
 
 
@@ -227,18 +231,14 @@
 	background-image: url('../img/places/contacts-dark.svg');
 }
 
-.icon-file {
-	background-image: url('../img/places/file.svg');
-}
 .icon-files {
 	background-image: url('../img/places/files.svg');
 }
-.icon-folder {
-	background-image: url('../img/places/folder.svg');
-}
+.icon-file,
 .icon-filetype-text {
 	background-image: url('../img/filetypes/text.svg');
 }
+.icon-folder,
 .icon-filetype-folder {
 	background-image: url('../img/filetypes/folder.svg');
 }
diff --git a/core/css/mobile.css b/core/css/mobile.css
index 2256d821d7..29507a0faa 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -26,37 +26,12 @@
 	display: none;
 }
 
-/* compress search box on mobile, expand when focused */
-.searchbox input[type="search"] {
-	width: 0;
-	cursor: pointer;
-	background-color: transparent;
-	background-image: url('../img/actions/search-white.svg');
-	-webkit-transition: all 100ms;
-	-moz-transition: all 100ms;
-	-o-transition: all 100ms;
-	transition: all 100ms;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-	opacity: .7;
-}
-.searchbox input[type="search"]:focus,
-.searchbox input[type="search"]:active {
-	width: 155px;
-	max-width: 50%;
-	cursor: text;
-	background-color: #fff;
-	background-image: url('../img/actions/search.svg');
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	opacity: 1;
-}
-
 /* do not show display name on mobile when profile picture is present */
 #header .avatardiv.avatardiv-shown + #expandDisplayName {
 	display: none;
 }
 #header #expand {
 	display: block;
-	padding: 7px 30px 6px 7px;
 }
 
 /* do not show update notification on mobile */
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
index 17fd81bf6c..a9451964f5 100644
--- a/core/css/multiselect.css
+++ b/core/css/multiselect.css
@@ -93,7 +93,8 @@ div.multiselect>span:first-child {
 
 div.multiselect>span:last-child {
 	position: absolute;
-	right: 13px;
+	right: 8px;
+	top: 8px;
 }
 
 ul.multiselectoptions input.new {
diff --git a/core/css/styles.css b/core/css/styles.css
index ccb4801087..9219068dc3 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -12,11 +12,22 @@ table, td, th { vertical-align:middle; }
 a { border:0; color:#000; text-decoration:none;}
 a, a *, input, input *, select, .button span, label { cursor:pointer; }
 ul { list-style:none; }
+select {
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	appearance: none;
+	background: url('../../core/img/actions/triangle-s.svg') no-repeat right 8px center rgba(240, 240, 240, 0.90);
+	outline: 0;
+	padding-right: 24px !important;
+}
 
+select:hover {
+	background-color: #fefefe;
+}
 
 body {
 	background-color: #ffffff;
-	font-weight: normal;
+	font-weight: 300;
 	font-size: .8em;
 	line-height: 1.6em;
 	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
@@ -186,7 +197,7 @@ input img, button img, .button img {
 	background-color: transparent;
 }
 ::-webkit-scrollbar-thumb {
-	background: #ccc;
+	background: #ddd;
 }
 
 
@@ -198,9 +209,9 @@ button, .button,
 	min-width: 25px;
 	padding: 5px;
 	background-color: rgba(240,240,240,.9);
-	font-weight: bold;
+	font-weight: 600;
 	color: #555;
-	border: 1px solid rgba(190,190,190,.9);
+	border: 1px solid rgba(240,240,240,.9);
 	cursor: pointer;
 }
 input[type="submit"]:hover, input[type="submit"]:focus,
@@ -258,20 +269,29 @@ input:disabled+label, input:disabled:hover+label, input:disabled:focus+label {
 	font-size: 1.2em;
 	padding: 3px;
 	padding-left: 25px;
-	background: #fff url('../img/actions/search.svg') no-repeat 6px center;
+	background: transparent url('../img/actions/search-white.svg') no-repeat 6px center;
+	color: #fff;
 	border: 0;
 	border-radius: 3px;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
-	opacity: .3;
 	margin-top: 9px;
 	float: right;
-}
-.searchbox input[type="search"]:hover,
-.searchbox input[type="search"]:focus,
-.searchbox input[type="search"]:active {
+	width: 0;
+	cursor: pointer;
+	-webkit-transition: all 100ms;
+	-moz-transition: all 100ms;
+	-o-transition: all 100ms;
+	transition: all 100ms;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
 	opacity: .7;
 }
+.searchbox input[type="search"]:focus,
+.searchbox input[type="search"]:active {
+	color: #fff;
+	width: 155px;
+	max-width: 50%;
+	cursor: text;
+	background-color: #112;
+}
 
 input[type="submit"].enabled {
 	background-color: #66f866;
@@ -368,6 +388,7 @@ input[type="submit"].enabled {
 }
 #emptycontent h2,
 .emptycontent h2 {
+	font-weight: 600;
 	font-size: 22px;
 	margin-bottom: 10px;
 }
@@ -442,15 +463,34 @@ input[type="submit"].enabled {
 	padding-top: 20px;
 }
 #body-login p.info a {
-	font-weight: bold;
+	font-weight: 600;
 	padding: 13px;
 	margin: -13px;
 }
-/* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */
+
+/* position log in button as confirm icon in right of password field */
 #body-login #submit.login {
-	margin-right: 7px;
+	position: absolute;
+	right: 0;
+	top: 49px;
+	border: none;
+	background-color: transparent;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+	opacity: .3;
 }
+#body-login #submit.login:hover,
+#body-login #submit.login:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+	opacity: .7;
+}
+#body-login input[type="password"] {
+	padding-right: 40px;
+	box-sizing: border-box;
+	min-width: 269px;
+}
+
 #body-login form {
+	position: relative;
 	width: 22em;
 	margin: 2em auto 2em;
 	padding: 0;
@@ -529,10 +569,8 @@ input[name='password-clone'] {
 /* General new input field look */
 #body-login input[type="text"],
 #body-login input[type="password"],
-#body-login input[type="email"],
-#body-login input[type="submit"] {
+#body-login input[type="email"] {
 	border: none;
-	border-radius: 5px;
 }
 
 /* Nicely grouping input field sets */
@@ -629,7 +667,7 @@ label.infield {
 	position: absolute !important;
 	height: 20px;
 	width: 24px;
-	background-image: url("../img/actions/toggle.png");
+	background-image: url('../img/actions/toggle.svg');
 	background-repeat: no-repeat;
 	background-position: center;
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
@@ -677,7 +715,6 @@ label.infield {
 #body-login .update {
 	width: inherit;
 	text-align: center;
-	color: #ccc;
 }
 
 #body-login .update .appList {
@@ -706,7 +743,7 @@ label.infield {
 .warning a,
 .error a {
 	color: #fff !important;
-	font-weight: bold !important;
+	font-weight: 600 !important;
 }
 .error pre {
 	white-space: pre-wrap;
@@ -732,7 +769,7 @@ label.infield {
 	margin: 35px auto;
 }
 #body-login .warning {
-	margin: 0 7px 5px;
+	margin: 0 7px 5px 4px;
 }
 #body-login .warning legend {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
@@ -771,8 +808,13 @@ label.infield {
 	padding: 10px 20px; /* larger log in and installation buttons */
 }
 #remember_login {
-	margin: 24px 5px 0 16px !important;
+	margin: 18px 5px 0 16px !important;
 	vertical-align: text-bottom;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+	opacity: .7;
+}
+#body-login .remember-login-container {
+	text-align: center;
 }
 
 /* Sticky footer */
@@ -801,10 +843,22 @@ label.infield {
 	overflow: hidden;
 }
 
-.bold { font-weight:bold; }
+.bold { font-weight:600; }
 .center { text-align:center; }
 .inlineblock { display: inline-block; }
 
+/* round profile photos */
+.avatar,
+.avatar img,
+.avatardiv,
+.avatardiv img {
+	border-radius: 50%;
+}
+td.avatar {
+	border-radius: 0;
+}
+
+
 #notification-container {
 	position: absolute;
 	top: 0;
@@ -901,6 +955,7 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 
 .ui-icon-circle-triangle-e{ background-image:url('../img/actions/play-next.svg'); }
 .ui-icon-circle-triangle-w{ background-image:url('../img/actions/play-previous.svg'); }
+
 .ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }
 
 /* ---- DIALOGS ---- */
@@ -934,6 +989,7 @@ a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;paddin
 }
 #oc-dialog-filepicker-content .filelist img {
 	margin: 2px 1em 0 4px;
+	width: 32px;
 }
 #oc-dialog-filepicker-content .filelist .date {
 	float: right;
@@ -1021,7 +1077,7 @@ div.crumb:first-child a {
 	top: 13px;
 }
 div.crumb.last {
-	font-weight: bold;
+	font-weight: 600;
 	margin-right: 10px;
 }
 div.crumb a.ellipsislink {
@@ -1067,7 +1123,7 @@ div.crumb:active {
 
 #body-public footer .info a {
 	color: #777;
-	font-weight: bold;
+	font-weight: 600;
 	padding: 13px;
 	margin: -13px;
 }
@@ -1087,3 +1143,12 @@ fieldset.warning legend + p, fieldset.update legend + p {
 @-ms-viewport {
 	width: device-width;
 }
+
+/* hidden input type=file field */
+.hiddenuploadfield {
+   width: 0;
+   height: 0;
+   opacity: 0;
+   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+}
+
diff --git a/core/fonts/OpenSans-Bold.woff b/core/fonts/OpenSans-Bold.woff
deleted file mode 100644
index ee2ea797d1..0000000000
Binary files a/core/fonts/OpenSans-Bold.woff and /dev/null differ
diff --git a/core/fonts/OpenSans-Light.woff b/core/fonts/OpenSans-Light.woff
new file mode 100644
index 0000000000..937323df0d
Binary files /dev/null and b/core/fonts/OpenSans-Light.woff differ
diff --git a/core/fonts/OpenSans-Regular.woff b/core/fonts/OpenSans-Regular.woff
deleted file mode 100644
index 2abc3ed69f..0000000000
Binary files a/core/fonts/OpenSans-Regular.woff and /dev/null differ
diff --git a/core/fonts/OpenSans-Semibold.woff b/core/fonts/OpenSans-Semibold.woff
new file mode 100644
index 0000000000..8c0313ff36
Binary files /dev/null and b/core/fonts/OpenSans-Semibold.woff differ
diff --git a/core/img/actions/caret-dark.png b/core/img/actions/caret-dark.png
index 215af33ea4..97c64c6a72 100644
Binary files a/core/img/actions/caret-dark.png and b/core/img/actions/caret-dark.png differ
diff --git a/core/img/actions/caret-dark.svg b/core/img/actions/caret-dark.svg
index 2d75e4dd8c..4c9208eaae 100644
--- a/core/img/actions/caret-dark.svg
+++ b/core/img/actions/caret-dark.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" fill="#FFF" d="m4 5 4 7 4-6.989z" fill-opacity=".19608"/>
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m4 4 4 7 4-6.989z"/>
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m4 6 4 4 4-3.9941z"/>
 </svg>
diff --git a/core/img/actions/caret.png b/core/img/actions/caret.png
index 736beb667b..3a8dd99176 100644
Binary files a/core/img/actions/caret.png and b/core/img/actions/caret.png differ
diff --git a/core/img/actions/caret.svg b/core/img/actions/caret.svg
index 41e880e031..48759d1146 100644
--- a/core/img/actions/caret.svg
+++ b/core/img/actions/caret.svg
@@ -1,76 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="10"
-   width="10"
-   version="1.0"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="caret.svg"
-   inkscape:export-filename="caret.png"
-   inkscape:export-xdpi="179.59"
-   inkscape:export-ydpi="179.59">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1002"
-     id="namedview15"
-     showgrid="false"
-     inkscape:zoom="36"
-     inkscape:cx="-0.75"
-     inkscape:cy="5"
-     inkscape:window-x="0"
-     inkscape:window-y="34"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="a"
-       x1="8.4965"
-       gradientUnits="userSpaceOnUse"
-       y1="-.061574"
-       gradientTransform="matrix(1.0526 0 0 .98436 -3.4211 1.0602)"
-       x2="8.4965"
-       y2="8.0832">
-      <stop
-         stop-color="#fff"
-         offset="0"
-         id="stop7" />
-      <stop
-         stop-color="#e6e6e6"
-         offset="1"
-         id="stop9" />
-    </linearGradient>
-  </defs>
-  <path
-     style="block-progression:tb;color:#000000;text-transform:none;text-indent:0;fill:#ffffff;fill-opacity:1"
-     d="m1 1 4 8 4-7.989z"
-     fill="url(#a)"
-     id="path13" />
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="10" width="10" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m1 3 4 4 4-3.9941z" fill="#fff"/>
 </svg>
diff --git a/core/img/actions/triangle-e.png b/core/img/actions/triangle-e.png
index 8abe23a628..4ce1086f61 100644
Binary files a/core/img/actions/triangle-e.png and b/core/img/actions/triangle-e.png differ
diff --git a/core/img/actions/triangle-e.svg b/core/img/actions/triangle-e.svg
index c3d908b366..381a03636d 100644
--- a/core/img/actions/triangle-e.svg
+++ b/core/img/actions/triangle-e.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m4 12 8-4-7.989-4z"/>
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m6 12 4-4-3.9941-4z"/>
 </svg>
diff --git a/core/img/actions/triangle-n.png b/core/img/actions/triangle-n.png
index 0f37e950a4..2042d66532 100644
Binary files a/core/img/actions/triangle-n.png and b/core/img/actions/triangle-n.png differ
diff --git a/core/img/actions/triangle-n.svg b/core/img/actions/triangle-n.svg
index 49d1ac99a7..fad7002d28 100644
--- a/core/img/actions/triangle-n.svg
+++ b/core/img/actions/triangle-n.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m12 12-4-8-4 7.989z"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m12 10-4-4-4 3.9941z"/>
 </svg>
diff --git a/core/img/actions/triangle-s.png b/core/img/actions/triangle-s.png
index 81f623eac1..97c64c6a72 100644
Binary files a/core/img/actions/triangle-s.png and b/core/img/actions/triangle-s.png differ
diff --git a/core/img/actions/triangle-s.svg b/core/img/actions/triangle-s.svg
index 4f35c38f68..cc3e372737 100644
--- a/core/img/actions/triangle-s.svg
+++ b/core/img/actions/triangle-s.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m4 4 4 8 4-7.989z"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16px" width="16px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m4 6 4 4 4-3.9941z"/>
 </svg>
diff --git a/core/img/filetypes/application-epub+zip.png b/core/img/filetypes/application-epub+zip.png
deleted file mode 100644
index 2399088b28..0000000000
Binary files a/core/img/filetypes/application-epub+zip.png and /dev/null differ
diff --git a/core/img/filetypes/application-epub+zip.svg b/core/img/filetypes/application-epub+zip.svg
deleted file mode 100644
index 7de28f4f21..0000000000
--- a/core/img/filetypes/application-epub+zip.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="l" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .67568 2.3784 -.21621)" y1="5" x1="24">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".027065"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".97377"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.1657e-8 1.6179 -1.4834 -2.9808e-8 28.734 -9.2241)" r="20">
-   <stop stop-color="#5f5f5f" offset="0"/>
-   <stop stop-color="#4f4f4f" offset=".26238"/>
-   <stop stop-color="#3b3b3b" offset=".70495"/>
-   <stop stop-color="#2b2b2b" offset="1"/>
-  </radialGradient>
-  <linearGradient id="k" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .69231 1.8 -.61538)" y1="44" x1="24">
-   <stop stop-color="#272727" offset="0"/>
-   <stop stop-color="#454545" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="6.6476" cx="24.502" gradientTransform="matrix(0 1.8069 -2.0594 0 30.19 -41.984)" r="17.498">
-   <stop stop-color="#c4ea71" offset="0"/>
-   <stop stop-color="#7c9d35" offset="1"/>
-  </radialGradient>
-  <linearGradient id="j" y2="61.482" gradientUnits="userSpaceOnUse" x2="32.901" gradientTransform="matrix(.45331 0 0 .48531 1.9942 .11705)" y1="4.6482" x1="32.901">
-   <stop stop-color="#96bf3e" offset="0"/>
-   <stop stop-color="#4d6b0d" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" y2="3" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="10.654" gradientTransform="matrix(0.6 0 0 0.75 .60001 .12498)" y1="1" x1="10.654"/>
-  <linearGradient id="a">
-   <stop stop-color="#eee" offset="0"/>
-   <stop stop-color="#d9d9da" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .076923 1.8002 .15385)" y1="44" x1="24">
-   <stop stop-color="#272727" offset="0"/>
-   <stop stop-color="#454545" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" y2="4.8826" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="3.1234" gradientTransform="matrix(.69042 0 0 1.0165 .25019 -2.4917)" x2="24.64" x1="24.627"/>
-  <linearGradient id="f" y2=".065302" gradientUnits="userSpaceOnUse" y1=".065302" gradientTransform="matrix(.49254 0 0 .49377 .89029 .14413)" x2="54.887" x1="5.2123">
-   <stop stop-color="#96bf3e" offset="0"/>
-   <stop stop-color="#4d6b0d" offset="1"/>
-  </linearGradient>
-  <radialGradient id="e" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="d" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="m" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(0.65 0 0 .33333 0.4 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect height="7" width="5" y="40" x="38" fill="url(#e)"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#d)"/>
-   <rect height="7" width="28" y="40" x="10" fill="url(#m)"/>
-  </g>
- </g>
- <g stroke-linejoin="round">
-  <path d="m27.491 2.3044c-0.203-0.6551-0.076-1.171-0.188-1.7957h-20.794l0.12273 1.9826" stroke="url(#f)" stroke-miterlimit="0" stroke-width="1.0174" fill="url(#g)"/>
-  <g stroke-linecap="round">
-   <path style="color:#000000" d="m7.5002 3.5h-2.4c-0.3425 0-0.6-0.0318-0.6-0.0732v-2.0973c0-0.66594 0.33542-0.8295 0.77454-0.8295h2.2255" stroke="url(#h)" fill="url(#i)"/>
-   <rect rx=".5" ry=".5" height="26.981" width="21.981" stroke="url(#j)" stroke-miterlimit="0" y="2.5096" x="5.5095" stroke-width="1.019" fill="url(#b)"/>
-   <path style="color:#000000" d="m7.5 2.5v27h-2.4c-0.34251 0-0.6-0.28577-0.6-0.65854v-26.341z" stroke="url(#k)" fill="url(#c)"/>
-   <rect opacity=".5" height="25" width="21" stroke="url(#l)" y="3.5" x="5.5" fill="none"/>
-  </g>
- </g>
- <path opacity=".2" d="m17 20.305-3.7708-3.714 3.7708-3.7135 1.257 1.2378-2.5141 2.4757 1.257 1.238 3.7708-3.7135-3.2848-3.2351c-0.26823-0.26439-0.70331-0.26439-0.97177 0l-5.3129 5.2324c-0.26823 0.26417-0.26823 0.69265 0 0.95704l5.3129 5.2322c0.26846 0.26439 0.70353 0.26439 0.97177 0l5.3129-5.2322c0.26823-0.26439 0.26823-0.69287 0-0.95704l-0.77128-0.75937-5.0277 4.9515z"/>
- <path d="m17 19.123-3.7708-3.714 3.7708-3.7135 1.257 1.2378-2.5141 2.4757 1.257 1.238 3.7708-3.7135-3.2848-3.2351c-0.26823-0.26439-0.70331-0.26439-0.97177 0l-5.3129 5.2324c-0.26823 0.26417-0.26823 0.69265 0 0.95704l5.3129 5.2322c0.26846 0.26439 0.70353 0.26439 0.97177 0l5.3129-5.2322c0.26823-0.26439 0.26823-0.69287 0-0.95704l-0.77128-0.75937-5.0277 4.9515z" fill="#fff"/>
-</svg>
diff --git a/core/img/filetypes/application-javascript.png b/core/img/filetypes/application-javascript.png
deleted file mode 100644
index 1e1d3140f6..0000000000
Binary files a/core/img/filetypes/application-javascript.png and /dev/null differ
diff --git a/core/img/filetypes/application-javascript.svg b/core/img/filetypes/application-javascript.svg
deleted file mode 100644
index 4e9819bb68..0000000000
--- a/core/img/filetypes/application-javascript.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="f" x1="29.465" gradientUnits="userSpaceOnUse" y1="17.607" gradientTransform="translate(4.1161 -1.6069)" x2="29.465" y2="34.607">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".17647"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".82353"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="13.884" gradientUnits="userSpaceOnUse" y1="12.607" gradientTransform="translate(4.1161 -1.6069)" x2="13.884" y2="41.607">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".82759"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" y2=".4976" gradientUnits="userSpaceOnUse" y1="44.759" x2="23.749" x1="23.749">
-   <stop stop-color="#a3a3a3" offset="0"/>
-   <stop stop-color="#bababa" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/>
-  <linearGradient id="e" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" fx="8.5513" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.0816" gradientTransform="matrix(0 7.0761 -7.4527 0 100.32 -66.262)" r="12.672">
-   <stop stop-color="#ffcd7d" offset="0"/>
-   <stop stop-color="#fc8f36" offset=".26238"/>
-   <stop stop-color="#e23a0e" offset=".70495"/>
-   <stop stop-color="#ac441f" offset="1"/>
-  </radialGradient>
-  <linearGradient id="i" x1="25" gradientUnits="userSpaceOnUse" y1="49.945" gradientTransform="translate(2.1239 -1.9451)" x2="25" y2="4.9451">
-   <stop stop-color="#ba3d12" offset="0"/>
-   <stop stop-color="#db6737" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="scale(.66667)">
-  <g>
-   <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#e)"/>
-   <path opacity=".3" fill="url(#c)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/>
-   <path opacity=".3" fill="url(#d)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/>
-  </g>
-  <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#k)" stroke-width=".99992" fill="url(#l)"/>
-  <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#h)" stroke-linecap="round" fill="none"/>
-  <path d="m11 21v1h2.3438v-1h-2.344zm0 4v1h2.75v-1h-2.75zm0 2v1h2.9375v-1h-5.282zm0 2v1h2.5312v-1h-4.875zm0 2.1562v0.96875h2.2188v-0.96875h-2.2188zm0.406-10.156v1h2.25v-1h-2.25zm-2.75 2v1h1v-1h-1zm3.1562 2v1h1.8438v-1h-1.8438zm0.125 2v1h2.7188v-1h-2.7188zm-0.34375 2v1h2.0625v-1h-2.0625zm-0.375 2.1562v0.96875h2.125v-0.96875h-2.125zm-2.562 2.844v1h4.2812v-1h-4.281zm0 2v1h3.6875v-1h-3.688zm3.9688 0v1h1.7812v-1h-1.7812zm-0.625 2v1h3.3438v-1h-3.3438zm-3.344 0h3.0367v1h-3.037v-1zm3.4062-22v1h5.5938v-1h-5.5938zm0.03125 2v1h5.0938v-1h-5.0938zm1.1875 16v1h4.5938v-1h-4.5938zm4.9375 0v1h1.8125v-1h-1.8125zm2.1562 0v1h4.3125v-1h-4.3125zm4.6562 0v1h2.9688v-1h-2.9688zm3.2812 0v1h1.1562v-1h-1.1562zm1.5 0v1h0.6875v-1h-0.6875zm1 0v1h1.8438v-1h-1.8438zm-16.031 2v1h0.8125v-1h-0.8125zm1.0312 0v1h1.625v-1h-1.625zm1.875 0v1h1.625v-1h-1.625zm2.125 0v1h2.5938v-1h-2.5938zm2.9062 0v1h3.375v-1h-3.375zm3.8438 0v1h2.2812v-1h-2.2812zm2.5625 0v1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094zm0-11v1h2.375v-1h-2.375zm2.6875 0v1h2.25v-1h-2.25zm2.5625 0v1h1.9688v-1h-1.9688zm2.2812 0v1h0.875v-1h-0.875zm1.1875 0v1h1.9375v-1h-1.9375zm2.2812 0v1h5v-1h-5zm-11 2l0.001 1h3.7812v-1h-3.7812zm4.1562 0v1h1.8125v-1h-1.8125zm2.1562 0v1h0.84375v-1h-0.84375zm1.2188 0v1h1.625v-1h-1.625zm2 0v1h1.625v-1h-1.625zm1.9688 0v1h2.6562v-1h-2.6562zm3.0312 0v1h3.4688v-1h-3.4688zm-14.53 2v1h4.1875v-1h-4.188zm4.5 0v1h4.5v-1h-4.5zm-4.5 2v1h2.3125v-1h-2.312zm2.625 0v1h2.1562v-1h-2.1562zm2.4688 0v1h1.9062v-1h-1.9062zm3.8125 5v1h1.9062v-1h-1.9062zm2.2188 0v1h1.9062v-1h-1.9062zm2.2188 0v1h2.75v-1h-2.75zm3.0938 0v1h0.5625v-1h-0.5625zm-7.438 7v1h2.3438v-1h-2.344zm2.6562 0v1h2.1875v-1h-2.1875zm2.5 0v1h1.844v-1h-1.844zm-5.156 2v1h1.875v-1h-1.875zm2.1875 0v1h4.8125v-1h-4.8125zm5.125 0v1h3.6875v-1h-3.6875zm-7.313 2v1h2.4375v-1h-2.438zm2.7812 0v1h4.2812v-1h-4.2812zm4.5938 0v1h2.9375v-1h-2.9375zm-7.375 2.125v0.96875h1.875v-0.96875h-1.875zm2.1875 0v0.96875h1.9062v-0.96875h-1.9062zm2.2188 0v0.96875h2.7188v-0.96875h-2.7188zm3.0312 0v0.96875h0.5625v-0.96875h-0.5625zm0.875 0v0.96875h3.5312v-0.96875h-3.5312zm-8.375 6.875v1h2.4375v-1h-2.4375zm2.75 0v1h2.25v-1h-2.25zm2.5938 0v1h1.9375v-1h-1.9375zm2.25 0v1h3.0938v-1h-3.0938zm3.4375 0v1h5.0312v-1h-5.0312z" fill="url(#j)"/>
-  <g stroke-linejoin="round">
-   <path style="color:#000000" d="m37.105 28.194c-0.000013 0.91667-0.16668 1.7188-0.5 2.4062-0.33335 0.6875-0.8073 1.2604-1.4219 1.7188-0.61459 0.45833-1.3594 0.80208-2.2344 1.0312-0.87501 0.22917-1.8542 0.34375-2.9375 0.34375-0.57292 0-1.1042-0.02083-1.5938-0.0625-0.48959-0.03125-0.95313-0.08854-1.3906-0.17188-0.4375-0.08333-0.85938-0.1875-1.2656-0.3125-0.40625-0.125-0.81771-0.28125-1.2344-0.46875v-3.9375c0.4375 0.21876 0.89583 0.41667 1.375 0.59375 0.48958 0.17709 0.97395 0.33334 1.4531 0.46875 0.47916 0.125 0.9427 0.22396 1.3906 0.29688 0.45833 0.07292 0.8802 0.10938 1.2656 0.10938 0.42708 0.000004 0.79166-0.03646 1.0938-0.10938 0.30208-0.08333 0.54687-0.1927 0.73438-0.32812 0.19791-0.14583 0.33853-0.3125 0.42188-0.5 0.09374-0.19791 0.14062-0.40624 0.14062-0.625-0.000008-0.21874-0.03647-0.41145-0.10938-0.57812-0.06251-0.17708-0.21355-0.35937-0.45312-0.54688-0.23959-0.19791-0.59376-0.41666-1.0625-0.65625-0.45834-0.24999-1.0781-0.55208-1.8594-0.90625-0.76042-0.34374-1.4219-0.68228-1.9844-1.0156-0.55209-0.34374-1.0104-0.72395-1.375-1.1406-0.35417-0.41666-0.61979-0.89061-0.79688-1.4219-0.17708-0.54166-0.26563-1.1823-0.26562-1.9219-0.000001-0.81249 0.15625-1.5208 0.46875-2.125 0.3125-0.61457 0.75521-1.125 1.3281-1.5312 0.57291-0.40623 1.2604-0.70832 2.0625-0.90625 0.8125-0.20832 1.7135-0.31248 2.7031-0.3125 1.0417 0.000018 2.0312 0.11981 2.9688 0.35938 0.93749 0.2396 1.901 0.59898 2.8906 1.0781l-1.4375 3.375c-0.794-0.376-1.549-0.683-2.268-0.923-0.71876-0.23957-1.4375-0.35936-2.1562-0.35938-0.64584 0.000015-1.1146 0.1146-1.4062 0.34375-0.28126 0.22918-0.42188 0.54168-0.42188 0.9375-0.000005 0.20835 0.03645 0.39585 0.10938 0.5625 0.07291 0.15626 0.21874 0.32293 0.4375 0.5 0.21874 0.16668 0.52603 0.35418 0.92188 0.5625 0.39582 0.19793 0.91145 0.44272 1.5469 0.73438 0.73957 0.32293 1.4062 0.64584 2 0.96875 0.59374 0.31251 1.1042 0.67188 1.5312 1.0781 0.42707 0.40626 0.7552 0.88022 0.98438 1.4219 0.22915 0.54167 0.34374 1.1979 0.34375 1.9688m-24.526 11.906c-0.67708-0.000006-1.2708-0.03646-1.7812-0.10938-0.511-0.063-0.9428-0.141-1.297-0.235v-4.0312c0.38542 0.08333 0.79167 0.15625 1.2188 0.21875 0.41667 0.0625 0.875 0.09375 1.375 0.09375 0.47917-0.000002 0.92188-0.05209 1.3281-0.15625 0.41666-0.10417 0.77604-0.28646 1.0781-0.54688 0.3125-0.25 0.55208-0.58854 0.71875-1.0156 0.17708-0.42708 0.26562-0.96354 0.26562-1.6094v-22.172h5.0906v22.016c0 1.3125-0.19272 2.4427-0.57812 3.3906-0.37501 0.94791-0.90626 1.7292-1.5938 2.3438-0.67709 0.625-1.4896 1.0833-2.4375 1.375-0.948 0.29-1.995 0.436-3.141 0.436z" stroke="url(#i)" fill="url(#b)"/>
-   <path opacity=".5" style="color:#000000" d="m16.531 11.562v21.156c-0.000003 0.74521-0.14604 1.4057-0.375 1.9688h0.03125c-0.0053 0.01356-0.02582 0.01774-0.03125 0.03125-0.21291 0.52977-0.51641 1.033-0.96875 1.4062-0.01075 0.0093-0.02039 0.02213-0.03125 0.03125-0.42364 0.35547-0.94402 0.58756-1.4688 0.71875-0.5068 0.12994-1.0399 0.1875-1.5938 0.1875-0.54293 0-1.0548-0.02228-1.5312-0.09375-0.01053-0.0015-0.02074 0.0016-0.03125 0v1.9375c0.14199 0.02453 0.25 0.04337 0.40625 0.0625a1.0305 1.0305 0 0 1 0.03125 0c0.4327 0.06181 0.93779 0.09374 1.5938 0.09375h0.25c1.0584-0.000006 2.0104-0.14984 2.8438-0.40625 0.8161-0.25111 1.5028-0.60837 2.0625-1.125a1.0305 1.0305 0 0 1 0 -0.03125c0.56066-0.5012 0.98871-1.119 1.3125-1.9375 0.32074-0.78887 0.5-1.7802 0.5-3v-21h-3z" stroke="url(#g)" fill="none"/>
-   <path opacity=".5" style="color:#000000" d="m31.062 16.625c-0.91729 0.000017-1.7568 0.09872-2.4688 0.28125-0.6983 0.17232-1.2665 0.42933-1.7188 0.75-0.43783 0.31048-0.75495 0.67432-1 1.1562-0.22591 0.43677-0.34375 0.97587-0.34375 1.6562-0.000001 0.67187 0.0572 1.1952 0.1875 1.5938 0.13076 0.39228 0.3626 0.74863 0.625 1.0625 0.27891 0.31876 0.63321 0.6313 1.125 0.9375 0.54028 0.32018 1.1571 0.64423 1.875 0.96875 0.78022 0.35371 1.4056 0.66564 1.9062 0.9375 0.0091 0.0047 0.02219-0.0047 0.03125 0 0.48031 0.2467 0.86296 0.48708 1.1875 0.75 0.01 0.0081 0.02142 0.02313 0.03125 0.03125 0.29407 0.23569 0.56733 0.5282 0.71875 0.90625 0.0064 0.0161-0.006 0.04609 0 0.0625 0.0023 0.0064 0.02897-0.0065 0.03125 0 0.11318 0.2766 0.18749 0.5805 0.1875 0.9375-0.000015 0.40344-0.11735 0.74498-0.25 1.0312-0.0031 0.0069 0.0032 0.02432 0 0.03125h-0.03125c-0.14902 0.31791-0.36691 0.67002-0.6875 0.90625a1.0305 1.0305 0 0 1 -0.03125 0c-0.37162 0.26839-0.71579 0.37311-1.0625 0.46875a1.0305 1.0305 0 0 1 -0.03125 0c-0.376 0.092-0.832 0.157-1.343 0.157-0.47826 0.000005-0.9298-0.0492-1.4062-0.125-0.45579-0.07419-0.96671-0.17338-1.5-0.3125a1.0305 1.0305 0 0 1 -0.03125 0c-0.50955-0.144-0.9949-0.3173-1.5-0.5v1.6562c0.16564 0.0631 0.33735 0.13746 0.5 0.1875 0.3613 0.11117 0.74977 0.23508 1.1562 0.3125 0.37252 0.07096 0.77865 0.09491 1.25 0.125a1.0305 1.0305 0 0 1 0.03125 0c0.45573 0.03879 0.95205 0.0625 1.5 0.0625 1.0107 0 1.9133-0.10974 2.6875-0.3125 0.77223-0.20225 1.389-0.48131 1.875-0.84375 0.4815-0.35909 0.82413-0.78767 1.0938-1.3438 0.25489-0.52574 0.40624-1.177 0.40625-1.9688-0.000011-0.66872-0.08918-1.1823-0.25-1.5625-0.17948-0.42419-0.42147-0.74998-0.75-1.0625-0.35949-0.34194-0.77277-0.66986-1.2812-0.9375a1.0305 1.0305 0 0 1 -0.03125 0c-0.56267-0.306-1.1894-0.62451-1.9062-0.9375a1.0305 1.0305 0 0 1 -0.03125 0c-0.62352-0.28619-1.1526-0.52942-1.5938-0.75-0.43674-0.22984-0.78885-0.44773-1.0625-0.65625a1.0305 1.0305 0 0 1 -0.03125 0c-0.29046-0.23511-0.54194-0.49605-0.71875-0.875a1.0305 1.0305 0 0 1 0 -0.03125c-0.11448-0.26163-0.21876-0.58868-0.21875-0.96875-0.000008-0.667 0.32053-1.3491 0.8125-1.75a1.0305 1.0305 0 0 1 0.03125 0c0.58219-0.45741 1.2635-0.56248 2.0312-0.5625 0.81828 0.000017 1.6395 0.12985 2.4688 0.40625 0.46119 0.15374 0.94101 0.36068 1.4062 0.5625l0.625-1.4375c-0.604-0.25-1.22-0.541-1.783-0.684-0.838-0.215-1.746-0.313-2.719-0.313z" stroke="url(#f)" fill="none"/>
-  </g>
- </g>
-</svg>
diff --git a/core/img/filetypes/application-pdf.png b/core/img/filetypes/application-pdf.png
index 7467637267..4029f8aead 100644
Binary files a/core/img/filetypes/application-pdf.png and b/core/img/filetypes/application-pdf.png differ
diff --git a/core/img/filetypes/application-pdf.svg b/core/img/filetypes/application-pdf.svg
index b671e98725..9a472dba84 100644
--- a/core/img/filetypes/application-pdf.svg
+++ b/core/img/filetypes/application-pdf.svg
@@ -1,48 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="167.98" gradientUnits="userSpaceOnUse" y1="8.5081" gradientTransform="matrix(.44444 0 0 .44444 -24 2.7778)" x2="167.98" y2="54.78">
-   <stop stop-color="#fffdf3" offset="0"/>
-   <stop stop-color="#fbebeb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" gradientUnits="userSpaceOnUse" cy="9.9941" cx="8.2761" gradientTransform="matrix(0 4.2742 -5.2474 0 68.489 -37.143)" r="12.672">
-   <stop stop-color="#f89b7e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".26238"/>
-   <stop stop-color="#c6262e" offset=".66094"/>
-   <stop stop-color="#690b2c" offset="1"/>
-  </radialGradient>
-  <radialGradient id="j" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="k" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="g" y2="39.999" gradientUnits="userSpaceOnUse" y1="47.028" x2="25.058" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.7 0 0 .33333 -.8 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect y="40" width="5" fill="url(#j)" x="38" height="7"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#k)"/>
-   <rect y="40" width="28" fill="url(#g)" x="10" height="7"/>
-  </g>
- </g>
- <rect style="color:#000000" rx="2" ry="2" height="25" width="25" y="4.5" x="3.5" fill="url(#l)"/>
- <path opacity=".15" style="color:#000000" fill="#661215" d="m18.188 4.9688a1.0386 1.0386 0 0 0 -0.46875 0.25c-8.0692 6.9232-12.522 7.7862-13.782 7.8752a1.0386 1.0386 0 0 0 -0.4375 0.125v8.7187a1.0386 1.0386 0 0 0 0.5 0.125c1.2408 0 3.1922 0.83225 5.0625 2.2812 1.726 1.337 3.383 3.164 4.594 5.156h12.844c1.108 0 2-0.892 2-2v-0.125c-1.2349-2.981-2.1282-7.0748-2.8125-10.781-0.003-0.023 0.003-0.0395 0-0.0625-0.61012-4.7373 0.28634-8.959 0.625-10.281a1.0386 1.0386 0 0 0 -1 -1.2812h-6.9062a1.0386 1.0386 0 0 0 -0.21875 0zm0 4.875c-0.19809 1.3497-0.34502 2.9178-0.46875 4.7812-0.23961 3.6087-0.31211 8.3302-0.34375 13.438-1.2326-2.3066-3.3956-4.6736-5.8438-6.6875-1.4134-1.1626-2.8465-2.1591-4.125-2.9062-0.81148-0.4742-1.5307-0.8115-2.2188-1.0312 1.5275-0.29509 3.8744-0.90217 6.625-2.625 2.3056-1.4441 4.5975-3.3663 6.375-4.9687z" fill-rule="evenodd"/>
- <path opacity=".3" style="color:#000000" fill="#661215" d="m18.406 6c-8.18 7.019-12.852 8.016-14.406 8.125v2.5312c1.1732-0.164 4.1092-0.751 7.25-2.718 4.027-2.523 8.844-7.313 8.844-7.313-1.302 2.5536-1.684 11.312-1.719 22.875h8.125c0.60271 0 1.1339-0.26843 1.5-0.6875 0.00027-0.0105 0-0.0207 0-0.0312-1.565-3.227-2.576-7.895-3.344-12.062-0.655-4.973 0.298-9.3183 0.656-10.719h-6.9062zm-14.406 12.219v2.8125c3.2857 0 8.2665 3.8155 10.875 8.4688h2.2188c-1.665-4.451-10.589-11.282-13.094-11.282z" fill-rule="evenodd"/>
- <path style="color:#000000" d="m18.408 5c-8.18 7.019-12.854 8.01-14.408 8.119v2.5225c1.1732-0.16382 4.1224-0.73265 7.2632-2.6998 4.0274-2.5225 8.8421-7.3113 8.8421-7.3113-1.32 2.5898-1.705 11.522-1.73 23.333h8.441c0.661 0 1.184-0.523 1.184-1.183-1.565-3.227-2.588-7.893-3.355-12.06-0.656-4.973 0.312-9.3203 0.671-10.721h-6.9079zm-14.408 12.23v2.7938c3.3961 0 8.6171 4.0752 11.143 8.9398h2.1215c-1.187-4.423-10.673-11.734-13.264-11.734z" fill="url(#i)"/>
- <path opacity=".05" d="m25.688 5.0313c-3.216 1.9588-13.74 7.9437-21.688 7.1877v5.4062s17.674 2.6262 24-2.5938v-8.7187c0-0.69873-0.55021-1.2812-1.25-1.2812h-1.0625zm2.312 12.25c-3.181 3.168-6.45 7.386-8.625 11.719h2.5312c1.761-2.975 4.072-6.235 6.094-8.25v-3.4688z" fill-rule="evenodd"/>
- <rect opacity=".5" stroke-linejoin="round" rx="1" ry="1" height="23" width="23" stroke="url(#h)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/>
- <rect opacity=".35" stroke-linejoin="round" style="color:#000000" rx="2" ry="2" height="25" width="25" stroke="#410000" stroke-linecap="round" y="4.5" x="3.5" fill="none"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" fill="#dc5047" d="m2.3496 1v0.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0 0.228 0.2061 0.436 0.4316 0.436h11.138c0.226 0 0.432-0.208 0.432-0.437v-10.143c-0.004-0.0669-0.023-0.1329-0.055-0.1914l-3.312-3.1993c-0.043-0.0164-0.089-0.0255-0.135-0.0273h-8.0684c-0.0268-0.0026-0.0552-0.0026-0.082 0zm5.0059 2h0.1933c0.1855 0 0.3632 0.0663 0.4922 0.1953 0.5323 0.5322 0.2837 1.8299 0.0176 2.9024-0.0161 0.0483-0.0251 0.0891-0.0332 0.1132 0.3226 0.9112 0.783 1.6452 1.291 2.0645 0.2097 0.1613 0.4431 0.3216 0.7016 0.4668 0.362-0.0403 0.71-0.0567 1.041-0.0567 1 0 1.604 0.1777 1.837 0.5567 0.081 0.129 0.12 0.2821 0.096 0.4433-0.008 0.2016-0.079 0.3885-0.224 0.5335-0.138 0.153-0.378 0.24-0.733 0.24-0.613 0-1.615-0.186-2.4217-0.5977-1.3871 0.1537-2.4194 0.3417-3.25 0.6077-0.0403 0.016-0.0881 0.03-0.1445 0.054-1 1.71-1.7414 2.477-2.3946 2.477-0.1291 0-0.2586-0.033-0.3554-0.09l-0.3868-0.248-0.0254-0.041c-0.0565-0.145-0.0732-0.282-0.041-0.435 0.0887-0.427 0.5498-1.106 1.5176-1.711 0.1532-0.113 0.3942-0.242 0.7168-0.395 0.2419-0.4191 0.5011-0.9109 0.7754-1.4511 0.4113-0.8306 0.6675-1.6517 0.8691-2.3613v-0.0098c-0.2984-0.9757-0.4741-1.5642-0.1757-2.6367 0.0726-0.3064 0.3383-0.6211 0.6367-0.6211zm0.1211 0.5c-0.0162 0.0242-0.0405 0.0654-0.0567 0.0977-0.1371 0.3386-0.1288 0.9266 0.0567 1.6523l0.041-0.0312c0.0564-0.2581 0.0805-0.4848 0.1289-0.6622l0.0234-0.1289c0.0806-0.4596 0.0649-0.6932-0.0722-0.8867l-0.1211-0.041zm0.0664 3.6465c-0.1856 0.5968-0.4535 1.2321-0.8164 1.9336-0.1613 0.3064-0.3398 0.596-0.4043 0.8379l0.0898-0.0313c1.0242-0.3951 1.9937-0.621 2.6953-0.75-0.1209-0.0806-0.2353-0.1691-0.332-0.2578-0.4839-0.4112-0.9017-1.0067-1.2324-1.7324zm3.361 2.2168c-0.056 0-0.113-0.0006-0.185 0.0801 0.588 0.258 1.16 0.4121 1.531 0.4121 0.056 0 0.106-0.0076 0.154-0.0157h0.034c0.04-0.0161 0.064-0.0267 0.072-0.1074-0.016-0.0242-0.032-0.0556-0.072-0.0879-0.081-0.0806-0.405-0.2812-1.534-0.2812zm-5.863 1.4587c-0.1693 0.097-0.3061 0.186-0.3867 0.25-0.5726 0.524-0.9343 1.055-0.9746 1.362 0.3629-0.121 0.8371-0.652 1.3613-1.612z"/>
 </svg>
diff --git a/core/img/filetypes/application-rss+xml.png b/core/img/filetypes/application-rss+xml.png
deleted file mode 100644
index 5b18ee2cd4..0000000000
Binary files a/core/img/filetypes/application-rss+xml.png and /dev/null differ
diff --git a/core/img/filetypes/application-rss+xml.svg b/core/img/filetypes/application-rss+xml.svg
deleted file mode 100644
index 54a9f46e4e..0000000000
--- a/core/img/filetypes/application-rss+xml.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.57063 0 0 .57063 2.3049 3.3049)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="m" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.0673e-7 3.4663 -5.3421 -1.0405e-7 69.185 -26.355)" r="12.672">
-   <stop stop-color="#ffcd7d" offset="0"/>
-   <stop stop-color="#fc8f36" offset=".26238"/>
-   <stop stop-color="#e23a0e" offset=".70495"/>
-   <stop stop-color="#ac441f" offset="1"/>
-  </radialGradient>
-  <linearGradient id="i" x1="25" gradientUnits="userSpaceOnUse" y1="47.935" gradientTransform="matrix(.66015 0 0 .52505 .15636 5.186)" x2="25" y2=".91791">
-   <stop stop-color="#ba3d12" offset="0"/>
-   <stop stop-color="#db6737" offset="1"/>
-  </linearGradient>
-  <radialGradient id="k" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 24.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 24.981)" r="117.14"/>
-  <linearGradient id="j" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 24.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="28" x="4.95" fill="url(#j)"/>
- <path opacity=".15" d="m4.95 28v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#l)"/>
- <path opacity=".15" d="m27.05 28v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#k)"/>
- <path stroke-linejoin="round" style="color:#000000" d="m4.4473 5.4473c5.2946 0 23.105 0.00147 23.105 0.00147l0.000029 23.104h-23.105v-23.105z" stroke="url(#i)" stroke-width=".89464" fill="url(#m)"/>
- <path opacity=".5" stroke-linejoin="round" d="m26.557 27.557h-21.113v-21.113h21.113z" stroke="url(#h)" stroke-linecap="round" stroke-width=".88668" fill="none"/>
- <path d="m7.0633 24.902c0-0.30708 0.10601-0.56488 0.31803-0.7734 0.21203-0.2123 0.47138-0.31845 0.77805-0.31846 0.2991 0.000007 0.55277 0.10616 0.76101 0.31846 0.21202 0.20852 0.31803 0.46632 0.31803 0.7734 0 0.29951-0.10601 0.55541-0.31803 0.76771-0.20824 0.20852-0.46191 0.31278-0.76101 0.31277-0.30667 0.000007-0.56603-0.10425-0.77805-0.31277-0.2121-0.209-0.3181-0.465-0.3181-0.768m-0.0633-4.931v1.816c2.3202 0 4.2047 1.8882 4.2047 4.2129h1.8223c0-3.33-2.7035-6.0293-6.027-6.0293zm0.00312-3.9745v2.0078c4.4053 0 7.9822 3.5816 7.9822 7.9928h2.0147c0.000015-5.5219-4.4823-10.001-9.9969-10.001z" fill="#fff"/>
-</svg>
diff --git a/core/img/filetypes/application-x-cbr.png b/core/img/filetypes/application-x-cbr.png
deleted file mode 100644
index c0d374a459..0000000000
Binary files a/core/img/filetypes/application-x-cbr.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-cbr.svg b/core/img/filetypes/application-x-cbr.svg
deleted file mode 100644
index 3c9e150e79..0000000000
--- a/core/img/filetypes/application-x-cbr.svg
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="l" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.56757 0 0 .67568 2.3784 -.21621)" y1="5" x1="24">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".027065"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".97377"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.1657e-8 1.6179 -1.4834 -2.9808e-8 28.734 -9.2241)" r="20">
-   <stop stop-color="#5f5f5f" offset="0"/>
-   <stop stop-color="#4f4f4f" offset=".26238"/>
-   <stop stop-color="#3b3b3b" offset=".70495"/>
-   <stop stop-color="#2b2b2b" offset="1"/>
-  </radialGradient>
-  <linearGradient id="k" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .69231 1.8 -.61538)" y1="44" x1="24">
-   <stop stop-color="#272727" offset="0"/>
-   <stop stop-color="#454545" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="6.6476" cx="24.502" gradientTransform="matrix(0 1.8069 -2.0594 0 30.19 -41.984)" r="17.498">
-   <stop stop-color="#c4ea71" offset="0"/>
-   <stop stop-color="#7c9d35" offset="1"/>
-  </radialGradient>
-  <linearGradient id="j" y2="61.482" gradientUnits="userSpaceOnUse" x2="32.901" gradientTransform="matrix(.45331 0 0 .48531 1.9942 .11705)" y1="4.6482" x1="32.901">
-   <stop stop-color="#96bf3e" offset="0"/>
-   <stop stop-color="#4d6b0d" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" y2="3" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="10.654" gradientTransform="matrix(0.6 0 0 0.75 .60001 .12498)" y1="1" x1="10.654"/>
-  <linearGradient id="a">
-   <stop stop-color="#eee" offset="0"/>
-   <stop stop-color="#d9d9da" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(0.6 0 0 .076923 1.8002 .15385)" y1="44" x1="24">
-   <stop stop-color="#272727" offset="0"/>
-   <stop stop-color="#454545" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" y2="4.8826" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="3.1234" gradientTransform="matrix(.69042 0 0 1.0165 .25019 -2.4917)" x2="24.64" x1="24.627"/>
-  <linearGradient id="f" y2=".065302" gradientUnits="userSpaceOnUse" y1=".065302" gradientTransform="matrix(.49254 0 0 .49377 .89029 .14413)" x2="54.887" x1="5.2123">
-   <stop stop-color="#96bf3e" offset="0"/>
-   <stop stop-color="#4d6b0d" offset="1"/>
-  </linearGradient>
-  <radialGradient id="e" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="d" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="m" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(0.65 0 0 .33333 0.4 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect height="7" width="5" y="40" x="38" fill="url(#e)"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#d)"/>
-   <rect height="7" width="28" y="40" x="10" fill="url(#m)"/>
-  </g>
- </g>
- <g stroke-linejoin="round">
-  <path d="m27.491 2.3044c-0.203-0.6551-0.076-1.171-0.188-1.7957h-20.794l0.12273 1.9826" stroke="url(#f)" stroke-miterlimit="0" stroke-width="1.0174" fill="url(#g)"/>
-  <g stroke-linecap="round">
-   <path style="color:#000000" d="m7.5002 3.5h-2.4c-0.3425 0-0.6-0.0318-0.6-0.0732v-2.0973c0-0.66594 0.33542-0.8295 0.77454-0.8295h2.2255" stroke="url(#h)" fill="url(#i)"/>
-   <rect rx=".5" ry=".5" height="26.981" width="21.981" stroke="url(#j)" stroke-miterlimit="0" y="2.5096" x="5.5095" stroke-width="1.019" fill="url(#b)"/>
-   <path style="color:#000000" d="m7.5 2.5v27h-2.4c-0.34251 0-0.6-0.28577-0.6-0.65854v-26.341z" stroke="url(#k)" fill="url(#c)"/>
-   <rect opacity=".5" height="25" width="21" stroke="url(#l)" y="3.5" x="5.5" fill="none"/>
-  </g>
- </g>
- <g opacity=".2" transform="matrix(-.17866 0 0 .17866 25.444 7.067)">
-  <path d="m50.463 22.014c-19.869 0-35.984 11.045-35.984 24.674 0 6.475 3.667 12.342 9.612 16.748l-4.027 14.551 20.54-7.582c3.132 0.615 6.438 0.967 9.859 0.967 19.873 0 35.98-11.049 35.98-24.684 0-13.629-16.107-24.674-35.98-24.674z"/>
- </g>
- <g fill="#fff" transform="matrix(-.17866 0 0 .17866 25.444 6.067)">
-  <path fill="#fff" d="m50.463 22.014c-19.869 0-35.984 11.045-35.984 24.674 0 6.475 3.667 12.342 9.612 16.748l-4.027 14.551 20.54-7.582c3.132 0.615 6.438 0.967 9.859 0.967 19.873 0 35.98-11.049 35.98-24.684 0-13.629-16.107-24.674-35.98-24.674z"/>
- </g>
-</svg>
diff --git a/core/img/filetypes/application-x-shockwave-flash.png b/core/img/filetypes/application-x-shockwave-flash.png
deleted file mode 100644
index 75424f81d6..0000000000
Binary files a/core/img/filetypes/application-x-shockwave-flash.png and /dev/null differ
diff --git a/core/img/filetypes/application-x-shockwave-flash.svg b/core/img/filetypes/application-x-shockwave-flash.svg
deleted file mode 100644
index b373fd6512..0000000000
--- a/core/img/filetypes/application-x-shockwave-flash.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="q" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <radialGradient id="r" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="m" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="n" x1="27.401" gradientUnits="userSpaceOnUse" y1="22.442" gradientTransform="matrix(.65714 0 0 .65901 .22856 .17230)" x2="27.401" y2="25.726">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="o" x1="25" gradientUnits="userSpaceOnUse" y1="12" gradientTransform="matrix(.65714 0 0 .65901 .22856 .17230)" x2="25" y2="35">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="s" fx="30.345" gradientUnits="userSpaceOnUse" cy="10.417" cx="28.897" gradientTransform="matrix(.85740 -2.1584e-8 0 1.4143 -9.1048 9.1644)" r="20">
-   <stop stop-color="#f8b17e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".26238"/>
-   <stop stop-color="#c6262e" offset=".66094"/>
-   <stop stop-color="#690b54" offset="1"/>
-  </radialGradient>
-  <linearGradient id="p" x1="21.587" gradientUnits="userSpaceOnUse" y1="11.492" gradientTransform="matrix(.65714 0 0 .65901 -.1 -.12653)" x2="21.587" y2="36.647">
-   <stop stop-color="#911313" offset="0"/>
-   <stop stop-color="#bc301e" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#m)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#r)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#q)"/>
- <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#l)"/>
- <path stroke-linejoin="round" stroke="url(#k)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/>
- <path stroke-linejoin="round" opacity=".3" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
- <path opacity=".6" style="color:#000000" d="m22.499 8.0004c-2.6636-0.029674-5.0587 1.658-6.5324 3.7793-0.94364 1.305-1.5732 2.7991-2.0832 4.3148-0.69136 1.6778-1.5201 3.4583-3.0765 4.5016-0.45903 0.43459-1.0981 0.2-1.5957 0.43224-0.34845 0.3228-0.14701 0.84514-0.20078 1.2625 0.014388 0.76734-0.029122 1.5402 0.022375 2.304 0.18898 0.54758 0.88853 0.37796 1.3325 0.38828 2.2257-0.09973 4.2002-1.5034 5.3804-3.336 0.54977-0.82122 0.97797-1.7194 1.3143-2.6473 1.5061-0.0077 3.0142 0.01532 4.519-0.01144 0.47522-0.09148 0.43944-0.63085 0.42264-1.001-0.0162-0.88446 0.03272-1.7755-0.02502-2.6558-0.16487-0.50455-0.76136-0.34818-1.1638-0.37106h-1.4529c0.52776-1.2578 1.4889-2.5011 2.8611-2.8681 0.36161 0.0036 0.81834-0.19473 0.77518-0.62481-0.01611-1.0312 0.03245-2.0689-0.02468-3.096-0.06232-0.20565-0.25794-0.35925-0.47259-0.37101z" fill="#fff"/>
- <g stroke-linecap="round">
-  <path stroke-linejoin="round" style="color:#000000" d="m9.5 20.5v3s4.9977 0.73959 7.2131-6c0.14685-0.000002 4.7869 0 4.7869 0v-3h-3s1.2833-3.7081 4-4l-0.000016-3s-5.0297-0.35936-7.7464 6.7199c-2.35 6.933-5.254 6.28-5.254 6.28z" stroke="url(#p)" fill="url(#s)"/>
-  <path opacity=".1" style="color:#000000" d="m21.5 9.8357v-1.2407c-1.6165 0.19395-3.8735 2.0585-4.8706 4.0955-0.67454 1.078-0.96187 2.016-1.4144 3.1932-0.81519 1.9428-2.1324 4.1368-4.0625 5.1513" stroke="url(#o)" fill="none"/>
-  <path opacity=".1" style="color:#000000" d="m20.5 16.656v-1.1418l-2.3993-0.02926" stroke="url(#n)" fill="none"/>
- </g>
-</svg>
diff --git a/core/img/filetypes/application.png b/core/img/filetypes/application.png
index b6b1bbce2f..9be7361d1b 100644
Binary files a/core/img/filetypes/application.png and b/core/img/filetypes/application.png differ
diff --git a/core/img/filetypes/application.svg b/core/img/filetypes/application.svg
index edce49e3e4..f37966d4a2 100644
--- a/core/img/filetypes/application.svg
+++ b/core/img/filetypes/application.svg
@@ -1,57 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="p" x1="16" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="9" gradientTransform="matrix(1 0 0 -1 0 34.004)" x2="16" y2="25"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="o" x1="16" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="16" y1="9" y2="25"/>
-  <linearGradient id="n" x1="19.927" gradientUnits="userSpaceOnUse" y1="44.949" gradientTransform="matrix(.66667 0 0 .66667 .0000011 .33333)" x2="19.927" y2="4.9969">
-   <stop stop-color="#505050" offset="0"/>
-   <stop stop-color="#8e8e8e" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" x1="24" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="s" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.2454e-8 1.4981 -1.5848 -2.76e-8 29.391 -6.3556)" r="20">
-   <stop stop-color="#c7c7c7" offset="0"/>
-   <stop stop-color="#a6a6a6" offset=".26238"/>
-   <stop stop-color="#7b7b7b" offset=".70495"/>
-   <stop stop-color="#595959" offset="1"/>
-  </radialGradient>
-  <linearGradient id="m" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(.64103 0 0 .64103 .61539 1.6154)" x2="24" y2="3.899">
-   <stop stop-color="#505050" offset="0"/>
-   <stop stop-color="#8e8e8e" offset="1"/>
-  </linearGradient>
-  <radialGradient id="q" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="r" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="k" y2="39.999" gradientUnits="userSpaceOnUse" y1="47.028" x2="25.058" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.7 0 0 .33333 -.8 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect y="40" width="5" fill="url(#q)" x="38" height="7"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#r)"/>
-   <rect y="40" width="28" fill="url(#k)" x="10" height="7"/>
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g transform="matrix(.79998 0 0 .8 1.6 1.9554)" fill="#969696">
+  <path d="m6.9375 0.056c-0.2484 0-0.4375 0.18908-0.4375 0.4375v1.25c-0.5539 0.1422-1.0512 0.3719-1.5312 0.6563l-0.9063-0.9063c-0.17566-0.17566-0.44934-0.17566-0.625 0l-1.5 1.5c-0.17566 0.17566-0.17566 0.44934 0 0.625l0.9063 0.9063c-0.2844 0.48-0.5141 0.9773-0.6563 1.5312h-1.25c-0.24842 0-0.4375 0.1891-0.4375 0.4375v2.125c1e-8 0.24842 0.18908 0.4375 0.4375 0.4375h1.25c0.1422 0.5539 0.37188 1.0512 0.65625 1.5312l-0.9063 0.907c-0.17566 0.17566-0.17566 0.44934 0 0.625l1.5 1.5c0.17566 0.17566 0.44934 0.17566 0.625 0l0.9063-0.907c0.48 0.285 0.9773 0.514 1.5312 0.656v1.25c1e-7 0.24842 0.18908 0.4375 0.4375 0.4375h2.125c0.2484 0 0.4375-0.189 0.4375-0.438v-1.25c0.5539-0.1422 1.0512-0.37188 1.5312-0.65625l0.90625 0.90625c0.17566 0.17566 0.44934 0.17566 0.625 0l1.5-1.5c0.17566-0.17566 0.17566-0.44934 0-0.625l-0.906-0.906c0.285-0.48 0.514-0.9771 0.656-1.531h1.25c0.249 0 0.438-0.1891 0.438-0.4375v-2.125c0-0.2484-0.189-0.4375-0.438-0.4375h-1.25c-0.142-0.5539-0.371-1.0512-0.656-1.5312l0.906-0.9063c0.17566-0.17566 0.17566-0.44934 0-0.625l-1.5-1.5c-0.17566-0.17566-0.44934-0.17566-0.625 0l-0.906 0.9063c-0.48-0.2844-0.977-0.5141-1.531-0.6563v-1.25c0.0004-0.24872-0.1887-0.4378-0.4371-0.4378zm1.0625 4.1573c1.8451 0 3.3427 1.4975 3.3427 3.3427 0 1.8451-1.4975 3.3427-3.3427 3.3427-1.8451 0-3.3427-1.4979-3.3427-3.343s1.4976-3.3427 3.3427-3.3427z" display="block" fill="#969696"/>
  </g>
- <rect stroke-linejoin="round" style="color:#000000" rx="2" ry="2" height="25" width="25" stroke="url(#m)" stroke-linecap="round" y="4.5" x="3.5" fill="url(#s)"/>
- <rect opacity=".5" stroke-linejoin="round" rx="1" ry="1" height="23" width="23" stroke="url(#l)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/>
- <path opacity=".41" style="color:#000000" d="m15 10c-0.277 0-0.5 0.223-0.5 0.5v1.6875c-0.54864 0.14074-1.055 0.37601-1.5312 0.65625l-1.219-1.219c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.437 1.437c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.2188 1.2188c-0.28 0.476-0.516 0.982-0.656 1.531h-1.688c-0.277 0-0.5 0.223-0.5 0.5v2c0 0.277 0.223 0.5 0.5 0.5h1.6875c0.14074 0.54864 0.37601 1.055 0.65625 1.5312l-1.219 1.219c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.4375 1.4375c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.2188-1.2188c0.47623 0.28024 0.98261 0.51551 1.5312 0.65625v1.6875c0 0.277 0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5v-1.6875c0.54864-0.14074 1.055-0.37601 1.5312-0.65625l1.219 1.219c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.4375-1.4375c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.22-1.219c0.28-0.476 0.516-0.982 0.656-1.531h1.6875c0.277 0 0.5-0.223 0.5-0.5v-2c0-0.277-0.223-0.5-0.5-0.5h-1.6875c-0.14-0.549-0.376-1.055-0.656-1.531l1.219-1.219c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.437-1.437c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.2188 1.2188c-0.476-0.28-0.982-0.516-1.531-0.656v-1.688c0-0.277-0.223-0.5-0.5-0.5h-2zm1 5c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="#fff"/>
- <path style="color:#000000" d="m15 9c-0.277 0-0.5 0.223-0.5 0.5v1.6875c-0.54864 0.14074-1.055 0.37601-1.5312 0.65625l-1.219-1.219c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.437 1.437c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.2188 1.2188c-0.28 0.476-0.516 0.982-0.656 1.531h-1.688c-0.277 0-0.5 0.223-0.5 0.5v2c0 0.277 0.223 0.5 0.5 0.5h1.6875c0.14074 0.54864 0.37601 1.055 0.65625 1.5312l-1.219 1.219c-0.19587 0.19587-0.19587 0.49163 0 0.6875l1.4375 1.4375c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.2188-1.2188c0.47623 0.28024 0.98261 0.51551 1.5312 0.65625v1.6875c0 0.277 0.223 0.5 0.5 0.5h2c0.277 0 0.5-0.223 0.5-0.5v-1.6875c0.54864-0.14074 1.055-0.37601 1.5312-0.65625l1.219 1.219c0.19587 0.19587 0.49163 0.19587 0.6875 0l1.4375-1.4375c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.22-1.219c0.28-0.476 0.516-0.982 0.656-1.531h1.6875c0.277 0 0.5-0.223 0.5-0.5v-2c0-0.277-0.223-0.5-0.5-0.5h-1.6875c-0.14-0.549-0.376-1.055-0.656-1.531l1.219-1.219c0.19587-0.19587 0.19587-0.49163 0-0.6875l-1.437-1.437c-0.19587-0.19587-0.49163-0.19587-0.6875 0l-1.2188 1.2188c-0.476-0.28-0.982-0.516-1.531-0.656v-1.688c0-0.277-0.223-0.5-0.5-0.5h-2zm1 5c1.6569 0 3 1.3431 3 3s-1.3431 3-3 3-3-1.3431-3-3 1.3431-3 3-3z" fill="url(#n)"/>
- <path opacity=".1" stroke-linejoin="round" style="color:#000000" d="m15.062 9.5625c-0.02465 0.61514 0.0508 1.2431-0.0404 1.8499-0.22156 0.48267-0.86813 0.38946-1.2591 0.66131-0.35888 0.1777-0.83286 0.55716-1.2005 0.17633l-1.1562-1.1562-1.3125 1.3125c0.41328 0.43651 0.87815 0.8308 1.2579 1.2948 0.23668 0.48316-0.28717 0.88122-0.39325 1.3266-0.17191 0.37402-0.17866 1.0023-0.7161 1.0335-0.55991 0.0032-1.1199 0.000478-1.6798 0.0014v1.875c0.61514 0.02465 1.2431-0.0508 1.8499 0.0404 0.48267 0.22156 0.38946 0.86813 0.66131 1.2591 0.1777 0.35888 0.55716 0.83286 0.17633 1.2005l-1.1562 1.1562 1.3125 1.3125c0.43651-0.41328 0.8308-0.87815 1.2948-1.2579 0.48316-0.23668 0.88122 0.28717 1.3266 0.39325 0.37402 0.17191 1.0023 0.17866 1.0335 0.7161 0.0032 0.55991 0.000478 1.1199 0.0014 1.6798h1.875c0.02465-0.61514-0.0508-1.2431 0.0404-1.8499 0.22156-0.48267 0.86813-0.38946 1.2591-0.66131 0.35888-0.1777 0.83286-0.55716 1.2005-0.17633l1.1562 1.1562 1.3125-1.3125c-0.41328-0.43651-0.87815-0.8308-1.2579-1.2948-0.23668-0.48316 0.28717-0.88122 0.39325-1.3266 0.17191-0.37402 0.17866-1.0023 0.7161-1.0335 0.55991-0.0032 1.1199-0.000478 1.6798-0.0014v-1.875c-0.61514-0.02465-1.2431 0.0508-1.8499-0.0404-0.482-0.222-0.389-0.869-0.661-1.26-0.177-0.359-0.557-0.833-0.176-1.201l1.1562-1.1562-1.3125-1.3125c-0.43651 0.41328-0.8308 0.87815-1.2948 1.2579-0.48316 0.23668-0.88122-0.28717-1.3266-0.39325-0.37402-0.17191-1.0023-0.17866-1.0335-0.7161-0.0032-0.55991-0.000478-1.1199-0.0014-1.6798h-1.875z" stroke="url(#o)" fill="none"/>
- <path opacity=".1" stroke-linejoin="round" style="color:#000000" d="m16 20.566c1.9374 0.05315 3.6634-1.7201 3.5613-3.6545 0.004-1.9389-1.8147-3.6163-3.7447-3.4659-1.9392 0.04516-3.5671 1.9074-3.3688 3.832 0.10413 1.8114 1.739 3.3229 3.5521 3.2884z" stroke="url(#p)" fill="none"/>
 </svg>
diff --git a/core/img/filetypes/audio.png b/core/img/filetypes/audio.png
index 3c78bcfd17..4eb8ab78e3 100644
Binary files a/core/img/filetypes/audio.png and b/core/img/filetypes/audio.png differ
diff --git a/core/img/filetypes/audio.svg b/core/img/filetypes/audio.svg
index 1b37a1e6ea..ba5bec4173 100644
--- a/core/img/filetypes/audio.svg
+++ b/core/img/filetypes/audio.svg
@@ -1,47 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="h" x1="16.626" gradientUnits="userSpaceOnUse" y1="15.298" gradientTransform="matrix(.52104 0 0 .81327 3.4707 .35442)" x2="20.055" y2="24.628">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="24" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".063165"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(1.2454e-8 1.4981 -1.5848 -2.76e-8 29.391 -6.3556)" r="20">
-   <stop stop-color="#3e3e3e" offset="0"/>
-   <stop stop-color="#343434" offset=".26238"/>
-   <stop stop-color="#272727" offset=".70495"/>
-   <stop stop-color="#1d1d1d" offset="1"/>
-  </radialGradient>
-  <radialGradient id="j" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="k" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="g" y2="39.999" gradientUnits="userSpaceOnUse" y1="47.028" x2="25.058" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.7 0 0 .33333 -.8 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect y="40" width="5" fill="url(#j)" x="38" height="7"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#k)"/>
-   <rect y="40" width="28" fill="url(#g)" x="10" height="7"/>
-  </g>
- </g>
- <rect style="color:#000000" height="25" width="25" y="4.5" x="3.5" fill="url(#l)"/>
- <rect opacity=".7" style="color:#000000" height="25" width="25" stroke="#000" y="4.5" x="3.5" fill="none"/>
- <rect opacity=".5" height="23" width="23" stroke="url(#i)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/>
- <path opacity=".1" fill="url(#h)" d="m4 5 0.008 15c0.6904-0.015 23.468-5.529 23.992-5.795v-9.205z" fill-rule="evenodd"/>
- <path opacity=".1" style="color:#000000" d="m16.467 8.0001c-0.53931-0.077588-0.45336 0.42193-0.44484 0.7731-0.0059 4.1692 0.01172 8.3407-0.0088 12.508-0.145 0.32452-0.55212 0.0099-0.80112 0.07215-1.7342-0.05405-3.6017 1.1946-3.847 3.0302-0.25326 1.3789 1.032 2.5932 2.3216 2.6149 1.9178 0.05257 3.5779-1.8787 3.3343-3.8146 0.0065-3.3283-0.01298-6.6593 0.0097-9.9859 0.13139-0.31618 0.4856-0.01847 0.65097 0.09458 1.5212 0.9203 2.8505 2.4463 2.9447 4.3279 0.0815 1.0885-0.14664 2.173-0.46032 3.2072 1.3984-2.3007 1.3227-5.5038-0.40514-7.6054-1.3305-1.3884-2.5797-3.0451-2.8335-5.0311-0.04896-0.18667-0.30655-0.18423-0.46044-0.19158z" fill="#fff"/>
- <path opacity=".9" style="color:#000000" d="m16.467 7.0001c-0.53931-0.077588-0.45336 0.42193-0.44484 0.7731-0.0059 4.1692 0.01172 8.3407-0.0088 12.508-0.145 0.32452-0.55212 0.0099-0.80112 0.07215-1.7342-0.05405-3.6017 1.1946-3.847 3.0302-0.25326 1.3789 1.032 2.5932 2.3216 2.6149 1.9178 0.05257 3.5779-1.8787 3.3343-3.8146 0.0065-3.3283-0.01298-6.6593 0.0097-9.9859 0.13139-0.31618 0.4856-0.01847 0.65097 0.09458 1.5212 0.9203 2.8505 2.4463 2.9447 4.3279 0.0815 1.0885-0.14664 2.173-0.46032 3.2072 1.3984-2.3007 1.3227-5.5038-0.40514-7.6054-1.33-1.388-2.58-3.0443-2.833-5.0303-0.049-0.1866-0.307-0.1842-0.461-0.1916z"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m12.805 1.0011c-2.2 0.3545-5.1445 0.7194-7.3383 1.0937-0.581 0.2835-0.4503 1.0133-0.4761 1.5429v7.0895c-1.2243-0.23017-2.7173 0.78142-2.782 2.3831-0.1057 0.99721 0.77859 1.8652 1.7402 1.8885 1.7217 0.04179 2.8992-1.1005 2.9179-2.545-0.01876-2.4261 0.0056-4.8533 0-7.2795 0.26654-0.01974 4.3036-0.79006 4.6667-0.84134v5.452c-1.07-0.2561-2.4374 0.4472-2.7766 1.8832-0.14314 0.80489 0.1274 1.8152 0.94411 2.156 1.5943 0.73261 3.783-0.75137 3.694-2.493-0.02473-3.235 0.02025-6.4717 0-9.707-0.042-0.30422-0.24827-0.64474-0.59033-0.62281z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/database.png b/core/img/filetypes/database.png
deleted file mode 100644
index 49b2b86175..0000000000
Binary files a/core/img/filetypes/database.png and /dev/null differ
diff --git a/core/img/filetypes/database.svg b/core/img/filetypes/database.svg
deleted file mode 100644
index f3d4570015..0000000000
--- a/core/img/filetypes/database.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="k" x1="102.31" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-2.3925" gradientTransform="matrix(.45813 0 0 .43889 -31.62 14.933)" x2="102.31" y2="-24.582">
-   <stop stop-color="#a5a6a8" offset="0"/>
-   <stop stop-color="#e8e8e8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="109.96" gradientUnits="userSpaceOnUse" y1="-24.911" gradientTransform="matrix(.45813 0 0 .43889 -31.62 14.933)" x2="109.96" y2="-2.3758">
-   <stop stop-color="#b3b3b3" offset="0"/>
-   <stop stop-color="#dadada" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="103.95" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-7.6657" gradientTransform="matrix(.45783 0 0 .43229 -31.592 18.912)" x2="89.424" y2="-7.6657"/>
-  <linearGradient id="b">
-   <stop stop-color="#868688" offset="0"/>
-   <stop stop-color="#d9d9da" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="89.018" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="22.537" gradientTransform="translate(-78.157 -9.5461)" x2="89.018" y2="27.546"/>
-  <linearGradient id="a">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#4a4a4a" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="103.95" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-7.6657" gradientTransform="matrix(.45783 0 0 .43229 -31.592 24.912)" x2="89.424" y2="-7.6657"/>
-  <linearGradient id="f" x1="89.018" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="22.537" gradientTransform="translate(-78.157 -3.5461)" x2="89.018" y2="27.546"/>
-  <linearGradient id="e" x1="103.95" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="-7.6657" gradientTransform="matrix(.45783 0 0 .43229 -31.592 30.912)" x2="89.424" y2="-7.6657"/>
-  <linearGradient id="d" x1="89.018" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="22.537" gradientTransform="translate(-78.157 2.4539)" x2="89.018" y2="27.546"/>
-  <linearGradient id="l" x1="21.381" gradientUnits="userSpaceOnUse" y1="5.0525" gradientTransform="matrix(0.6 0 0 .60526 1.6 2.1711)" x2="21.381" y2="44.137">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".081258"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".92328"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="41.636" cx="23.335" gradientTransform="matrix(.57452 0 0 .22094 2.5938 17.801)" r="22.627">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
- </defs>
- <path opacity=".3" fill="url(#c)" d="m29 27c0.0011 2.7613-5.8195 5-13 5s-13.001-2.239-13-5c-0.0011-2.761 5.8195-5 13-5s13.001 2.2387 13 5z" fill-rule="evenodd"/>
- <g>
-  <path d="m27.49 25.068c0 2.4466-5.1487 4.4322-11.493 4.4322-6.344 0-11.493-1.9856-11.493-4.4322 0.11446-5.4694-1.4047-4.34 11.493-4.4322 13.193-0.0952 11.331-1.1267 11.493 4.4322z" stroke="url(#d)" fill="url(#e)"/>
-  <path d="m27.5 21c0 2.4853-5.1487 4.5-11.5 4.5s-11.5-2.0147-11.5-4.5 5.1487-4.5 11.5-4.5 11.5 2.0147 11.5 4.5z" stroke="#d8d8d8" fill="#868688"/>
-  <path d="m27.49 19.068c0 2.4466-5.1487 4.4322-11.493 4.4322-6.344 0-11.493-1.9856-11.493-4.4322 0.11446-5.4694-1.4047-4.34 11.493-4.4322 13.193-0.0952 11.331-1.1267 11.493 4.4322z" stroke="url(#f)" fill="url(#g)"/>
-  <path d="m27.5 15c0 2.4853-5.1487 4.5-11.5 4.5s-11.5-2.0147-11.5-4.5 5.1487-4.5 11.5-4.5 11.5 2.0147 11.5 4.5z" stroke="#d8d8d8" fill="#868688"/>
-  <path d="m27.49 13.068c0 2.446-5.149 4.432-11.493 4.432-6.3435 0-11.492-1.986-11.492-4.432 0.1144-5.4697-1.4047-4.3402 11.492-4.4325 13.193-0.0952 11.331-1.1267 11.493 4.4325z" stroke="url(#h)" fill="url(#i)"/>
-  <path d="m27.5 9c0 2.4853-5.1487 4.5-11.5 4.5s-11.5-2.015-11.5-4.5c0-2.4853 5.1487-4.5 11.5-4.5 6.351 0 11.5 2.0147 11.5 4.5z" stroke="url(#j)" fill="url(#k)"/>
- </g>
- <rect opacity=".5" style="color:#000000" rx="17.5" ry="4" height="23" width="21" stroke="url(#l)" y="5.5" x="5.5" fill="none"/>
-</svg>
diff --git a/core/img/filetypes/file.png b/core/img/filetypes/file.png
index 54a242d9d2..3bd7463cfc 100644
Binary files a/core/img/filetypes/file.png and b/core/img/filetypes/file.png differ
diff --git a/core/img/filetypes/file.svg b/core/img/filetypes/file.svg
index ab7db2d2e4..4efdbff4c7 100644
--- a/core/img/filetypes/file.svg
+++ b/core/img/filetypes/file.svg
@@ -1,32 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="j" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <radialGradient id="k" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="i" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#i)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#k)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#j)"/>
- <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#h)"/>
- <path stroke-linejoin="round" stroke="url(#g)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/>
- <path stroke-linejoin="round" opacity=".3" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3501 1.0014c-0.19751 0.0382-0.35351 0.23331-0.35001 0.43742v13.123c0.000005 0.22905 0.20523 0.43745 0.43079 0.43746l11.139 0.001c0.22556-0.000006 0.43078-0.20841 0.43079-0.43746v-10.143c-0.004-0.06684-0.022-0.13284-0.054-0.19135l-3.3121-3.1989c-0.043-0.0164-0.088-0.0256-0.134-0.0274l-8.0699-0.001c-0.02684-0.0026-0.05393-0.0026-0.08077 0z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/folder-drag-accept.png b/core/img/filetypes/folder-drag-accept.png
index fc1d83cfa6..80ab53b72b 100644
Binary files a/core/img/filetypes/folder-drag-accept.png and b/core/img/filetypes/folder-drag-accept.png differ
diff --git a/core/img/filetypes/folder-drag-accept.svg b/core/img/filetypes/folder-drag-accept.svg
index 6c72362905..025e58c517 100644
--- a/core/img/filetypes/folder-drag-accept.svg
+++ b/core/img/filetypes/folder-drag-accept.svg
@@ -1,60 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="n" x1="27.557" gradientUnits="userSpaceOnUse" y1="7.1627" gradientTransform="matrix(.89186 0 0 .86793 3.1207 7.5747)" x2="27.557" y2="21.387">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" x1="22.935" gradientUnits="userSpaceOnUse" y1="49.629" gradientTransform="matrix(.74675 0 0 .55199 -1.922 3.7198)" x2="22.809" y2="36.658">
-   <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/>
-   <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="m" x1="35.793" gradientUnits="userSpaceOnUse" y1="17.118" gradientTransform="matrix(.64444 0 0 .54135 .53343 3.4884)" x2="35.793" y2="43.761">
-   <stop stop-color="#b4cee1" offset="0"/>
-   <stop stop-color="#5d9fcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="q" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="r" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="p" x1="21.37" gradientUnits="userSpaceOnUse" y1="4.7324" gradientTransform="matrix(.54384 0 0 .61466 3.2688 5.0911)" x2="21.37" y2="34.143">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="o" x1="62.989" gradientUnits="userSpaceOnUse" y1="17.47" gradientTransform="matrix(.61905 0 0 .61905 -30.392 1.4286)" x2="62.989" y2="20.47">
-   <stop stop-color="#f9f9f9" offset="0"/>
-   <stop stop-color="#d8d8d8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" x1="-51.786" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.50703 0 0 .503 68.029 1.3298)" y1="53.514" y2="3.6337">
-   <stop stop-opacity=".32174" offset="0"/>
-   <stop stop-opacity=".27826" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="translate(0 -2.0003)">
-  <path opacity=".8" style="color:#000000" d="m4.0001 6.5001c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389v9.4561l27-1.36v-8.0961c0-0.4177-0.348-0.5488-0.781-0.5439h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349z" stroke="url(#k)" fill="none"/>
-  <path style="color:#000000" d="m4.0001 7v2h-1v6h26v-6h-15v-2z" fill="url(#o)"/>
-  <path style="color:#000000" stroke-linecap="round" d="m4.5001 7.5v2h-1v6h25v-6h-15v-2z" stroke="url(#p)" fill="none"/>
- </g>
- <g transform="translate(.00009 -3.0003)">
-  <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#j)"/>
-  <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#q)"/>
-  <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#r)"/>
- </g>
- <path style="color:#000000" d="m0.92644 12.421c-0.69105 0.067-0.32196 0.76007-0.37705 1.1498 0.0802 0.25184 1.5982 13.236 1.5982 13.682 0 0.38752 0.22667 0.32187 0.80101 0.32187h26.397c0.61872 0.012 0.48796 0.006 0.48796-0.32797 0.0452-0.17069 1.6394-14.298 1.6623-14.521 0-0.23495 0.0581-0.30493-0.30493-0.30493h-30.265z" fill="url(#m)"/>
- <path opacity=".4" d="m0.68182 12 30.636 0.00023c0.4137 0 0.68181 0.24597 0.68181 0.55177l-1.6732 14.915c0.01 0.38693-0.1364 0.54035-0.61707 0.53224l-27.256-0.01c-0.4137 0-0.83086-0.22836-0.83086-0.53417l-1.6237-14.903c0-0.3058 0.26812-0.55199 0.68182-0.55199z" fill="url(#l)"/>
- <path opacity=".5" style="color:#000000" d="m1.4999 13.412 1.6252 13.176h25.749l1.6247-13.176z" stroke="url(#n)" stroke-linecap="round" stroke-width=".90749" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m0.92644 12.421c-0.69105 0.067-0.32196 0.76007-0.37705 1.1498 0.0802 0.25184 1.5982 13.236 1.5982 13.682 0 0.38752 0.22667 0.32187 0.80101 0.32187h26.397c0.61872 0.012 0.48796 0.006 0.48796-0.32797 0.0452-0.17069 1.6394-14.298 1.6623-14.521 0-0.23495 0.0581-0.30493-0.30493-0.30493h-30.265z" stroke="#000" stroke-linecap="round" stroke-width=".91766" fill="none"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m1.4609 2c-0.2505 0-0.4609 0.2104-0.4609 0.4609v11.078c0 0.259 0.2021 0.461 0.4609 0.461h13.078c0.259 0 0.461-0.202 0.461-0.461v-9.0761c0-0.2504-0.21-0.4629-0.461-0.4629h-6.539l-2-2h-4.5391zm0.5391 3h12v8h-12v-8z" fill-rule="evenodd" fill="#55739a"/>
 </svg>
diff --git a/core/img/filetypes/folder-external.png b/core/img/filetypes/folder-external.png
index ede1a0d17f..5262d72e62 100644
Binary files a/core/img/filetypes/folder-external.png and b/core/img/filetypes/folder-external.png differ
diff --git a/core/img/filetypes/folder-external.svg b/core/img/filetypes/folder-external.svg
index 2b96baa90c..d5d4ef73ed 100644
--- a/core/img/filetypes/folder-external.svg
+++ b/core/img/filetypes/folder-external.svg
@@ -1,54 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="m" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 3.4122)" y1="7.1627" x1="27.557">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 -1.1074)" y1="17.118" x1="35.793">
-   <stop stop-color="#b4cee1" offset="0"/>
-   <stop stop-color="#5d9fcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="n" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="o" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="j" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 3.0908)" y1="4.7324" x1="21.37">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 -.57170)" y1="13" x1="62.989">
-   <stop stop-color="#f9f9f9" offset="0"/>
-   <stop stop-color="#d8d8d8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="d" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 .503 68.029 -.67050)" x2="-51.786" x1="-51.786">
-   <stop stop-opacity=".32174" offset="0"/>
-   <stop stop-opacity=".27826" offset="1"/>
-  </linearGradient>
- </defs>
- <path opacity=".8" style="color:#000000" d="m4.0002 4.4998c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0964c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#d)" fill="none"/>
- <path style="color:#000000" d="m4.0002 4.9997v2h-1v4.0003h26v-4.0003h-15v-2h-10z" fill="url(#i)"/>
- <path style="color:#000000" stroke-linecap="round" d="m4.5002 5.4997v2h-1v4.0003h25v-4.0003h-15v-2h-9z" stroke="url(#j)" fill="none"/>
- <g transform="translate(.00017936 -3.0003)">
-  <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#k)"/>
-  <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#n)"/>
-  <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#o)"/>
- </g>
- <path style="color:#000000" d="m1.927 9.4997c-0.691 0.0796-0.322 0.9023-0.377 1.3653 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#l)"/>
- <path opacity=".5" style="color:#000000" d="m2.5002 10.5 0.62498 16h25.749l0.62498-16z" stroke="url(#m)" stroke-linecap="round" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 9.4997c-0.691 0.0796-0.322 0.9023-0.377 1.3653 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/>
- <path opacity=".7" d="m16 13 2 2-3 3 2 2 3-3 2 2v-6h-6zm-4 1c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h8c0.554 0 1-0.446 1-1v-3l-1-1v4h-8v-8h4l-1-1h-3z"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m1.4609 2c-0.2505 0-0.4609 0.2104-0.4609 0.4609v11.078c0 0.259 0.2021 0.461 0.4609 0.461h13.078c0.259 0 0.461-0.202 0.461-0.461v-9.0761c0-0.2504-0.21-0.4629-0.461-0.4629h-6.539l-2-2h-4.5391zm6.5157 3.793h3.5704v3.3847l-1.192-1.1269-1.7847 1.6914-1.1894-1.1289 1.7851-1.6914-1.1894-1.1289zm-2.3809 0.5644h1.7852l0.5957 0.5645h-2.3809v4.5141h4.7593v-2.2583l0.596 0.5645v1.6938c0 0.312-0.266 0.564-0.596 0.564h-4.7593c-0.3297 0-0.5957-0.252-0.5957-0.564v-4.5141c0-0.3126 0.266-0.5645 0.5957-0.5645z" fill-rule="evenodd" fill="#55739a"/>
 </svg>
diff --git a/core/img/filetypes/folder-public.png b/core/img/filetypes/folder-public.png
index c8e5e0d3d4..17c3ee2a8d 100644
Binary files a/core/img/filetypes/folder-public.png and b/core/img/filetypes/folder-public.png differ
diff --git a/core/img/filetypes/folder-public.svg b/core/img/filetypes/folder-public.svg
index 6bfae917a8..bd7039750d 100644
--- a/core/img/filetypes/folder-public.svg
+++ b/core/img/filetypes/folder-public.svg
@@ -1,57 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="c" x1="27.557" gradientUnits="userSpaceOnUse" y1="7.1627" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 3.4122)" x2="27.557" y2="21.387">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="d" x1="35.793" gradientUnits="userSpaceOnUse" y1="17.118" gradientTransform="matrix(.64444 0 0 .64286 .53352 -1.1074)" x2="35.793" y2="43.761">
-   <stop stop-color="#b4cee1" offset="0"/>
-   <stop stop-color="#5d9fcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="f" x1="21.37" gradientUnits="userSpaceOnUse" y1="4.7324" gradientTransform="matrix(.54384 0 0 .61466 3.2689 3.0908)" x2="21.37" y2="34.143">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="62.989" gradientUnits="userSpaceOnUse" y1="13" gradientTransform="matrix(.61905 0 0 .61905 -30.392 -.57170)" x2="62.989" y2="16">
-   <stop stop-color="#f9f9f9" offset="0"/>
-   <stop stop-color="#d8d8d8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="-51.786" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.50703 0 0 .503 68.029 -.67050)" y1="53.514" y2="3.6337">
-   <stop stop-opacity=".32174" offset="0"/>
-   <stop stop-opacity=".27826" offset="1"/>
-  </linearGradient>
- </defs>
- <path opacity=".8" style="color:#000000" d="m4.0002 4.4998c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0964c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8023z" stroke="url(#h)" fill="none"/>
- <path style="color:#000000" d="m4.0002 4.9997v2h-1v4.0003h26v-4.0003h-15v-2h-10z" fill="url(#g)"/>
- <path style="color:#000000" stroke-linecap="round" d="m4.5002 5.4997v2h-1v4.0003h25v-4.0003h-15v-2h-9z" stroke="url(#f)" fill="none"/>
- <g transform="translate(.00017936 -3.0003)">
-  <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#e)"/>
-  <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/>
-  <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#a)"/>
- </g>
- <path style="color:#000000" d="m1.927 9.4997c-0.691 0.0796-0.322 0.9023-0.377 1.3653 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" fill="url(#d)"/>
- <path opacity=".5" style="color:#000000" d="m2.5002 10.5 0.62498 16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 9.4997c-0.691 0.0796-0.322 0.9023-0.377 1.3653 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.265z" stroke="#000" stroke-linecap="round" fill="none"/>
- <g opacity=".7" transform="matrix(.67042 -.67042 .67042 .67042 8.6253 104.14)">
-  <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m69.5-61.5c-1.9217 0-3.5 1.5783-3.5 3.5 0 0.17425 0.0062 0.33232 0.03125 0.5h2.0625c-0.053-0.156-0.094-0.323-0.094-0.5 0-0.8483 0.6517-1.5 1.5-1.5h5c0.8483 0 1.5 0.6517 1.5 1.5s-0.6517 1.5-1.5 1.5h-1.6875c-0.28733 0.79501-0.78612 1.4793-1.4375 2h3.125c1.9217 0 3.5-1.5783 3.5-3.5s-1.5783-3.5-3.5-3.5h-5z"/>
-  <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m68.5-54.5c1.9217 0 3.5-1.5783 3.5-3.5 0-0.17425-0.0062-0.33232-0.03125-0.5h-2.0625c0.053 0.156 0.094 0.323 0.094 0.5 0 0.8483-0.6517 1.5-1.5 1.5h-5c-0.8483 0-1.5-0.6517-1.5-1.5s0.6517-1.5 1.5-1.5h1.6875c0.28733-0.79501 0.78612-1.4793 1.4375-2h-3.125c-1.9217 0-3.5 1.5783-3.5 3.5s1.5783 3.5 3.5 3.5h5z"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m1.4609 2c-0.2505 0-0.4609 0.2104-0.4609 0.4609v11.078c0 0.259 0.2021 0.461 0.4609 0.461h13.078c0.259 0 0.461-0.202 0.461-0.461v-9.0761c0-0.2504-0.21-0.4629-0.461-0.4629h-6.539l-2-2h-4.5391zm8.3829 3.5c0.4252 0 0.8512 0.1603 1.1742 0.4824 0.644 0.6442 0.644 1.7035 0 2.3477l-1.0492 1.0469c0.0442-0.3929-0.0174-0.7896-0.1876-1.1524l0.5648-0.5644c0.284-0.2844 0.284-0.7215 0-1.0059-0.285-0.2844-0.7218-0.2844-1.0062 0l-1.6757 1.6758c-0.2844 0.2843-0.2844 0.7215 0 1.0058 0.0593 0.0594 0.1291 0.1003 0.1992 0.1348l-0.6914 0.6913c-0.0646-0.048-0.1193-0.098-0.1778-0.156-0.6441-0.6443-0.6441-1.7017 0-2.3458l1.6758-1.6778c0.3221-0.3221 0.7483-0.4824 1.1739-0.4824zm-1.0157 2.3379c0.0646 0.0478 0.1193 0.0978 0.1778 0.1562 0.6438 0.6438 0.6431 1.7015 0 2.3459v0.002l-1.6758 1.676c-0.6442 0.644-1.7035 0.644-2.3477 0-0.6442-0.645-0.6442-1.704 0-2.3481l1.0488-1.0469c-0.0438 0.3929 0.0174 0.7896 0.1876 1.1524l-0.5645 0.5646c-0.2844 0.284-0.2844 0.721 0 1.006 0.2844 0.284 0.7215 0.284 1.0059 0l1.6757-1.6761c0.2844-0.2843 0.2844-0.7215 0-1.0058-0.0593-0.0594-0.1291-0.1003-0.1992-0.1348l0.6914-0.6914z" fill-rule="evenodd" fill="#55739a"/>
 </svg>
diff --git a/core/img/filetypes/folder-shared.png b/core/img/filetypes/folder-shared.png
index f1f2fedccf..be5e59cbf2 100644
Binary files a/core/img/filetypes/folder-shared.png and b/core/img/filetypes/folder-shared.png differ
diff --git a/core/img/filetypes/folder-shared.svg b/core/img/filetypes/folder-shared.svg
index b73e1fc3db..5e0d4fde7a 100644
--- a/core/img/filetypes/folder-shared.svg
+++ b/core/img/filetypes/folder-shared.svg
@@ -1,61 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="c" x1="27.557" gradientUnits="userSpaceOnUse" y1="7.1627" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 3.4122)" x2="27.557" y2="21.387">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="d" x1="22.935" gradientUnits="userSpaceOnUse" y1="49.629" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 -.83270)" x2="22.809" y2="36.658">
-   <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/>
-   <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" x1="35.793" gradientUnits="userSpaceOnUse" y1="17.118" gradientTransform="matrix(.64444 0 0 .64286 .53352 -1.1074)" x2="35.793" y2="43.761">
-   <stop stop-color="#b4cee1" offset="0"/>
-   <stop stop-color="#5d9fcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="g" x1="21.37" gradientUnits="userSpaceOnUse" y1="4.7324" gradientTransform="matrix(.54384 0 0 .61466 3.2689 3.0908)" x2="21.37" y2="34.143">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="62.989" gradientUnits="userSpaceOnUse" y1="13" gradientTransform="matrix(.61905 0 0 .61905 -30.392 -.57170)" x2="62.989" y2="16">
-   <stop stop-color="#f9f9f9" offset="0"/>
-   <stop stop-color="#d8d8d8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="-51.786" gradientUnits="userSpaceOnUse" x2="-51.786" gradientTransform="matrix(.50703 0 0 .503 68.029 -.67050)" y1="53.514" y2="3.6337">
-   <stop stop-opacity=".32174" offset="0"/>
-   <stop stop-opacity=".27826" offset="1"/>
-  </linearGradient>
- </defs>
- <path opacity=".8" style="color:#000000" d="m4.0002 4.4998c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0964c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8022z" stroke="url(#i)" fill="none"/>
- <path style="color:#000000" d="m4.0002 4.9997v2h-1v4.0003h26v-4.0003h-15v-2h-9.9998z" fill="url(#h)"/>
- <path style="color:#000000" stroke-linecap="round" d="m4.5002 5.4997v2h-1v4.0003h25v-4.0003h-15v-2h-8.9998z" stroke="url(#g)" fill="none"/>
- <g transform="translate(.00017553 -3.0003)">
-  <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/>
-  <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/>
-  <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#a)"/>
- </g>
- <path style="color:#000000" d="m1.927 9.4997c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.266z" fill="url(#e)"/>
- <path opacity=".4" d="m1.682 8.9997 28.636 0.00027c0.4137 0 0.68181 0.29209 0.68181 0.65523l-0.6735 17.712c0.01 0.45948-0.1364 0.64166-0.61707 0.63203l-27.256-0.011c-0.4137 0-0.83086-0.27118-0.83086-0.63432l-0.62216-17.699c0-0.36314 0.26812-0.65549 0.68182-0.65549z" fill="url(#d)"/>
- <path opacity=".5" style="color:#000000" d="m2.5002 10.5 0.62498 16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 9.4997c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.266z" stroke="#000" stroke-linecap="round" fill="none"/>
- <g opacity=".7" transform="translate(6.9998 -1026.4)">
-  <path d="m12.228 1037.4c-1.3565 0-2.4592 1.0977-2.4592 2.4542 0 0.075 0.0084 0.1504 0.0149 0.2236l-4.7346 2.4145c-0.4291-0.3667-0.98611-0.5863-1.5947-0.5863-1.3565 0-2.4542 1.0977-2.4542 2.4543 0 1.3565 1.0977 2.4542 2.4542 2.4542 0.54607 0 1.0528-0.1755 1.4606-0.477l4.8637 2.4741c-0.0024 0.044-0.0099 0.089-0.0099 0.1342 0 1.3565 1.1027 2.4542 2.4592 2.4542s2.4542-1.0977 2.4542-2.4542-1.0977-2.4592-2.4542-2.4592c-0.63653 0-1.218 0.2437-1.6544 0.6409l-4.6953-2.4c0.01892-0.1228 0.03478-0.2494 0.03478-0.3775 0-0.072-0.0089-0.1437-0.0149-0.2137l4.7395-2.4145c0.42802 0.3627 0.98488 0.5813 1.5898 0.5813 1.3565 0 2.4542-1.1027 2.4542-2.4592s-1.0977-2.4542-2.4542-2.4542z"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m1.4609 2c-0.2505 0-0.4609 0.2104-0.4609 0.4609v11.078c0 0.259 0.2021 0.461 0.4609 0.461h13.078c0.259 0 0.461-0.202 0.461-0.461v-9.0761c0-0.2504-0.21-0.4629-0.461-0.4629h-6.539l-2-2h-4.5391zm8.6521 3.4941c0.679 0 1.227 0.5503 1.227 1.2286 0 0.6782-0.548 1.2285-1.227 1.2285-0.3022 0-0.5806-0.1097-0.7946-0.291l-2.3692 1.207c0.003 0.035 0.0078 0.0714 0.0078 0.1074 0 0.0641-0.0081 0.1281-0.0175 0.1895l2.3476 1.1989c0.2182-0.198 0.5079-0.32 0.8259-0.32 0.679 0 1.229 0.552 1.229 1.23 0 0.679-0.55 1.227-1.229 1.227-0.678 0-1.2282-0.548-1.2282-1.227 0-0.022 0.0027-0.046 0.0039-0.068l-2.4317-1.2362c-0.2039 0.1512-0.4574 0.2382-0.7304 0.2382-0.6783 0-1.2266-0.5483-1.2266-1.2265 0-0.6783 0.5483-1.2266 1.2266-1.2266 0.3043 0 0.5842 0.1096 0.7988 0.293l2.3672-1.2071c-0.0033-0.0366-0.0078-0.0757-0.0078-0.1132 0-0.6783 0.5502-1.2266 1.2282-1.2266v-0.0059z" fill-rule="evenodd" fill="#55739a"/>
 </svg>
diff --git a/core/img/filetypes/folder-starred.png b/core/img/filetypes/folder-starred.png
new file mode 100644
index 0000000000..b083a9d2d1
Binary files /dev/null and b/core/img/filetypes/folder-starred.png differ
diff --git a/core/img/filetypes/folder-starred.svg b/core/img/filetypes/folder-starred.svg
new file mode 100644
index 0000000000..de5ef5723d
--- /dev/null
+++ b/core/img/filetypes/folder-starred.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m1.4609 2c-0.2505 0-0.4609 0.2104-0.4609 0.4609v11.078c0 0.259 0.2021 0.461 0.4609 0.461h13.078c0.259 0 0.461-0.202 0.461-0.461v-9.0761c0-0.2504-0.21-0.4629-0.461-0.4629h-6.539l-2-2h-4.5391zm6.545 2.8867l1.0722 2.6836 2.9219 0.2305-2.2227 1.8476 0.6857 2.8516-2.4454-1.543-2.5 1.533 0.7109-2.8025-2.2285-1.9043 2.8848-0.1875 1.1211-2.709z" fill-rule="evenodd" fill="#55739a"/>
+</svg>
diff --git a/core/img/filetypes/folder.png b/core/img/filetypes/folder.png
index d6b4d8cab9..1dbb115410 100644
Binary files a/core/img/filetypes/folder.png and b/core/img/filetypes/folder.png differ
diff --git a/core/img/filetypes/folder.svg b/core/img/filetypes/folder.svg
index c0a5af9ce1..e9d96d4049 100644
--- a/core/img/filetypes/folder.svg
+++ b/core/img/filetypes/folder.svg
@@ -1,58 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="c" y2="21.387" gradientUnits="userSpaceOnUse" x2="27.557" gradientTransform="matrix(.89186 0 0 1.0539 3.1208 3.4122)" y1="7.1627" x1="27.557">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".0097359"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="d" y2="36.658" gradientUnits="userSpaceOnUse" x2="22.809" gradientTransform="matrix(.74675 0 0 .65549 -1.9219 -.83270)" y1="49.629" x1="22.935">
-   <stop stop-color="#0a0a0a" stop-opacity=".498" offset="0"/>
-   <stop stop-color="#0a0a0a" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" y2="43.761" gradientUnits="userSpaceOnUse" x2="35.793" gradientTransform="matrix(.64444 0 0 .64286 .53352 -1.1074)" y1="17.118" x1="35.793">
-   <stop stop-color="#b4cee1" offset="0"/>
-   <stop stop-color="#5d9fcd" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" y2="609.51" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)" y1="366.65" x1="302.86">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)" r="117.14">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="g" y2="34.143" gradientUnits="userSpaceOnUse" x2="21.37" gradientTransform="matrix(.54384 0 0 .61466 3.2689 3.0908)" y1="4.7324" x1="21.37">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".11063"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".99001"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" y2="16" gradientUnits="userSpaceOnUse" x2="62.989" gradientTransform="matrix(.61905 0 0 .61905 -30.392 -.57170)" y1="13" x1="62.989">
-   <stop stop-color="#f9f9f9" offset="0"/>
-   <stop stop-color="#d8d8d8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" y2="3.6337" gradientUnits="userSpaceOnUse" y1="53.514" gradientTransform="matrix(.50703 0 0 .503 68.029 -.67050)" x2="-51.786" x1="-51.786">
-   <stop stop-opacity=".32174" offset="0"/>
-   <stop stop-opacity=".27826" offset="1"/>
-  </linearGradient>
- </defs>
- <path opacity=".8" style="color:#000000" d="m4.0002 4.4998c-0.43342 0.005-0.5 0.21723-0.5 0.6349v1.365c-1.2457 0-1-0.002-1 0.54389 0.0216 6.5331 0 6.9014 0 7.4561 0.90135 0 27-2.349 27-3.36v-4.0964c0-0.41767-0.34799-0.54876-0.78141-0.54389h-14.219v-1.365c0-0.41767-0.26424-0.63977-0.69767-0.6349h-9.8022z" stroke="url(#i)" fill="none"/>
- <path style="color:#000000" d="m4.0002 4.9997v2h-1v4.0003h26v-4.0003h-15v-2h-9.9998z" fill="url(#h)"/>
- <path style="color:#000000" stroke-linecap="round" d="m4.5002 5.4997v2h-1v4.0003h25v-4.0003h-15v-2h-8.9998z" stroke="url(#g)" fill="none"/>
- <g transform="translate(.00017553 -3.0003)">
-  <rect opacity=".3" height="3.8653" width="24.695" y="28.135" x="3.6472" fill="url(#f)"/>
-  <path opacity=".3" d="m28.342 28.135v3.865c1.0215 0.0073 2.4695-0.86596 2.4695-1.9328s-1.1399-1.9323-2.4695-1.9323z" fill="url(#b)"/>
-  <path opacity=".3" d="m3.6472 28.135v3.865c-1.0215 0.0073-2.4695-0.86596-2.4695-1.9328s1.1399-1.9323 2.4695-1.9323z" fill="url(#a)"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.05 -864.43)" fill="#55739a">
+  <path d="m200.2 999.72c-0.28913 0-0.53125 0.2421-0.53125 0.53117v12.784c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53124-0.2327 0.53124-0.5312l0.0004-10.474c0-0.2889-0.24211-0.5338-0.53124-0.5338l-7.5457 0.0005-2.3076-2.3078z" fill-rule="evenodd" fill="#55739a"/>
  </g>
- <path style="color:#000000" d="m1.927 9.4997c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.266z" fill="url(#e)"/>
- <path opacity=".4" d="m1.682 8.9997 28.636 0.00027c0.4137 0 0.68181 0.29209 0.68181 0.65523l-0.6735 17.712c0.01 0.45948-0.1364 0.64166-0.61707 0.63203l-27.256-0.011c-0.4137 0-0.83086-0.27118-0.83086-0.63432l-0.62216-17.699c0-0.36314 0.26812-0.65549 0.68182-0.65549z" fill="url(#d)"/>
- <path opacity=".5" style="color:#000000" d="m2.5002 10.5 0.62498 16h25.749l0.62498-16z" stroke="url(#c)" stroke-linecap="round" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m1.927 9.4997c-0.69105 0.0796-0.32196 0.90258-0.37705 1.3654 0.0802 0.29906 0.59771 15.718 0.59771 16.247 0 0.46018 0.22667 0.38222 0.80101 0.38222h26.397c0.61872 0.0143 0.48796 0.007 0.48796-0.38947 0.0452-0.20269 0.63993-16.978 0.66282-17.243 0-0.279 0.0581-0.3621-0.30493-0.3621h-28.266z" stroke="#000" stroke-linecap="round" fill="none"/>
 </svg>
diff --git a/core/img/filetypes/font.png b/core/img/filetypes/font.png
deleted file mode 100644
index 535e03dfa7..0000000000
Binary files a/core/img/filetypes/font.png and /dev/null differ
diff --git a/core/img/filetypes/font.svg b/core/img/filetypes/font.svg
deleted file mode 100644
index 13c0596006..0000000000
--- a/core/img/filetypes/font.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="22.056" gradientUnits="userSpaceOnUse" y1="15.834" gradientTransform="matrix(.85825 0 0 .86435 .35576 -11.07)" x2="22.056" y2="45.497">
-   <stop stop-color="#575757" offset="0"/>
-   <stop stop-color="#333" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.25444 0 0 .18504 6.1544 20.059)" r="14.098"/>
-  <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.83270 0 0 .18284 17.869 20.171)" r="14.098"/>
-  <radialGradient id="n" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.69391 0 0 .18504 25.492 20.059)" r="14.098"/>
-  <linearGradient id="j" x1="143.92" gradientUnits="userSpaceOnUse" y1="75.221" gradientTransform="matrix(.97891 0 0 .95244 -119.66 -63.433)" x2="143.92" y2="103.13">
-   <stop stop-color="#f8b17e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".3121"/>
-   <stop stop-color="#c6262e" offset=".57054"/>
-   <stop stop-color="#690b54" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" x1="153.41" gradientUnits="userSpaceOnUse" y1="98.785" gradientTransform="matrix(.97891 0 0 .95244 -119.66 -63.433)" x2="153.41" y2="75.221">
-   <stop stop-color="#791235" offset="0"/>
-   <stop stop-color="#dd3b27" offset="1"/>
-  </linearGradient>
-  <radialGradient id="o" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="36.686" cx="-6.1603" gradientTransform="matrix(.25444 0 0 .18504 22.459 20.059)" r="14.098"/>
- </defs>
- <g fill-rule="evenodd">
-  <path opacity=".2" d="m24.478 26.848a3.587 2.6087 0 1 1 -7.1739 0 3.587 2.6087 0 1 1 7.1739 0z" fill="url(#o)"/>
-  <path stroke="url(#k)" d="m29.106 9.9132c-0.478-1.0813-1.642-0.968-2.441-1.1397-2.646-0.3044-5.287 0.181-7.504 1.6705-2.1399 1.4497-4.0763 3.4112-5.4365 5.9425-1.1823 2.2548-1.7132 5.267-0.96727 8.1364 0.58709 1.9316 2.3544 3.1247 3.845 2.803 2.2818-0.38055 3.9079-2.4984 5.2493-4.5646 0.60658-0.85208 0.97918-1.9805 1.6952-2.6966-0.1019 1.8363-0.14753 3.7435 0.26981 5.6082 0.2372 1.0995 1.1049 1.9662 1.9843 1.9261 0.89467-0.10266 1.5757-0.87918 2.3174-1.386 0.66706-0.59088 1.4312-1.0989 1.9035-1.9532-0.08137-1.4151-1.3465-0.52654-1.7881-0.04084-0.61732 0.97151-1.8927 0.19955-1.6199-1.1225 0.14283-3.0198 0.84698-5.8557 1.4425-8.7028 0.3348-1.5009 0.68722-2.9931 1.0492-4.4802h-0.000001zm-3.696 1.8848c-1.1333 3.5797-2.3575 7.223-4.4519 9.9984-0.98815 1.2662-2.437 2.4144-4.0344 1.8053-1.1039-0.48951-1.3597-2.0989-1.3836-3.3097-0.14247-3.5752 1.5838-6.5362 3.7419-8.3224 1.5043-1.1975 3.4487-1.7396 5.3479-1.1547 0.35854 0.1335 0.74746 0.47906 0.78012 0.983v-0.000001z" fill="url(#j)"/>
-  <path opacity=".2" d="m31 26.848a9.7826 2.6087 0 1 1 -19.565 0 9.7826 2.6087 0 1 1 19.565 0z" fill="url(#n)"/>
-  <path opacity=".05" d="m24.478 26.879a11.739 2.5777 0 1 1 -23.478 0 11.739 2.5777 0 1 1 23.478 0z" fill="url(#m)"/>
-  <path opacity=".2" d="m8.1739 26.848a3.587 2.6087 0 1 1 -7.1739 0 3.587 2.6087 0 1 1 7.1739 0z" fill="url(#l)"/>
- </g>
- <path stroke="#333" stroke-width="1px" d="m19.663 27.5c-0.79147-2.2568-1.583-4.5913-2.3744-6.8481h-9.7253c-0.8117 2.284-1.6229 4.564-2.4341 6.848h-3.1514c3.0005-8.2609 6.001-15.739 9.0016-24h2.8497c3.0061 8.2609 6.0122 15.739 9.0183 24h-3.1849zm-3.337-10.109-3.913-10.391-3.913 10.391z" fill="url(#i)"/>
-</svg>
diff --git a/core/img/filetypes/image-vector.png b/core/img/filetypes/image-vector.png
deleted file mode 100644
index a847f78fcd..0000000000
Binary files a/core/img/filetypes/image-vector.png and /dev/null differ
diff --git a/core/img/filetypes/image-vector.svg b/core/img/filetypes/image-vector.svg
deleted file mode 100644
index 1f0a54a21c..0000000000
--- a/core/img/filetypes/image-vector.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="i" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="n" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="o" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="l" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="m" x1="28.534" gradientUnits="userSpaceOnUse" y1="24.24" gradientTransform="matrix(.65943 0 0 .64652 -27.821 1.2237)" x2="16.887" y2="13.664">
-   <stop stop-color="#fda852" offset="0"/>
-   <stop stop-color="#fff" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#l)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#o)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#n)"/>
- <path stroke-linejoin="round" stroke="url(#k)" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#j)"/>
- <path stroke-linejoin="round" stroke="url(#i)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/>
- <g transform="translate(27.788 -2.3184)">
-  <path stroke="#ea541a" stroke-width="1px" fill="url(#m)" d="m-17.037 24.229c2.7541 1.8316 8.7672-0.61882 3.7681-7.1764-4.9538-6.4982 4.9219-10.76 7.8525-3.2453" fill-rule="evenodd"/>
-  <rect y="22.818" width="2" fill="#ea541a" x="-18.788" height="2"/>
-  <rect y="12.818" width="2" fill="#ea541a" x="-6.788" height="2"/>
-  <path stroke="#ea541a" stroke-width="1px" d="m-17.699 11.147 9.5001 12.316" fill="none"/>
-  <path stroke="#ea541a" d="m-16.288 11.318c0.000372 0.55218-0.44745 1-1 1s-1.0004-0.44782-1-1c-0.000372-0.55218 0.44745-1 1-1s1.0004 0.44782 1 1z" fill="#e6e6e6"/>
-  <path stroke="#ea541a" d="m-7.288 23.318c0.000373 0.55218-0.44745 1-1 1s-1.0004-0.44782-1-1c-0.000372-0.55218 0.44745-1 1-1s1.0004 0.44782 1 1z" fill="#e6e6e6"/>
-  <rect y="15.818" width="2" fill="#ea541a" x="-14.788" height="2"/>
- </g>
-</svg>
diff --git a/core/img/filetypes/image.png b/core/img/filetypes/image.png
index 305c3d4db2..0feaecf283 100644
Binary files a/core/img/filetypes/image.png and b/core/img/filetypes/image.png differ
diff --git a/core/img/filetypes/image.svg b/core/img/filetypes/image.svg
index 0159eed648..3aaa34cf90 100644
--- a/core/img/filetypes/image.svg
+++ b/core/img/filetypes/image.svg
@@ -1,39 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" y2="43" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" x1="24">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-opacity=".23529" stop-color="#fff" offset=".036262"/>
-   <stop stop-opacity=".15686" stop-color="#fff" offset=".95056"/>
-   <stop stop-opacity=".39216" stop-color="#fff" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" y2="47.013" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" x1="25.132">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="d" y2="609.51" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" x1="302.86">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#d)"/>
-  <path opacity=".15" fill="url(#b)" d="m4.95 29v1.9999c-0.8066 0.004-1.95-0.448-1.95-1s0.9001-1 1.95-1z"/>
-  <path opacity=".15" fill="url(#c)" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z"/>
-  <path fill="url(#e)" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z"/>
-  <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#f)" stroke-linecap="round" fill="none"/>
-  <path opacity=".3" stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
- </g>
- <g>
-  <path opacity="0.898" d="m7.7886 21.255h16.423v-15.51h-16.423m3.628 2.8735c1.0944 0 1.981 0.8261 1.981 1.8451s-0.88656 1.8458-1.981 1.8458c-1.0938 0-1.9796-0.8261-1.9796-1.8458 0-1.019 0.88588-1.8451 1.9796-1.8451zm-2.6108 9.4533 2.9348-2.2011 1.4939 1.0904 5.9206-4.3819 2.2011 1.6359 1.4932-1.0897v4.9464z" fill-rule="evenodd" clip-rule="evenodd" fill="#5b2d8d"/>
-  <path fill="#fff" d="m10.658 12.066c-1.8593-0.82639-1.2884-3.3318 0.75961-3.3335 1.9297-0.00157 2.6205 2.394 0.93791 3.2524-0.61512 0.31381-1.1197 0.33792-1.6975 0.08111z"/>
-  <path fill="#fff" d="m10.392 16.949 1.3399-1.004 0.73508 0.52638c0.4043 0.28951 0.80332 0.48661 0.88673 0.43799 0.0834-0.04861 1.4203-1.0288 2.9709-2.1782l2.8192-2.0899 0.43502 0.32295c0.23926 0.17762 0.7424 0.5447 1.1181 0.81574l0.68306 0.49279 0.70677-0.53895 0.70677-0.53895v2.3791 2.3791h-6.8707-6.8707l1.3399-1.004z"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m1.3438 2c-0.19748 0.03825-0.3473 0.2334-0.34375 0.4375v11.125c0 0.23 0.212 0.438 0.4375 0.438h13.125c0.22555-0.000006 0.43749-0.20846 0.4375-0.4375v-10.953c-0.0005-0.33655-0.2645-0.61145-0.5155-0.6095zm0.65619 0.99994 12 0.0000068v5.0001l-1-1-3 4-3-3-4 4h-1zm2.5001 1c-0.82845 0-1.5 0.67155-1.5 1.5s0.67155 1.5 1.5 1.5 1.5-0.67155 1.5-1.5-0.67155-1.5-1.5-1.5z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/package-x-generic.png b/core/img/filetypes/package-x-generic.png
index 4f5c6583bf..287a1f1886 100644
Binary files a/core/img/filetypes/package-x-generic.png and b/core/img/filetypes/package-x-generic.png differ
diff --git a/core/img/filetypes/package-x-generic.svg b/core/img/filetypes/package-x-generic.svg
index e00438421a..d183f3bbe0 100644
--- a/core/img/filetypes/package-x-generic.svg
+++ b/core/img/filetypes/package-x-generic.svg
@@ -1,53 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="i" x1="44.995" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="17.5" gradientTransform="matrix(.70749 0 0 .69403 -.97980 -1.6455)" x2="3.0052" y2="17.5">
-   <stop stop-color="#FFF" stop-opacity="0" offset="0"/>
-   <stop stop-color="#FFF" offset=".245"/>
-   <stop stop-color="#FFF" offset=".7735"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="26" gradientUnits="userSpaceOnUse" y1="22" gradientTransform="matrix(1 0 0 .71429 -8 -1.7143)" x2="26" y2="8">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" offset=".30213"/>
-   <stop stop-color="#FFF" stop-opacity=".69020" offset=".39747"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="23.452" gradientUnits="userSpaceOnUse" y1="30.555" gradientTransform="matrix(.90695 0 0 .81527 -5.2694 -5.0638)" x2="43.007" y2="45.934">
-   <stop stop-color="#FFF" stop-opacity="0" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" x1="24.823" gradientUnits="userSpaceOnUse" y1="15.378" gradientTransform="matrix(.90695 0 0 1.0808 -5.2694 -11.995)" x2="24.997" y2="37.277">
-   <stop stop-color="#dac197" offset="0"/>
-   <stop stop-color="#c1a581" offset=".23942"/>
-   <stop stop-color="#dbc298" offset=".27582"/>
-   <stop stop-color="#a68b60" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" x1="15.464" gradientUnits="userSpaceOnUse" y1="7.9757" gradientTransform="matrix(.70732 0 0 .69403 -.97579 -1.3833)" x2="15.464" y2="45.042">
-   <stop stop-color="#c9af8b" offset="0"/>
-   <stop stop-color="#ad8757" offset=".23942"/>
-   <stop stop-color="#c2a57f" offset=".27582"/>
-   <stop stop-color="#9d7d53" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="41.5" cx="5" gradientTransform="matrix(.59382 0 0 1.5367 -6.6595 -103.94)" r="5"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="d" x1="17.554" gradientUnits="userSpaceOnUse" y1="46" gradientTransform="matrix(1.757 0 0 1.397 -17.394 -16.412)" x2="17.554" y2="35">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="41.5" cx="5" gradientTransform="matrix(.59382 0 0 1.5367 41.141 -103.94)" r="5"/>
- </defs>
- <g opacity=".4" transform="matrix(.69054 0 0 .67815 -.50409 -.44851)">
-  <rect transform="scale(-1)" height="15.367" width="2.9602" y="-47.848" x="-3.6904" fill="url(#c)"/>
-  <rect y="32.482" width="40.412" fill="url(#d)" x="3.6904" height="15.367"/>
-  <rect transform="scale(1,-1)" height="15.367" width="2.9602" y="-47.848" x="44.11" fill="url(#b)"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.05 -864.43)" fill="#35537a">
+  <path d="m4 3-2 2v7.539c0 0.259 0.2021 0.461 0.4609 0.461h11.078c0.259 0 0.461-0.202 0.461-0.461v-7.539l-2-2zm1 1h6l1 1h-8z" fill-rule="evenodd" transform="matrix(1.1538 0 0 1.1538 198.51 997.42)" fill="#55739a"/>
  </g>
- <path d="m5.3977 4.5159h20.864c1.218 0 1.7661-0.19887 2.116 0.69403l2.1232 5.29v18.081c0 1.078 0.0728 0.91332-1.1452 0.91332h-26.712c-1.218 0-1.1452 0.16471-1.1452-0.91332v-18.081l2.1232-5.29c0.3401-0.87486 0.55789-0.69403 1.7759-0.69403z" stroke="url(#e)" stroke-linecap="round" stroke-width=".99420" display="block" fill="url(#f)"/>
- <path opacity=".50549" d="m6.0608 5.219h19.56c1.1418 0 1.8485 0.38625 2.3268 1.4478l1.6473 4.4555v16.063c0 1.0137-0.57913 1.5241-1.721 1.5241h-23.86c-1.1418 0-1.6076-0.56135-1.6076-1.5751v-16.012l1.5942-4.551c0.31884-0.82269 0.91924-1.3522 2.0611-1.3522z" stroke="url(#g)" stroke-width=".74212" display="block" fill="none"/>
- <path opacity=".4" fill="url(#h)" d="m14 4h4v10h-4v-10z"/>
- <path opacity=".4" d="m1.5001 10.5h29" stroke="url(#i)" stroke-linecap="square" stroke-width="1px" fill="none"/>
 </svg>
diff --git a/core/img/filetypes/text-calendar.png b/core/img/filetypes/text-calendar.png
index ac48f1f802..ff3ced6253 100644
Binary files a/core/img/filetypes/text-calendar.png and b/core/img/filetypes/text-calendar.png differ
diff --git a/core/img/filetypes/text-calendar.svg b/core/img/filetypes/text-calendar.svg
index e935abeee9..051a32f4e5 100644
--- a/core/img/filetypes/text-calendar.svg
+++ b/core/img/filetypes/text-calendar.svg
@@ -1,87 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <radialGradient id="x" spreadMethod="reflect" gradientUnits="userSpaceOnUse" cy="4.9179" cx="14" gradientTransform="matrix(1.0912 -1.8502e-8 3.75e-8 1.5923 7.2228 -4.4685)" r="2">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#8f8f8f" offset="1"/>
-  </radialGradient>
-  <radialGradient id="y" spreadMethod="reflect" gradientUnits="userSpaceOnUse" cy="4.9179" cx="14" gradientTransform="matrix(1.0912 -1.8502e-8 3.75e-8 1.5923 -5.7772 -4.4685)" r="2">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#8f8f8f" offset="1"/>
-  </radialGradient>
-  <linearGradient id="o" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.6 0 0 .64185 1.6 -16.779)" y1="5" x1="24">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".063165"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="p" y2="43" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.62162 0 0 .62162 1.0811 2.0811)" y1="5" x1="24">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".063165"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="z" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(0 .90633 -1.9732 -3.8244e-8 32.673 -1.9201)" r="20">
-   <stop stop-color="#f89b7e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".26238"/>
-   <stop stop-color="#c6262e" offset=".66094"/>
-   <stop stop-color="#690b2c" offset="1"/>
-  </radialGradient>
-  <linearGradient id="q" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.64103 0 0 .64103 .61538 1.6154)" y1="44" x1="24">
-   <stop stop-color="#791235" offset="0"/>
-   <stop stop-color="#dd3b27" offset="1"/>
-  </linearGradient>
-  <linearGradient id="r" y2="18.684" gradientUnits="userSpaceOnUse" x2="23.954" gradientTransform="matrix(.65 0 0 .5 .4 4)" y1="15.999" x1="23.954">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="s" y2="44.984" gradientUnits="userSpaceOnUse" x2="19.36" gradientTransform="matrix(.64103 0 0 .64185 .61538 .95838)" y1="16.138" x1="19.36">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="t" y2="3.8905" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.64103 0 0 .64185 .61538 1.5793)" y1="44" x1="24">
-   <stop stop-color="#787878" offset="0"/>
-   <stop stop-color="#AAA" offset="1"/>
-  </linearGradient>
-  <radialGradient id="v" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 27.988 -17.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <radialGradient id="w" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(2.0038 0 0 1.4 -20.012 -104.4)" r="2.5">
-   <stop stop-color="#181818" offset="0"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="n" y2="39.999" gradientUnits="userSpaceOnUse" x2="25.058" y1="47.028" x1="25.058">
-   <stop stop-color="#181818" stop-opacity="0" offset="0"/>
-   <stop stop-color="#181818" offset=".5"/>
-   <stop stop-color="#181818" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="u" y2="3.899" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.64103 0 0 .64103 .61538 .61538)" y1="44" x1="24">
-   <stop stop-color="#791235" offset="0"/>
-   <stop stop-color="#dd3b27" offset="1"/>
-  </linearGradient>
- </defs>
- <path stroke-linejoin="round" style="color:#000000" d="m5.5 3.5c7.0683 0.00685 14.137-0.013705 21.205 0.010288 1.238 0.083322 1.9649 1.3578 1.7949 2.5045l-24.99-0.7199c0.081-0.9961 0.9903-1.8161 1.9897-1.7949z" stroke="url(#u)" stroke-linecap="round" fill="none"/>
- <g transform="matrix(.7 0 0 .33333 -.8 15.333)">
-  <g opacity=".4" transform="matrix(1.0526 0 0 1.2857 -1.2632 -13.429)">
-   <rect y="40" width="5" height="7" x="38" fill="url(#v)"/>
-   <rect transform="scale(-1)" height="7" width="5" y="-47" x="-10" fill="url(#w)"/>
-   <rect y="40" width="28" height="7" x="10" fill="url(#n)"/>
-  </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g fill="#969696" transform="matrix(.5 0 0 .5 290.36 -.78825)">
+  <path d="m-572.71 3.5765c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm16 0c-1.108 0-2 0.892-2 2v4c0 1.108 0.892 2 2 2s2-0.892 2-2v-4c0-1.108-0.892-2-2-2zm-13 4v2c0 1.662-1.338 3-3 3s-3-1.338-3-3v-1.875c-1.728 0.44254-3 2.0052-3 3.875v16c0 2.216 1.784 4 4 4h20c2.216 0 4-1.784 4-4v-16c0-1.8698-1.272-3.4325-3-3.875v1.875c0 1.662-1.338 3-3 3s-3-1.338-3-3v-2h-10zm-5.9062 9h21.812c0.0554 0 0.0937 0.03835 0.0937 0.09375v11.812c0 0.0554-0.0384 0.09375-0.0937 0.09375h-21.812c-0.0554 0-0.0937-0.03835-0.0937-0.09375v-11.812c0-0.0554 0.0384-0.09375 0.0937-0.09375z" fill="#969696"/>
  </g>
- <path stroke-linejoin="round" style="color:#000000" d="m28.5 7.0148s0.0137 13.794-0.01029 20.69c-0.084 1.238-1.358 1.965-2.505 1.795-6.896-0.007-13.794 0.014-20.69-0.01-1.238-0.084-1.9649-1.358-1.7949-2.505 0.0068-6.896 0.0103-20.69 0.0103-20.69z" stroke="url(#t)" stroke-linecap="round" fill="url(#s)"/>
- <rect opacity=".3" rx="0" ry="0" height="2" width="26" y="12" x="3" fill="url(#r)"/>
- <g stroke-linejoin="round">
-  <path style="color:#000000" stroke-linecap="round" d="m5.5 4.5c7.0683 0.00685 14.137-0.013705 21.205 0.010288 1.238 0.083322 1.9649 1.3578 1.7949 2.5045l0.073 4.4852h-25.073l0.0103-5.2051c0.081-0.9961 0.9903-1.8161 1.9897-1.7949z" stroke="url(#q)" fill="url(#z)"/>
-  <rect opacity=".5" rx="1" ry="1" height="23" width="23" stroke="url(#p)" stroke-linecap="round" y="5.5" x="4.5" fill="none"/>
-  <path opacity=".5" stroke="url(#o)" stroke-linecap="square" d="m26.5 10.5h-21" fill="none"/>
- </g>
- <rect opacity=".4" rx="1.8086" ry="1.5304" height="7.0604" width="3" y="2.9396" x="8" fill="#FFF"/>
- <rect rx="1.5869" ry="1.5869" height="2.7652" width="3" y="6.2348" x="8" fill="#cc3429"/>
- <rect rx="1.8086" ry="1.3912" height="7" width="3" y="1.0188" x="8" fill="url(#y)"/>
- <rect opacity=".4" rx="1.8086" ry="1.5304" height="7.0604" width="3" y="2.9396" x="21" fill="#FFF"/>
- <rect rx="1.5869" ry="1.5869" height="2.7652" width="3" y="6.2348" x="21" fill="#cc3429"/>
- <rect rx="1.8086" ry="1.3912" height="7" width="3" y="1.0188" x="21" fill="url(#x)"/>
- <rect style="color:#000000" height="3.9477" width="19.876" y="14.023" x="6.1231" fill="#c5c5c5"/>
- <path opacity=".3" stroke-linejoin="round" style="color:#000000" d="m6.5182 14.553 18.987 0.011-0.09 11.941-18.986-0.011zm0.33122 8.8955 18.622 0.01098m-18.89-2.957 18.622 0.01098m-18.532-2.898 18.622 0.011m-3.654-2.895-0.089 11.769m-2.902-11.724-0.089 11.724m-2.902-11.813-0.089 11.813m-2.901-11.769-0.09 11.769m-2.8345-11.78-0.0893 11.78" stroke="#000" stroke-linecap="round" fill="none"/>
 </svg>
diff --git a/core/img/filetypes/text-code.png b/core/img/filetypes/text-code.png
index c0e7590108..5505102f60 100644
Binary files a/core/img/filetypes/text-code.png and b/core/img/filetypes/text-code.png differ
diff --git a/core/img/filetypes/text-code.svg b/core/img/filetypes/text-code.svg
index b85ddece9c..0ff78b6bcf 100644
--- a/core/img/filetypes/text-code.svg
+++ b/core/img/filetypes/text-code.svg
@@ -1,60 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="k" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#k)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#m)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#l)"/>
- <path stroke-linejoin="round" stroke="url(#j)" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#i)"/>
- <path stroke-linejoin="round" stroke="url(#h)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/>
- <path stroke="#89adc2" stroke-width="1px" d="m8 5.505h2.3438zm2.6875 0h2.1875zm2.5312 0h1.9375zm2.25 0h0.84375zm-7.4688 2h3.6562zm4.0625 0h1.75zm2.0625 0h0.875zm1.2188 0h1.5938zm1.9375 0h1.625zm-9.282 1.995h4.2812zm4.625 0h4.625zm1.703 8h0.84375zm1.1875 0h1.875zm2.25 0h4.9062zm-2.6875 2.075h1.8438zm-1.028 5.925h2.9688zm3.8562 0h1.1875z" fill="none"/>
- <g transform="translate(27.06 6.7752)">
-  <path d="m-15.57 10.277h0.93368v1h-0.93368z" fill="#d48eb3"/>
-  <path d="m-14.483 10.277h0.41011v1h-0.41011z" fill="#d48eb3"/>
-  <path opacity=".7" d="m-19.06 16.277h1.9967v1h-1.9967v-1z" fill="#666"/>
-  <path opacity=".7" d="m-16.907 16.277h2.1395v1h-2.1395v-1z" fill="#666"/>
-  <g fill="#d48eb3">
-   <path d="m-14.611 16.277h0.85436v1h-0.85436v-1z"/>
-   <path d="m-13.6 16.277h2.0125v1h-2.0125v-1z"/>
-   <path d="m-9.8967 16.277h0.53704v1h-0.53704v-1z"/>
-   <path d="m-11.431 16.277h1.3779v1h-1.3779v-1z"/>
-   <path d="m-9.2031 16.277h0.31492v1h-0.31492v-1z"/>
-   <path d="m-8.7317 16.277h0.85436v1h-0.85436v-1z"/>
-   <path d="m-16.466 12.277h2.3933v1h-2.3933z"/>
-  </g>
-  <path d="m-19.06 14.277h1.8063v1h-1.8063v-1z" fill="#94d48e"/>
-  <path d="m-17.105 14.277h0.56877v1h-0.56877v-1z" fill="#94d48e"/>
-  <path opacity=".7" d="m-16.387 14.277h1.2986v1h-1.2986v-1z" fill="#666"/>
-  <path opacity=".7" d="m-14.939 14.277h0.88609v1h-0.88609v-1z" fill="#666"/>
-  <path d="m-19.06 18.277h1.4875v1h-1.4875v-1z" fill="#de6161"/>
-  <path opacity=".7" d="m-17.334 18.277h2.6472v1h-2.6472v-1z" fill="#666"/>
- </g>
- <path d="m8 12v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094z" fill="#b78ed4"/>
- <path d="m12.406 12v1h5.594v-1zm0.03125 2v1h5.0938v-1z" fill="#d48eb3"/>
- <path d="m8 17v1h2.5312v-1zm0 2.031v0.969h2.2188v-0.96875z" fill="#94d48e"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path d="m10.828 3.0503-1.4138 1.4142 3.5358 3.5355-3.5358 3.536 1.4138 1.414 4.95-4.95-4.95-4.9497zm-5.6569 0l-4.9493 4.9497 4.9498 4.95 1.4142-1.414-3.5355-3.536 3.5355-3.5355-1.4142-1.4142z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/text-html.png b/core/img/filetypes/text-html.png
deleted file mode 100644
index c3bbf2bfd9..0000000000
Binary files a/core/img/filetypes/text-html.png and /dev/null differ
diff --git a/core/img/filetypes/text-html.svg b/core/img/filetypes/text-html.svg
deleted file mode 100644
index 99215d303e..0000000000
--- a/core/img/filetypes/text-html.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="k" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#k)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#m)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#l)"/>
- <path stroke-linejoin="round" stroke="url(#j)" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#i)"/>
- <path stroke-linejoin="round" stroke="url(#h)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z" fill="none"/>
- <g fill="#fff">
-  <rect opacity=".6" style="color:#000000" fill-rule="evenodd" transform="matrix(1 0 -.42525 .90508 0 0)" height="8.839" width="1.2412" y="14.363" x="23.867"/>
-  <path opacity=".6" d="m23.142 16.907-2.939-3.68 0.979-1.227 3.818 4.907-3.919 5.093-1.081-1.12 3.142-3.973z"/>
-  <path opacity=".6" d="m8.8581 16.907 2.9389-3.68-0.979-1.227-3.818 4.907 3.919 5.093 1.081-1.12-3.1419-3.973z"/>
- </g>
- <path opacity=".4" d="m8.8581 15.907 2.9389-3.68-0.979-1.227-3.818 4.907 3.919 5.093 1.081-1.12-3.1419-3.973z" fill="#666"/>
- <rect opacity=".4" style="color:#000000" fill-rule="evenodd" transform="matrix(1 0 -.42525 .90508 0 0)" height="8.839" width="1.2412" y="13.259" x="23.397"/>
- <path opacity=".4" d="m23.142 15.907-2.939-3.68 0.979-1.227 3.818 4.907-3.919 5.093-1.081-1.12 3.142-3.973z" fill="#666"/>
-</svg>
diff --git a/core/img/filetypes/text-vcard.png b/core/img/filetypes/text-vcard.png
index 6849792dfd..77ac138fe1 100644
Binary files a/core/img/filetypes/text-vcard.png and b/core/img/filetypes/text-vcard.png differ
diff --git a/core/img/filetypes/text-vcard.svg b/core/img/filetypes/text-vcard.svg
index f9d50fef77..6b30a4ecaf 100644
--- a/core/img/filetypes/text-vcard.svg
+++ b/core/img/filetypes/text-vcard.svg
@@ -1,53 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="g" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" x1="24" gradientUnits="userSpaceOnUse" y1="14.916" gradientTransform="matrix(.50267 0 0 .64630 2.7118 .79618)" x2="24" y2="32.596">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".12291"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".93706"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="8.4498" cx="10.904" gradientTransform="matrix(0 .96917 -.82966 0 23.014 -1.7852)" r="20">
-   <stop stop-color="#5f5f5f" offset="0"/>
-   <stop stop-color="#4f4f4f" offset=".26238"/>
-   <stop stop-color="#3b3b3b" offset=".70495"/>
-   <stop stop-color="#2b2b2b" offset="1"/>
-  </radialGradient>
-  <linearGradient id="e" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(.65627 0 0 .68929 .25311 -.21112)" x2="24" y2="3.899">
-   <stop stop-color="#272727" offset="0"/>
-   <stop stop-color="#454545" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#g)"/>
-  <path opacity=".15" fill="url(#c)" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z"/>
-  <path opacity=".15" fill="url(#d)" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z"/>
- </g>
- <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#h)"/>
- <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#i)" stroke-linecap="round" fill="none"/>
- <path stroke-linejoin="round" opacity=".3" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
- <path opacity=".4" fill="#FFF" d="m15.942 10c-0.43193-0.00263-0.8112 0.0802-1.0693 0.25173-0.33304 0.22128-0.47989 0.24937-0.57286 0.09682-0.08897-0.14595-0.16986-0.12965-0.24824 0.07745-0.06628 0.17515-0.20484 0.25511-0.36281 0.19364-0.15062-0.05862-0.21239-0.03973-0.15276 0.05809 0.05729 0.09402 0.02929 0.17427-0.05728 0.17427s-0.36382 0.2966-0.61105 0.65837c-0.39411 0.57668-0.45839 0.84025-0.45829 2.0526 0.000055 0.76062 0.07517 1.5012-0.15276 1.5491-0.13368 0.02806-0.12095 0.55674-0.05728 1.1037 0.08325 0.71528 0.20761 1.0657 0.55377 1.3942 0.53917 0.51164 1.0312 1.3973 1.0312 1.8783 0 0.65888-1.5163 1.812-3.7844 2.8648l-0.001 1.647h11.999l0.001-1.818c-1.8832-0.86856-3.4418-2.0704-3.4418-2.6933 0-0.47982 0.47343-1.3672 1.0121-1.8783 0.34616-0.32849 0.48961-0.6789 0.57286-1.3942 0.06366-0.54699 0.07227-1.0601-0.05728-1.1037-0.17854-0.06014-0.17188-0.79471-0.17188-1.5491-0.000001-1.0814-0.06787-1.4838-0.34372-1.9364-0.54889-0.9006-2.3323-1.6188-3.6281-1.6265z" fill-rule="evenodd"/>
- <path stroke-linejoin="round" style="color:#000000" d="m15.942 9.5292c-0.6255-0.1462-1.3748 0.30347-1.3748 0.30347l-0.6729 0.33632s-0.72918 0.63672-0.73698 0.85303c-0.41044 0.72679-0.22336 1.6075-0.26498 2.4026 0.03999 0.68261-0.43452 1.1887-0.1965 1.8808-0.03472 0.66822 0.51558 1.0601 0.86937 1.5434 0.39816 0.61145 0.93889 1.4093 0.51306 2.141-0.78719 1.1416-2.0959 1.7466-3.2907 2.3686-0.4059 0.04157-0.25309 0.43145-0.28027 0.70942-0.000647 0.22106-0.07334 0.51408 0.25088 0.41058h10.742v-1.1474c-1.1567-0.58611-2.3639-1.2139-3.1747-2.2562-0.48709-0.69808 0.0011-1.5369 0.38553-2.1576 0.2993-0.51701 0.92489-0.84736 0.93383-1.5066 0.23004-0.66882-0.1171-1.2225-0.18189-1.8604-0.08471-0.84572 0.14453-1.7705-0.25914-2.5574-0.54732-0.80518-1.5498-1.1578-2.4596-1.3737-0.26389-0.053253-0.53234-0.088037-0.80184-0.09011z" stroke="url(#e)" stroke-linecap="round" fill="url(#b)"/>
- <path opacity=".5" stroke-linejoin="round" style="color:#000000" d="m15.797 10.502c-0.10657-0.01105-0.27196 0.03765-0.51076 0.15329-0.17676 0.08559-0.43781 0.15994-0.7045 0.21077l0.01761 0.01916c-0.0033 0.002-0.1837 0.11082-0.29941 0.19161-0.02225 0.01554-0.034 0.0057-0.05284 0.01916-0.0059 0.0083-0.01447 0.01546-0.01761 0.01916-0.07635 0.08979-0.22535 0.27657-0.33464 0.47903-0.11417 0.2115-0.16633 0.4404-0.15851 0.49819a0.52517 0.57134 0 0 1 0.01761 0.13413c-0.05039 0.58523 0.11775 1.3768-0.1409 2.261a0.52517 0.57134 0 0 1 -0.035 0.115c-0.09831 0.18139-0.02434 0.78987 0.1409 1.2455 0.54115 0.61932 1.1974 1.4444 1.18 2.5676a0.52517 0.57134 0 0 1 -0.0176 0.13412c-0.28591 1.0661-1.1672 1.5797-1.726 2.0119a0.52517 0.57134 0 0 1 -0.01761 0.01916c-0.524 0.378-1.084 0.623-1.637 0.919h9c-1.027-0.52495-2.0438-1.1451-2.8532-2.1077-0.0057-0.0069-0.0119-0.01231-0.01761-0.01916-0.37728-0.42677-0.45342-1.0116-0.36986-1.4754 0.08208-0.45566 0.27492-0.83741 0.45793-1.1497 0.0063-0.01067 0.01139-0.02783 0.01761-0.03833 0.18432-0.36085 0.41144-0.60748 0.5636-0.80477 0.15849-0.2055 0.22438-0.31795 0.22896-0.47903a0.52517 0.57134 0 0 1 0.03523 -0.15329c0.05659-0.18584 0.03263-0.33442-0.01761-0.57483-0.04928-0.23579-0.14777-0.55211-0.17612-0.9389-0.000556-0.0075 0.000501-0.01151 0-0.01916-0.04688-0.50185 0.0086-0.95368 0-1.3413-0.0086-0.3855-0.07421-0.66627-0.22896-0.90057-0.0021-0.0024 0.0021-0.01679 0-0.01916-0.54915-0.61896-1.4523-0.93653-2.3073-0.97721a0.52517 0.57134 0 0 1 -0.03523 0z" stroke="url(#f)" stroke-linecap="round" fill="none"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m4.6156 3.3325c-0.97744 0-1.8066 0.71483-1.8066 1.6373 0.0069 0.29157 0.033 0.65113 0.20701 1.4115v0.0188l0.01885 0.01885c0.05585 0.16 0.13714 0.25152 0.24465 0.37639s0.23568 0.27185 0.35756 0.39521c0.0144 0.0145 0.0235 0.02345 0.0376 0.037649 0.02415 0.10519 0.05345 0.21839 0.07527 0.31993 0.05807 0.27016 0.05211 0.46148 0.0376 0.52694-0.42001 0.14747-0.94254 0.32311-1.4114 0.52693-0.2632 0.1144-0.5015 0.2166-0.6963 0.3387-0.1949 0.1221-0.3887 0.2144-0.4517 0.4893-0.001 0.0125-0.001 0.0251 0 0.037648-0.06155 0.56519-0.15466 1.3963-0.22583 1.9572-0.01535 0.11808 0.04685 0.24255 0.15055 0.30111 0.85134 0.45986 2.1591 0.64493 3.4627 0.63988 1.3036-0.0051 2.601-0.20105 3.4251-0.63988 0.10368-0.05855 0.16592-0.18303 0.15055-0.30111-0.0227-0.17536-0.05063-0.57074-0.07527-0.95982-0.02465-0.38905-0.046-0.77173-0.07527-0.99742-0.0102-0.055948-0.0367-0.10883-0.07528-0.15056-0.2616-0.3125-0.6527-0.5037-1.1102-0.6963-0.4176-0.1758-0.9071-0.3584-1.3926-0.5645-0.02715-0.060528-0.05416-0.23663 0-0.50814 0.0145-0.072898 0.03735-0.15098 0.05646-0.22583 0.04565-0.051098 0.08118-0.092853 0.13173-0.15056 0.10782-0.12307 0.22367-0.25215 0.31993-0.37639 0.09625-0.12424 0.175-0.23082 0.22583-0.37639l0.01885-0.0188c0.1967-0.79393 0.19681-1.1252 0.20701-1.4115v-0.01885c0-0.92247-0.82919-1.6373-1.8066-1.6373zm5.1679-1.5025c-1.4251 0-2.634 1.0421-2.634 2.387 0.0101 0.42508 0.04815 0.94927 0.3018 2.0578v0.02745l0.02745 0.02745c0.08143 0.23325 0.19994 0.36668 0.35668 0.54874 0.15674 0.18205 0.3436 0.39632 0.52129 0.57618 0.0209 0.02115 0.0343 0.034299 0.05487 0.054883 0.03525 0.15335 0.07793 0.31839 0.10975 0.46643 0.08465 0.39387 0.07597 0.67278 0.05488 0.76823-0.61234 0.21501-1.3742 0.47106-2.0578 0.76823-0.38378 0.16685-0.73109 0.31583-1.0152 0.49388-0.28411 0.17804-0.56664 0.31254-0.65849 0.71338-0.0015 0.01825-0.0015 0.03665 0 0.05489-0.08974 0.82398-0.22549 2.0356-0.32925 2.8534-0.0224 0.17215 0.06833 0.35362 0.2195 0.43899 1.2412 0.67043 3.1478 0.94028 5.0484 0.93288s3.792-0.2931 4.9936-0.93288c0.15116-0.08537 0.2419-0.26684 0.2195-0.43899-0.03315-0.25564-0.07382-0.83208-0.10975-1.3993-0.03595-0.56718-0.06711-1.1252-0.10974-1.4542-0.0149-0.08155-0.05344-0.15866-0.10975-0.21949-0.38168-0.45576-0.95194-0.73438-1.6188-1.0152-0.60884-0.25635-1.3226-0.52259-2.0304-0.82308-0.03955-0.088248-0.07897-0.345 0-0.74078 0.0212-0.10628 0.05441-0.22011 0.08231-0.32924 0.06652-0.074503 0.11836-0.13538 0.19206-0.2195 0.1572-0.17941 0.3261-0.36762 0.46643-0.54874 0.14033-0.18113 0.25515-0.33651 0.32924-0.54874l0.02745-0.02745c0.28679-1.1574 0.28694-1.6404 0.30182-2.0578v-0.02745c0-1.3449-1.2089-2.387-2.634-2.387z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/text-x-c.png b/core/img/filetypes/text-x-c.png
deleted file mode 100644
index 2bdb16a2a7..0000000000
Binary files a/core/img/filetypes/text-x-c.png and /dev/null differ
diff --git a/core/img/filetypes/text-x-c.svg b/core/img/filetypes/text-x-c.svg
deleted file mode 100644
index 462286754f..0000000000
--- a/core/img/filetypes/text-x-c.svg
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="n" x1="25" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="43" gradientTransform="translate(0 -.00046093)" x2="25" y2="14"/>
-  <linearGradient id="b">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="m" x1="30" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="9.9828" gradientTransform="translate(0 -.00046093)" x2="30" y2="28.585"/>
-  <radialGradient id="f" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.6167e-7 6.6019 -8.0922 -1.9817e-7 104.56 -60.073)" r="12.672">
-   <stop stop-color="#90dbec" offset="0"/>
-   <stop stop-color="#55c1ec" offset=".26238"/>
-   <stop stop-color="#3689e6" offset=".70495"/>
-   <stop stop-color="#2b63a0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="l" x1="25" gradientUnits="userSpaceOnUse" y1="47.935" gradientTransform="translate(0 -.00046093)" x2="25" y2=".91791">
-   <stop stop-color="#185f9a" offset="0"/>
-   <stop stop-color="#599ec9" offset="1"/>
-  </linearGradient>
-  <radialGradient id="e" gradientUnits="userSpaceOnUse" cy="63.965" cx="15.116" gradientTransform="matrix(1.1392 0 0 .40687 6.78 7.7466)" r="12.289">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="k" x1="21.253" gradientUnits="userSpaceOnUse" y1="44.301" gradientTransform="translate(0 .99954)" x2="21.253" y2=".50543">
-   <stop stop-color="#AAA" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/>
-  <linearGradient id="g" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.66667 0 0 .66667 0 .0018413)">
-  <g>
-   <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#g)"/>
-   <path opacity=".3" fill="url(#c)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/>
-   <path opacity=".3" fill="url(#d)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/>
-  </g>
-  <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#i)" stroke-width=".99992" fill="url(#j)"/>
-  <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#h)" stroke-linecap="round" fill="none"/>
-  <path d="m11 6.9995v1h2.375v-1zm2.6875 0v1h2.25v-1zm2.5625 0v1h1.9688v-1zm2.2812 0v1h0.875v-1zm1.1875 0v1h1.9375v-1zm2.2812 0v1h5v-1zm-11 2v1h3.7812v-1zm4.1562 0v1h1.8125v-1zm2.1562 0v1h0.84375v-1zm1.2188 0v1h1.625v-1zm2 0v1h1.625v-1zm1.9688 0v1h2.6562v-1zm3.0312 0v1h3.4688v-1zm-16.904 2.0005v1h4.1875v-1zm4.5 0v1h4.5v-1zm-4.5 2v1h2.3125v-1zm2.625 0v1h2.1562v-1zm2.4688 0v1h1.9062v-1zm-5.0938 3v1h3.0625v-1zm3.4062 0v1h5.5938v-1zm-3.4062 2v1h3.0938v-1zm3.4375 0v1h5.0938v-1c-2.793 2.816-6.7194 8.5464-5.0938 0zm5.4688 0v1h1.9062v-1zm2.2188 0v1h1.9062v-1zm2.2188 0v1h2.75v-1zm3.0938 0v1h0.5625v-1zm-16.438 3v1h2.3438v-1zm0 2v1h1v-1zm0 2v1h2.75v-1zm9 0v1h2.3438v-1zm2.6562 0v1h2.1875v-1zm2.5 0v1h1.8438v-1zm-14.156 2v1h2.9375v-1zm9 0v1h1.875v-1zm2.1875 0v1h4.8125v-1zm5.125 0v1h3.6875v-1zm-16.312 2v1h2.5312v-1zm9 0v1h2.4375v-1zm2.7812 0v1h4.2812v-1zm4.5938 0v1h2.9375v-1zm-16.376 2.156v0.96875h2.2188v-0.96875zm2.5625 0v0.96875h2.125v-0.96875zm-2.562 2.844v1h4.2812v-1zm4.625 0v1h4.5938v-1zm11.75 0v1h2.9688v-1zm3.2812 0v1h1.1562v-1zm1.5 0v1h0.6875v-1zm1 0v1h1.8438v-1zm-22.156 2v1h3.6875v-1zm3.9688 0v1h1.7812v-1zm2.1562 0v1h0.8125v-1zm1.0312 0v1h1.625v-1zm1.875 0v1h1.625v-1zm2.125 0v1h2.5938v-1zm2.9062 0v1h3.375v-1zm3.8438 0v1h2.2812v-1zm2.5625 0v1h0.53125v-1zm-20.469 2v1h3.0312v-1zm3.3438 0v1h3.3438v-1zm5.5938 0v1h2.4375v-1zm2.75 0v1h2.25v-1zm2.5938 0v1h1.9375v-1zm2.25 0v1h3.0938v-1zm3.4375 0v1h5.0312v-1z" fill="url(#k)"/>
-  <path opacity=".3" d="m38 33.772c0.002 2.762-6.267 5.001-14 5.001s-14.002-2.239-14-5.001c-0.0015-2.762 6.267-5.001 14-5.001 7.7331 0 14.002 2.2392 14 5.001z" fill="url(#e)"/>
-  <g stroke-linecap="square">
-   <path stroke-linejoin="round" d="m24 10.5c-6.9 0-12.5 5.6-12.5 12.5s5.6 12.5 12.5 12.5c5.1254 0 10-3.5 11.553-8h-5.536c-1.3314 1.7506-3.794 3-6.0175 3-4.14 0-7.5-3.36-7.5-7.5-0.000002-4.14 3.36-7.5 7.5-7.5 2.6674 0 5.1835 1.9004 6.5132 4h4.9491c-0.46238-4.5-5.9604-9-11.462-9z" stroke="url(#l)" fill="url(#f)"/>
-   <path opacity=".5" d="m34.125 17.937c-1.85-3.7875-5.876-6.4337-10.125-6.375-4.4493-0.06217-8.7511 2.7592-10.485 6.8537-1.8453 4.1071-0.95053 9.2567 2.2024 12.479 2.1403 2.3057 5.2836 3.5679 8.4064 3.5424" stroke="url(#m)" fill="none"/>
-   <path opacity=".5" d="m23.561 14.448c-4.0197 0.13299-7.6119 3.4686-8.0541 7.4638-0.56609 3.8529 1.8882 7.8464 5.5554 9.1288 3.0106 1.1697 7.3287 0.17216 9.3618-2.5497h4.5763" stroke="url(#n)" fill="none"/>
-  </g>
- </g>
-</svg>
diff --git a/core/img/filetypes/text-x-h.png b/core/img/filetypes/text-x-h.png
deleted file mode 100644
index 7b4a36cdbe..0000000000
Binary files a/core/img/filetypes/text-x-h.png and /dev/null differ
diff --git a/core/img/filetypes/text-x-h.svg b/core/img/filetypes/text-x-h.svg
deleted file mode 100644
index 9ed1bd6ff9..0000000000
--- a/core/img/filetypes/text-x-h.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="l" x1="21.038" gradientUnits="userSpaceOnUse" y1="29.845" gradientTransform="matrix(.58514 0 0 .60235 3.8714 10.911)" x2="21.038" y2="36.456">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="26.884" gradientUnits="userSpaceOnUse" y1="12.607" gradientTransform="translate(4.1161 -1.6069)" x2="26.884" y2="34.607">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".090909"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95455"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="e" fx="9.3065" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.8368" gradientTransform="matrix(0 7.1404 -7.3431 0 93.723 -67.567)" r="12.672"/>
-  <linearGradient id="b">
-   <stop stop-color="#f8b17e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".26238"/>
-   <stop stop-color="#c6262e" offset=".66094"/>
-   <stop stop-color="#690b54" offset="1"/>
-  </linearGradient>
-  <linearGradient id="n" x1="25" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="49.945" gradientTransform="matrix(.98529 0 0 1.0091 -3.0293 -2.6662)" x2="25" y2="4.9451"/>
-  <linearGradient id="c">
-   <stop stop-color="#791235" offset="0"/>
-   <stop stop-color="#dd3b27" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" fx="9.3065" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="10.244" cx="9.8368" gradientTransform="matrix(0 7.1404 -7.3431 0 93.723 -67.168)" r="12.672"/>
-  <linearGradient id="m" x1="25" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="49.945" gradientTransform="matrix(.98529 0 0 1.0091 -3.0293 -2.2671)" x2="25" y2="4.9451"/>
-  <linearGradient id="k" y2=".4976" gradientUnits="userSpaceOnUse" y1="44.759" x2="23.749" x1="23.749">
-   <stop stop-color="#a3a3a3" offset="0"/>
-   <stop stop-color="#bababa" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="p" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="o" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="g" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="f" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/>
-  <linearGradient id="i" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.66667 0 0 .66667 0 .0018413)">
-  <g>
-   <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#i)"/>
-   <path opacity=".3" fill="url(#f)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/>
-   <path opacity=".3" fill="url(#g)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/>
-  </g>
-  <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#o)" stroke-width=".99992" fill="url(#p)"/>
-  <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#j)" stroke-linecap="round" fill="none"/>
-  <path d="m11 21v1h2.3438v-1h-2.344zm0 4v1h2.75v-1h-2.75zm0 2v1h2.9375v-1h-5.282zm0 2v1h2.5312v-1h-4.875zm0 2.1562v0.96875h2.2188v-0.96875h-2.2188zm0.406-10.156v1h2.25v-1h-2.25zm-2.75 2v1h1v-1h-1zm3.1562 2v1h1.8438v-1h-1.8438zm0.125 2v1h2.7188v-1h-2.7188zm-0.34375 2v1h2.0625v-1h-2.0625zm-0.375 2.1562v0.96875h2.125v-0.96875h-2.125zm-2.562 2.844v1h4.2812v-1h-4.281zm0 2v1h3.6875v-1h-3.688zm3.9688 0v1h1.7812v-1h-1.7812zm-0.625 2v1h3.3438v-1h-3.3438zm-3.344 0h3.0367v1h-3.037v-1zm3.4062-22v1h5.5938v-1h-5.5938zm0.03125 2v1h5.0938v-1h-5.0938zm1.1875 16v1h4.5938v-1h-4.5938zm4.9375 0v1h1.8125v-1h-1.8125zm2.1562 0v1h4.3125v-1h-4.3125zm4.6562 0v1h2.9688v-1h-2.9688zm3.2812 0v1h1.1562v-1h-1.1562zm1.5 0v1h0.6875v-1h-0.6875zm1 0v1h1.8438v-1h-1.8438zm-16.031 2v1h0.8125v-1h-0.8125zm1.0312 0v1h1.625v-1h-1.625zm1.875 0v1h1.625v-1h-1.625zm2.125 0v1h2.5938v-1h-2.5938zm2.9062 0v1h3.375v-1h-3.375zm3.8438 0v1h2.2812v-1h-2.2812zm2.5625 0v1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094zm0-11v1h2.375v-1h-2.375zm2.6875 0v1h2.25v-1h-2.25zm2.5625 0v1h1.9688v-1h-1.9688zm2.2812 0v1h0.875v-1h-0.875zm1.1875 0v1h1.9375v-1h-1.9375zm2.2812 0v1h5v-1h-5zm-11 2l0.001 1h3.7812v-1h-3.7812zm4.1562 0v1h1.8125v-1h-1.8125zm2.1562 0v1h0.84375v-1h-0.84375zm1.2188 0v1h1.625v-1h-1.625zm2 0v1h1.625v-1h-1.625zm1.9688 0v1h2.6562v-1h-2.6562zm3.0312 0v1h3.4688v-1h-3.4688zm-14.53 2v1h4.1875v-1h-4.188zm4.5 0v1h4.5v-1h-4.5zm-4.5 2v1h2.3125v-1h-2.312zm2.625 0v1h2.1562v-1h-2.1562zm2.4688 0v1h1.9062v-1h-1.9062zm3.8125 5v1h1.9062v-1h-1.9062zm2.2188 0v1h1.9062v-1h-1.9062zm2.2188 0v1h2.75v-1h-2.75zm3.0938 0v1h0.5625v-1h-0.5625zm-7.438 7v1h2.3438v-1h-2.344zm2.6562 0v1h2.1875v-1h-2.1875zm2.5 0v1h1.844v-1h-1.844zm-5.156 2v1h1.875v-1h-1.875zm2.1875 0v1h4.8125v-1h-4.8125zm5.125 0v1h3.6875v-1h-3.6875zm-7.313 2v1h2.4375v-1h-2.438zm2.7812 0v1h4.2812v-1h-4.2812zm4.5938 0v1h2.9375v-1h-2.9375zm-7.375 2.125v0.96875h1.875v-0.96875h-1.875zm2.1875 0v0.96875h1.9062v-0.96875h-1.9062zm2.2188 0v0.96875h2.7188v-0.96875h-2.7188zm3.0312 0v0.96875h0.5625v-0.96875h-0.5625zm0.875 0v0.96875h3.5312v-0.96875h-3.5312zm-8.375 6.875v1h2.4375v-1h-2.4375zm2.75 0v1h2.25v-1h-2.25zm2.5938 0v1h1.9375v-1h-1.9375zm2.25 0v1h3.0938v-1h-3.0938zm3.4375 0v1h5.0312v-1h-5.0312z" fill="url(#k)"/>
-  <g stroke-linejoin="round">
-   <path style="color:#000000" d="m34.549 33.5h-4.4021v-9.6523c-0.000012-1.1924-0.18283-2.0842-0.54845-2.6754-0.35602-0.6011-0.90929-0.90166-1.6598-0.90167-0.56771 0.000013-1.044 0.11826-1.4289 0.35476-0.38489 0.23652-0.69279 0.58634-0.92371 1.0495-0.23094 0.46316-0.39451 1.0347-0.49072 1.7147-0.09623 0.67996-0.14434 1.4584-0.14433 2.3355v7.7751h-4.4021v-23h4.4021l0.02888 8.588c0.47147-0.85731 1.0728-1.4732 1.8041-1.8477 0.73126-0.3843 1.5588-0.57646 2.4825-0.57648 0.79861 0.000017 1.5203 0.11827 2.1649 0.35476 0.65428 0.22666 1.2124 0.58635 1.6742 1.079 0.46184 0.49273 0.81785 1.1234 1.068 1.892 0.25016 0.7588 0.37524 1.6703 0.37526 2.7346v10.776z" stroke="url(#m)" fill="url(#d)"/>
-   <path style="color:#000000" d="m11.5 30.987c-0.000001-0.46315 0.06254-0.8524 0.18763-1.1677 0.1347-0.32519 0.31752-0.58633 0.54845-0.78342 0.23092-0.19708 0.50034-0.33997 0.80825-0.42866 0.3079-0.08868 0.63986-0.13303 0.99588-0.13303 0.33676 0.000004 0.65429 0.04435 0.95258 0.13303 0.3079 0.08869 0.57731 0.23158 0.80825 0.42866 0.23092 0.19709 0.41374 0.45823 0.54845 0.78342 0.1347 0.31534 0.20206 0.70459 0.20206 1.1677-0.000007 0.44345-0.06736 0.82284-0.20206 1.1382-0.13471 0.31534-0.31753 0.57648-0.54845 0.78342-0.23093 0.20694-0.50035 0.35476-0.80825 0.44344-0.299 0.1-0.616 0.149-0.953 0.149-0.35602 0-0.68798-0.04927-0.99588-0.14782-0.30791-0.08869-0.57732-0.2365-0.80825-0.44344s-0.41375-0.46808-0.54845-0.78342c-0.12509-0.31534-0.18763-0.69473-0.18763-1.1382" stroke="url(#n)" fill="url(#e)"/>
-   <path opacity=".5" style="color:#000000" d="m18.531 11.75v20.719h2.4062v-6.6875c-0.000007-0.91545 0.051-1.7426 0.15625-2.4688 0.11019-0.76037 0.32838-1.4191 0.625-2 0.30993-0.60695 0.75513-1.1031 1.3125-1.4375 0.54784-0.32869 1.2249-0.53123 1.9688-0.53125 1.0265 0.000018 1.9995 0.53062 2.5312 1.375h0.03125c0.0051 0.008-0.005 0.02321 0 0.03125 0.52572 0.84456 0.71874 1.9068 0.71875 3.1875v8.5312h2.4062v-9.6562c-0.000015-0.95546-0.12792-1.7045-0.34375-2.3438a1.0305 1.0305 0 0 1 0 -0.03125c-0.218-0.661-0.505-1.118-0.842-1.469-0.357-0.372-0.809-0.674-1.312-0.844-0.52338-0.18746-1.1259-0.28124-1.8438-0.28125-0.80443 0.000015-1.4868 0.14206-2.0625 0.4375-0.52554 0.26278-0.96905 0.71674-1.375 1.4375a1.0305 1.0305 0 0 1 -0.907 0.53h-0.25a1.0305 1.0305 0 0 1 -1.0312 -1.0938c0.03222-0.47267 0.08842-0.92314 0.125-1.3438 0.02673-0.34755 0.04266-0.73126 0.0625-1.1875 0.01907-0.44831 0.03124-0.89069 0.03125-1.2812v-3.5938h-2.4062z" transform="matrix(1 0 0 1.0136 2.9688 -.44075)" stroke="url(#h)" stroke-width=".99328" fill="none"/>
-   <path opacity=".5" style="color:#000000" d="m12.5 31c-0.000001-0.27647 0.03714-0.50882 0.11143-0.69706 0.08-0.19412 0.18857-0.35 0.32571-0.46765 0.13714-0.11764 0.29714-0.20294 0.48-0.25588 0.18286-0.05293 0.38-0.07941 0.59143-0.07941 0.2 0.000003 0.38857 0.02647 0.56571 0.07941 0.18285 0.05294 0.34285 0.13824 0.48 0.25588 0.13714 0.11765 0.24571 0.27353 0.32571 0.46765 0.08 0.18824 0.12 0.42059 0.12 0.69706-0.000004 0.26471-0.04001 0.49118-0.12 0.67941-0.08 0.18824-0.18858 0.34412-0.32571 0.46765-0.13715 0.12353-0.29715 0.21176-0.48 0.26471-0.17715 0.05882-0.36572 0.08823-0.56571 0.08823-0.21143 0-0.40857-0.02941-0.59143-0.08823-0.18286-0.05294-0.34286-0.14118-0.48-0.26471-0.137-0.123-0.246-0.279-0.326-0.468-0.074-0.188-0.111-0.414-0.111-0.679" stroke="url(#l)" fill="none"/>
-  </g>
- </g>
-</svg>
diff --git a/core/img/filetypes/text-x-python.png b/core/img/filetypes/text-x-python.png
deleted file mode 100644
index fbaf9a342f..0000000000
Binary files a/core/img/filetypes/text-x-python.png and /dev/null differ
diff --git a/core/img/filetypes/text-x-python.svg b/core/img/filetypes/text-x-python.svg
deleted file mode 100644
index b0ed6fc536..0000000000
--- a/core/img/filetypes/text-x-python.svg
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32.002" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="i" x1="49.884" gradientUnits="userSpaceOnUse" y1="20.607" gradientTransform="translate(-15.884 -1.6069)" x2="49.884" y2="41.607">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".66667"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="33.715" gradientUnits="userSpaceOnUse" y1="26.955" gradientTransform="translate(-15.884 -1.6069)" x2="33.715" y2="14.148">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".38322"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="29.465" gradientUnits="userSpaceOnUse" y1="13.12" gradientTransform="translate(-15.884 -1.6069)" x2="29.465" y2="35.642">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".2789"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="23.403" cx="9.966" gradientTransform="matrix(0 3.4562 -4.1187 0 121.21 -33.841)" r="13.931">
-   <stop stop-color="#fff3cb" offset="0"/>
-   <stop stop-color="#fdde76" offset=".26238"/>
-   <stop stop-color="#f9c440" offset=".66094"/>
-   <stop stop-color="#e48b20" offset="1"/>
-  </radialGradient>
-  <linearGradient id="c" x1="21.483" gradientUnits="userSpaceOnUse" y1="35.376" gradientTransform="matrix(1.6509 0 0 1.6568 -9.7968 -13.801)" x2="21.483" y2="8.4049">
-   <stop stop-color="#b67926" offset="0"/>
-   <stop stop-color="#eab41a" offset="1"/>
-  </linearGradient>
-  <linearGradient id="k" y2=".4976" gradientUnits="userSpaceOnUse" y1="44.759" x2="23.749" x1="23.749">
-   <stop stop-color="#a3a3a3" offset="0"/>
-   <stop stop-color="#bababa" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.89189 0 0 1.1351 2.5946 -4.7432)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="m" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(1 0 0 .95617 -1e-7 -1.9149)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="l" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.80750 0 0 .89483 59.41 -2.9806)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="e" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.023040 0 0 0.0147 26.361 37.04)" r="117.14"/>
-  <linearGradient id="b">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.023040 0 0 0.0147 21.623 37.04)" r="117.14"/>
-  <linearGradient id="f" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.067325 0 0 0.0147 -.34114 37.04)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g transform="matrix(.66667 0 0 .66667 0 .0018413)">
-  <g>
-   <rect opacity=".3" height="3.5701" width="32.508" y="42.43" x="7.7378" fill="url(#f)"/>
-   <path opacity=".3" fill="url(#d)" d="m7.7378 42.43v3.5699c-1.1865 0.0067-2.8684-0.79982-2.8684-1.7852 0-0.98533 1.324-1.7847 2.8684-1.7847z"/>
-   <path opacity=".3" fill="url(#e)" d="m40.246 42.43v3.5699c1.1865 0.0067 2.8684-0.79982 2.8684-1.7852 0-0.98533-1.324-1.7847-2.8684-1.7847z"/>
-  </g>
-  <path stroke-linejoin="round" d="m6.5 0.4972c8.02 0 35 0.0028 35 0.0028l0.000042 44.003h-35v-44.006z" stroke="url(#l)" stroke-width=".99992" fill="url(#m)"/>
-  <path stroke-linejoin="round" d="m40.5 43.5h-33v-42h33z" stroke="url(#j)" stroke-linecap="round" fill="none"/>
-  <path d="m11 21v1h2.3438v-1h-2.344zm0 4v1h2.75v-1h-2.75zm0 2v1h2.9375v-1h-5.282zm0 2v1h2.5312v-1h-4.875zm0 2.1562v0.96875h2.2188v-0.96875h-2.2188zm0.406-10.156v1h2.25v-1h-2.25zm-2.75 2v1h1v-1h-1zm3.1562 2v1h1.8438v-1h-1.8438zm0.125 2v1h2.7188v-1h-2.7188zm-0.34375 2v1h2.0625v-1h-2.0625zm-0.375 2.1562v0.96875h2.125v-0.96875h-2.125zm-2.562 2.844v1h4.2812v-1h-4.281zm0 2v1h3.6875v-1h-3.688zm3.9688 0v1h1.7812v-1h-1.7812zm-0.625 2v1h3.3438v-1h-3.3438zm-3.344 0h3.0367v1h-3.037v-1zm3.4062-22v1h5.5938v-1h-5.5938zm0.03125 2v1h5.0938v-1h-5.0938zm1.1875 16v1h4.5938v-1h-4.5938zm4.9375 0v1h1.8125v-1h-1.8125zm2.1562 0v1h4.3125v-1h-4.3125zm4.6562 0v1h2.9688v-1h-2.9688zm3.2812 0v1h1.1562v-1h-1.1562zm1.5 0v1h0.6875v-1h-0.6875zm1 0v1h1.8438v-1h-1.8438zm-16.031 2v1h0.8125v-1h-0.8125zm1.0312 0v1h1.625v-1h-1.625zm1.875 0v1h1.625v-1h-1.625zm2.125 0v1h2.5938v-1h-2.5938zm2.9062 0v1h3.375v-1h-3.375zm3.8438 0v1h2.2812v-1h-2.2812zm2.5625 0v1h0.532v-1h-0.531zm-20.468-20v1h3.0625v-1h-3.062zm0 2v1h3.0938v-1h-3.094zm0-11v1h2.375v-1h-2.375zm2.6875 0v1h2.25v-1h-2.25zm2.5625 0v1h1.9688v-1h-1.9688zm2.2812 0v1h0.875v-1h-0.875zm1.1875 0v1h1.9375v-1h-1.9375zm2.2812 0v1h5v-1h-5zm-11 2l0.001 1h3.7812v-1h-3.7812zm4.1562 0v1h1.8125v-1h-1.8125zm2.1562 0v1h0.84375v-1h-0.84375zm1.2188 0v1h1.625v-1h-1.625zm2 0v1h1.625v-1h-1.625zm1.9688 0v1h2.6562v-1h-2.6562zm3.0312 0v1h3.4688v-1h-3.4688zm-14.53 2v1h4.1875v-1h-4.188zm4.5 0v1h4.5v-1h-4.5zm-4.5 2v1h2.3125v-1h-2.312zm2.625 0v1h2.1562v-1h-2.1562zm2.4688 0v1h1.9062v-1h-1.9062zm3.8125 5v1h1.9062v-1h-1.9062zm2.2188 0v1h1.9062v-1h-1.9062zm2.2188 0v1h2.75v-1h-2.75zm3.0938 0v1h0.5625v-1h-0.5625zm-7.438 7v1h2.3438v-1h-2.344zm2.6562 0v1h2.1875v-1h-2.1875zm2.5 0v1h1.844v-1h-1.844zm-5.156 2v1h1.875v-1h-1.875zm2.1875 0v1h4.8125v-1h-4.8125zm5.125 0v1h3.6875v-1h-3.6875zm-7.313 2v1h2.4375v-1h-2.438zm2.7812 0v1h4.2812v-1h-4.2812zm4.5938 0v1h2.9375v-1h-2.9375zm-7.375 2.125v0.96875h1.875v-0.96875h-1.875zm2.1875 0v0.96875h1.9062v-0.96875h-1.9062zm2.2188 0v0.96875h2.7188v-0.96875h-2.7188zm3.0312 0v0.96875h0.5625v-0.96875h-0.5625zm0.875 0v0.96875h3.5312v-0.96875h-3.5312zm-8.375 6.875v1h2.4375v-1h-2.4375zm2.75 0v1h2.25v-1h-2.25zm2.5938 0v1h1.9375v-1h-1.9375zm2.25 0v1h3.0938v-1h-3.0938zm3.4375 0v1h5.0312v-1h-5.0312z" fill="url(#k)"/>
-  <g stroke-linejoin="round" style="color:#000000" font-family="Droid Sans" fill="url(#a)" stroke="url(#c)" font-size="32px" font-weight="bold" line-height="125%" stroke-width=".99227">
-   <path stroke="url(#c)" d="m25.746 18.293h4.5664l2.4609 8.5996 0.60156 2.2695c0.03645-0.2552 0.07747-0.51497 0.12305-0.7793 0.04556-0.26432 0.09569-0.52408 0.15039-0.7793 0.06379-0.26432 0.1276-0.5013 0.19141-0.71094l2.4062-8.5996h4.5938l-6.043 17.24c-0.56511 1.6133-1.3353 2.8118-2.3105 3.5957-0.97527 0.78385-2.1966 1.1758-3.6641 1.1758-0.47396-0.000006-0.88412-0.02735-1.2305-0.08203-0.34636-0.04558-0.64258-0.09571-0.88867-0.15039v-3.3086c0.1914 0.04557 0.43294 0.08658 0.72461 0.12305 0.29166 0.03646 0.597 0.05468 0.91602 0.05469 0.4375-0.000003 0.81119-0.05925 1.1211-0.17773 0.30989-0.11849 0.57421-0.28711 0.79297-0.50586 0.22786-0.20964 0.41927-0.46484 0.57422-0.76562 0.16406-0.30078 0.30533-0.63802 0.42383-1.0117l0.25977-0.76562-5.7695-15.422m-11.406 3.1914h0.95312c1.3646 0.000012 2.3906-0.27082 3.0781-0.8125 0.6979-0.54165 1.0469-1.4219 1.0469-2.6406-0.000013-1.1354-0.31251-1.9739-0.9375-2.5156-0.6146-0.54165-1.5833-0.81248-2.9062-0.8125h-1.2344v6.7812m9.9844-3.625c-0.000018 1-0.15106 1.9583-0.45312 2.875-0.3021 0.91668-0.8021 1.724-1.5 2.4219-0.68752 0.69793-1.599 1.2552-2.7344 1.6719-1.125 0.41668-2.5208 0.62501-4.1875 0.625h-1.1094v8.125h-4.8438v-22.844h6.3438c1.4687 0.000023 2.7344 0.16669 3.7969 0.5 1.0729 0.32294 1.9531 0.79169 2.6406 1.4062 0.6979 0.60419 1.2135 1.349 1.5469 2.2344 0.33332 0.87502 0.49998 1.8698 0.5 2.9844" fill="url(#a)"/>
-  </g>
-  <g stroke-linejoin="round" fill="none">
-   <path opacity=".8" style="color:#000000" d="m10.469 11.719v20.875h2.9062v-7.1562a0.97158 0.97158 0 0 1 0.96875 -0.96875h1.0938c1.5857 0.000008 2.8653-0.20009 3.8438-0.5625 1.0403-0.38177 1.8488-0.8716 2.4062-1.4375 0.60221-0.60221 0.9956-1.2593 1.25-2.0312 0.26608-0.80746 0.40623-1.6502 0.40625-2.5625-0.000016-1.0177-0.1544-1.913-0.4375-2.6562-0.28511-0.75726-0.68346-1.3533-1.25-1.8438a0.97158 0.97158 0 0 1 -0.031 -0.03c-0.5457-0.48779-1.2973-0.86009-2.2812-1.1562-0.94313-0.29586-2.1047-0.46873-3.5-0.46875h-5.375z" stroke="url(#h)"/>
-   <path opacity=".8" style="color:#000000" d="m14.188 13.719a0.97158 0.97158 0 0 1 0.15625 0h1.2188c1.444 0.000021 2.6588 0.30588 3.5312 1.0625 0.0069 0.006 0.02437-0.0061 0.03125 0l-0.03125 0.03125c0.8717 0.76818 1.2812 1.915 1.2812 3.2188-0.000015 1.3862-0.43158 2.6369-1.4062 3.4062h-0.03125c-0.93629 0.7268-2.1746 1.0313-3.6562 1.0312h-0.9375a0.97158 0.97158 0 0 1 -0.969 -0.969v-6.8125a0.97158 0.97158 0 0 1 0.8125 -0.96875z" stroke="url(#g)"/>
-   <path opacity=".8" style="color:#000000" d="m27.156 19.25 5.2812 14.125c0.08288 0.21909 0.08288 0.46841 0 0.6875l-0.25 0.6875-0.03125 0.0625c-0.11452 0.35874-0.24034 0.75454-0.4375 1.125-0.0067 0.01252-0.02443 0.01874-0.03125 0.03125-0.21274 0.39778-0.48826 0.72429-0.75 0.96875-0.01011 0.01011-0.02099 0.02128-0.03125 0.03125-0.30722 0.29848-0.68482 0.53114-1.0938 0.6875-0.43825 0.16756-0.9291 0.25-1.4688 0.25-0.23646-0.000002-0.44385-0.01211-0.65625-0.03125v1.375c0.01198 0.0016 0.01908-0.0016 0.03125 0 0.01042-0.000168 0.02083-0.000168 0.03125 0 0.30338 0.0479 0.64191 0.09374 1.0625 0.09375 1.2893-0.000006 2.3062-0.33575 3.0938-0.96875 0.79412-0.63827 1.4766-1.6621 2-3.1562l5.594-15.969h-2.5l-2.2188 7.9062c0.000168 0.01042 0.000168 0.02083 0 0.03125-0.05961 0.19584-0.12825 0.37949-0.1875 0.625-0.05465 0.25498-0.08383 0.47993-0.125 0.71875-0.04289 0.24875-0.09138 0.48621-0.125 0.71875-0.0011 0.0099 0.001 0.02129 0 0.03125l-1.0312 1.5625c-0.488-0.552-0.84-1.577-1.188-2.313-0.058-0.485-0.153-0.926-0.281-1.343l-2.282-7.938z" stroke="url(#i)"/>
-  </g>
- </g>
-</svg>
diff --git a/core/img/filetypes/text.png b/core/img/filetypes/text.png
index 73080fb3ea..5fca7cb69d 100644
Binary files a/core/img/filetypes/text.png and b/core/img/filetypes/text.png differ
diff --git a/core/img/filetypes/text.svg b/core/img/filetypes/text.svg
index 32685b586c..6637aacdd8 100644
--- a/core/img/filetypes/text.svg
+++ b/core/img/filetypes/text.svg
@@ -1,39 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="j" x1="22.004" gradientUnits="userSpaceOnUse" y1="47.813" gradientTransform="matrix(.66858 0 0 .67037 -.67962 -2.3083)" x2="22.004" y2="3.3639">
-   <stop stop-color="#aaa" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#fff" offset="0"/>
-   <stop stop-color="#fff" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#fff" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#fff" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="l" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="m" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="k" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#k)"/>
- <path opacity=".15" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z" fill="url(#m)"/>
- <path opacity=".15" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z" fill="url(#l)"/>
- <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#i)"/>
- <g fill="none">
-  <path stroke-linejoin="round" stroke="url(#h)" stroke-linecap="round" d="m26.5 28.5h-21v-27h21z"/>
-  <path opacity=".3" stroke-linejoin="round" stroke="#000" stroke-width=".99992" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z"/>
-  <path stroke="url(#j)" stroke-width="1px" d="m8 5.5677h1.567zm1.7968 0h1.4625zm1.6924 0h1.2954zm1.5043 0h0.56412zm0.79394 0h1.2536zm1.5043 0h3.3011zm3.5101 0h2.5281zm2.737 0h0.77305zm-13.539 1.9218h2.0684zm2.2774 0h3.3847zm3.5936 0h1.6506zm1.8595 0h1.5461zm1.755 0h1.3163zm1.5252 0 2.0684 0.020955zm2.2565 0.020955h3.3638zm-13.266 1.9895h2.8624zm3.0922 0h3.0922zm3.3011 0h1.2327zm1.4416 0h2.9042zm3.0922 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327zm-14.813 2h1.0656zm1.3998 0h3.9488zm-1.3998 3h2.6325zm2.8415 0h2.8206zm3.0295 0h1.0864zm1.2954 0h2.6534zm2.8624 0h3.3429zm3.5727 0h1.2327zm-13.602 2h2.8624zm3.0922 0h3.0922zm3.3011 0h1.2327zm1.4416 0h2.9042zm3.0922 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327zm-14.813 2h2.4445zm2.7161 0h1.17zm1.379 0h0.58501zm0.81484 0h1.0656zm1.2954 0h1.0864zm1.2954 0h1.7341zm1.964 0h2.2565zm2.4654 0h1.5043zm1.7132 0h0.37608zm-13.643 2.9895h2.0684zm2.2774 0h3.3847zm3.5936 0h1.6506zm1.8595 0h1.5461zm1.755 0h1.3163zm1.5252 0 2.0684 0.02095zm2.2565 0.02095h3.3638zm-13.266 1.989h2.5908zm2.8206 0h0.81484zm1.0238 0h1.8595zm2.0684 0h2.737zm2.9668 0h1.8595zm2.0475 0h0.39697zm0.6059 0h2.3609zm2.6117 0h1.2327zm-14.145 2h2.5908zm2.8206 0h1.17zm1.379 0h1.8386zm2.0475 0h1.9849zm2.2147 0h0.79394zm1.0029 0h0.43876zm0.66858 0h1.2327z"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3496 1.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0 0.23 0.2061 0.438 0.4316 0.438h11.138c0.226 0 0.432-0.208 0.432-0.438v-10.142c-0.004-0.0669-0.023-0.133-0.055-0.1915l-3.312-3.1992c-0.043-0.0164-0.089-0.0255-0.135-0.0273h-8.0684c-0.0268-0.00265-0.0552-0.00265-0.082 0zm1.6504 1.998h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/video.png b/core/img/filetypes/video.png
index a5793d6eb1..308e81cca8 100644
Binary files a/core/img/filetypes/video.png and b/core/img/filetypes/video.png differ
diff --git a/core/img/filetypes/video.svg b/core/img/filetypes/video.svg
index b54e08bdf2..1acf7fc697 100644
--- a/core/img/filetypes/video.svg
+++ b/core/img/filetypes/video.svg
@@ -1,92 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <radialGradient id="h" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(1.603 0 0 0.6 541.99 860.76)" r="2.5"/>
-  <linearGradient id="b">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="g" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="43.5" cx="4.993" gradientTransform="matrix(1.603 0 0 0.6 -535.01 -912.96)" r="2.5"/>
-  <linearGradient id="u" x1="25.058" xlink:href="#b" spreadMethod="reflect" gradientUnits="userSpaceOnUse" y1="43.544" gradientTransform="matrix(.82143 0 0 .42857 518.79 868.22)" x2="25.058" y2="39.999"/>
-  <radialGradient id="f" gradientUnits="userSpaceOnUse" cy="8.4498" cx="7.4957" gradientTransform="matrix(-.0095987 1.5579 -1.4869 -.024192 551.14 849.78)" r="20">
-   <stop stop-color="#f8b17e" offset="0"/>
-   <stop stop-color="#e35d4f" offset=".26238"/>
-   <stop stop-color="#c6262e" offset=".66094"/>
-   <stop stop-color="#690b54" offset="1"/>
-  </radialGradient>
-  <linearGradient id="t" x1="547" xlink:href="#e" gradientUnits="userSpaceOnUse" x2="547" y1="887.36" y2="860.36"/>
-  <linearGradient id="e" x1="24" gradientUnits="userSpaceOnUse" y1="44" gradientTransform="matrix(2.641 0 0 2.641 .61539 -60.385)" x2="24" y2="3.899">
-   <stop stop-color="#791235" offset="0"/>
-   <stop stop-color="#bf1d09" offset="1"/>
-  </linearGradient>
-  <linearGradient id="s" x1="24" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.37838 0 0 .64865 529.42 858.29)" x2="24" y2="43"/>
-  <linearGradient id="c" x1="24" gradientUnits="userSpaceOnUse" y1="5.3301" gradientTransform="matrix(2.7297 0 0 2.7297 -1.5135 -62.513)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".029825"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".96141"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="r" x1="24" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(.10811 0 0 .64865 524.91 858.29)" x2="24" y2="43"/>
-  <linearGradient id="q" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1306.1 -122.39)" x2="532" y2="812.36"/>
-  <linearGradient id="a">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="p" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1300.1 -122.39)" x2="532" y2="812.36"/>
-  <linearGradient id="o" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1294.1 -122.39)" x2="532" y2="812.36"/>
-  <linearGradient id="n" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1288.1 -122.39)" x2="532" y2="812.36"/>
-  <linearGradient id="m" x1="24" xlink:href="#c" gradientUnits="userSpaceOnUse" y1="5" gradientTransform="matrix(-.10811 0 0 .64865 552.09 858.29)" x2="24" y2="43"/>
-  <linearGradient id="l" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1306.1 -1199.4)" x2="532" y2="812.36"/>
-  <linearGradient id="k" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1300.1 -1199.4)" x2="532" y2="812.36"/>
-  <linearGradient id="j" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1294.1 -1199.4)" x2="532" y2="812.36"/>
-  <linearGradient id="i" x1="526" xlink:href="#a" gradientUnits="userSpaceOnUse" y1="812.36" gradientTransform="matrix(0.8 0 0 0.8 -1288.1 -1199.4)" x2="532" y2="812.36"/>
-  <linearGradient id="d" x1="598.77" xlink:href="#e" gradientUnits="userSpaceOnUse" x2="598.77" y1="475.7" y2="448.3"/>
- </defs>
- <g transform="translate(0 -1020.4)">
-  <g transform="translate(-523 163)">
-   <rect opacity=".4" height="3" width="4" y="885.36" x="550" fill="url(#h)"/>
-   <rect opacity=".4" transform="scale(-1)" height="3" width="4" y="-888.36" x="-527" fill="url(#g)"/>
-   <rect opacity=".4" height="3" width="23" y="885.36" x="527" fill="url(#u)"/>
-   <g stroke-linecap="round">
-    <rect stroke-linejoin="round" style="color:#000000" height="26" width="16" stroke="url(#t)" x="530.5" y="860.86" fill="url(#f)"/>
-    <rect opacity=".5" stroke-linejoin="round" height="24" width="14" stroke="url(#s)" x="531.5" y="861.86" fill="none"/>
-    <path style="color:#000000" d="m525.5 860.86c-0.554 0-1 0.446-1 1v24c0 0.554 0.446 1 1 1h5v-26h-5zm1 3h1 1v2h-2v-2zm0 6h2v2h-2v-2zm0 6h2v2h-2v-2zm0 6h2v2h-1-1v-2z" fill-opacity=".78431" stroke="#000"/>
-   </g>
-   <g fill="none">
-    <path opacity=".3" d="m525.5 861.86v24h1 3v-3-18-3h-3-1z" stroke="url(#r)" stroke-linecap="round"/>
-    <g stroke-linejoin="round">
-     <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#q)" x="-884.86" y="525.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#p)" x="-878.86" y="525.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#o)" x="-872.86" y="525.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="rotate(-90)" width="4" stroke="url(#n)" x="-866.86" y="525.5" height="4"/>
-    </g>
-   </g>
-   <g>
-    <g fill-rule="evenodd">
-     <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="863.36" x="526"/>
-     <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="869.36" x="526"/>
-     <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="875.36" x="526"/>
-     <rect opacity=".4" rx="1" ry="1" height="3" width="3" y="881.36" x="526"/>
-    </g>
-    <path style="color:#000000" d="m551.5 860.86c0.554 0 1 0.446 1 1v24c0 0.554-0.446 1-1 1h-5v-26h5zm-1 3h-1-1v2h2v-2zm0 6h-2v2h2v-2zm0 6h-2v2h2v-2zm0 6h-2v2h1 1v-2z" fill-opacity=".78431" stroke="#000" stroke-linecap="round"/>
-   </g>
-   <g fill="none">
-    <path opacity=".3" d="m551.5 861.86v24h-1-3v-3-18-3h3 1z" stroke="url(#m)" stroke-linecap="round"/>
-    <g stroke-linejoin="round">
-     <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#l)" x="-884.86" y="-551.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#k)" x="-878.86" y="-551.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#j)" x="-872.86" y="-551.5" height="4"/>
-     <rect opacity=".12" ry="1" rx="1" transform="matrix(0,-1,-1,0,0,0)" width="4" stroke="url(#i)" x="-866.86" y="-551.5" height="4"/>
-    </g>
-   </g>
-   <g fill-rule="evenodd">
-    <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="863.36" x="-551"/>
-    <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="869.36" x="-551"/>
-    <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="875.36" x="-551"/>
-    <rect opacity=".4" transform="scale(-1,1)" rx="1" ry="1" height="3" width="3" y="881.36" x="-551"/>
-   </g>
-   <path opacity="0.32" stroke-linejoin="round" d="m599.62 474.79v-25.573l22.14 12.78z" fill-rule="evenodd" transform="matrix(.45152 0 0 .43013 262.76 675.64)" stroke="url(#d)" stroke-width="2.2691" fill="url(#d)"/>
-   <path stroke-linejoin="round" d="m599.62 474.79v-25.573l22.14 12.78z" fill-rule="evenodd" transform="matrix(.36122 0 0 .35193 317.91 710.77)" stroke="#FFF" stroke-width="2.8047" fill="#fafafa"/>
-  </g>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m1.3438 2c-0.1975 0.0382-0.34736 0.2334-0.3438 0.4375v11.125c0 0.229 0.212 0.438 0.4375 0.438h13.125c0.22555-0.000006 0.4375-0.20846 0.4375-0.4375v-10.953c0-0.3362-0.265-0.611-0.516-0.609zm0.6562 1h12v10h-12zm3 2v6l6-3z" fill="#969696"/>
 </svg>
diff --git a/core/img/filetypes/web.png b/core/img/filetypes/web.png
deleted file mode 100644
index 3306321246..0000000000
Binary files a/core/img/filetypes/web.png and /dev/null differ
diff --git a/core/img/filetypes/web.svg b/core/img/filetypes/web.svg
deleted file mode 100644
index 5b5a9c3b77..0000000000
--- a/core/img/filetypes/web.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <radialGradient id="c" gradientUnits="userSpaceOnUse" cy="24.149" cx="17.814" gradientTransform="matrix(-2.644 0 2.9365e-8 2.5344 78.725 -37.986)" r="9.125">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#b6b6b6" offset="1"/>
-  </radialGradient>
-  <linearGradient id="e" x1="62.2" gradientUnits="userSpaceOnUse" y1="-12.489" gradientTransform="matrix(1.4102 0 0 1.4102 -71.718 20.951)" x2="62.2" y2="-1.4615">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" gradientUnits="userSpaceOnUse" cy="-8.7256" cx="61.24" gradientTransform="matrix(0 2.3489 -2.3489 0 -4.496 -137.2)" r="9.7553">
-   <stop stop-color="#51cfee" offset="0"/>
-   <stop stop-color="#49a3d2" offset=".26238"/>
-   <stop stop-color="#3470b4" offset=".70495"/>
-   <stop stop-color="#273567" offset="1"/>
-  </radialGradient>
-  <linearGradient id="d" x1="20" gradientUnits="userSpaceOnUse" y1="43" gradientTransform="matrix(.65334 0 0 .65333 .059960 .58024)" x2="20" y2="2.6887">
-   <stop stop-color="#254b6d" offset="0"/>
-   <stop stop-color="#415b73" offset=".5"/>
-   <stop stop-color="#6195b5" offset="1"/>
-  </linearGradient>
-  <radialGradient id="a" gradientUnits="userSpaceOnUse" cy="4.625" cx="62.625" gradientTransform="matrix(1.4431 0 0 .58311 -74.376 23.108)" r="10.625">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </radialGradient>
- </defs>
- <path opacity=".4" fill="url(#a)" d="m31.333 25.804a15.333 6.1955 0 0 1 -30.667 0 15.333 6.1955 0 1 1 30.667 0z" fill-rule="evenodd"/>
- <path d="m29 15.999c0 7.18-5.821 13.001-13 13.001-7.1793 0-13-5.821-13-13.001 0-7.179 5.8207-12.999 13-12.999 7.179 0 13 5.8199 13 12.999z" stroke="url(#d)" stroke-width=".66667" fill="url(#b)"/>
- <path opacity=".4" d="m16.219 3.4688l-1.563 0.1874-1.75 0.4688c0.148-0.0517 0.316-0.1067 0.469-0.1562l-0.219-0.3438-0.656 0.0938-0.344 0.3124-0.531 0.0938-0.469 0.2188-0.218 0.0937-0.063 0.0937-0.344 0.0626-0.219 0.4374-0.25-0.5312-0.0932 0.2188 0.0312 0.5937-0.4062 0.375-0.25 0.6563h0.5l0.2182-0.4376 0.063-0.1562c0.228-0.1612 0.456-0.3448 0.687-0.5l0.532 0.1875c0.08 0.055 0.169 0.101 0.25 0.1563l-1.532 0.3124 0.5 0.375h0.126c-1.3646 1.3155-3.5724 3.8488-4.1255 8.2808 0.024 0.113 0.4375 0.782 0.4375 0.782l1 0.562 0.9688 0.282 0.4374 0.531 0.6558 0.5 0.376-0.094 0.281 0.156v0.094l-0.375 1-0.282 0.437 0.094 0.188-0.2498 0.812 0.8438 1.532 0.844 0.75 0.406 0.531-0.062 1.125 0.281 0.656-0.281 1.219c-0.005 0.013-0.019 0.032 0 0.094 0.036 0.123 1.5 0.944 1.593 0.875 0.093-0.071 0.188-0.125 0.188-0.125l-0.094-0.281 0.375-0.344 0.156-0.375 0.594-0.219 0.469-1.156-0.125-0.344 0.312-0.469 0.719-0.187 0.375-0.844-0.094-1.062 0.563-0.782 0.093-0.812c-0.771-0.384-1.546-0.793-2.312-1.188l-0.375-0.718-0.687-0.157-0.407-1.031-0.906 0.125-0.813-0.594-0.843 0.75v0.094c-0.256-0.074-0.585-0.079-0.8128-0.219l-0.1562-0.531v-0.594l-0.5938 0.063c0.0471-0.374 0.1089-0.752 0.1563-1.125h-0.3437l-0.3438 0.437-0.3125 0.156-0.4687-0.281-0.0313-0.562 0.0937-0.657 0.6876-0.531h0.5624l0.125-0.312 0.6876 0.156 0.5002 0.656 0.093-1.093 0.907-0.719 0.312-0.813 0.688-0.25 0.343-0.562 0.876-0.1565 0.406-0.625h-1.282l0.813-0.375h0.563l0.718-0.25 0.156 0.6875 0.313-0.5-0.375-0.25 0.094-0.2812-0.282-0.2813-0.312-0.0625 0.062-0.3438-0.218-0.4687-0.156 0.0625 0.468-0.7188c0.759-0.2351 1.44-0.4872 2.156-0.8124l-0.062 0.3124 0.375 0.25 0.625-0.4374-0.312-0.3438-0.438 0.2188-0.125-0.0313c0.031-0.0142 0.063-0.0168 0.094-0.0313l0.625-1.625-1.375-0.5624zm-3.563 0.7812l-0.344 0.3125 0.876 0.5937 0.593-0.1874-0.406 0.2812h-0.063l0.219 0.1562v0.4688l-0.469 0.5 0.126 0.25-0.5 0.875 0.031 0.3125-0.5 0.2187-0.313 0.6876-0.156-0.6563-0.875-0.3437-0.156-0.5 1.187-0.6876 0.438-0.4062c0.019 0.0129 0.043 0.0183 0.062 0.0312l0.5-0.4687-0.437-0.1875v-0.0312l-0.063-0.0313-0.062 0.0313-0.032-0.0313 0.063-0.0313-0.094-0.0312-0.219-0.4688-1-0.125-0.031-0.0937 0.438 0.0625 0.25-0.25 0.531-0.0938c0.128-0.0622 0.277-0.1055 0.406-0.1562zm-0.281 1.1562l0.031 0.0313 0.906-0.1875-0.124-0.0938-0.813 0.25zm11.687 0l-0.25 0.1563v0.3437l-0.937 0.5938 0.187 0.875 0.532-0.375 0.344 0.375 0.374 0.2188 0.25-0.6563-0.124-0.375 0.124-0.2813 0.282-0.25c-0.251-0.2223-0.515-0.4216-0.782-0.625zm-12.437 0.25l-0.063 0.1876s-0.398 0.0687-0.5 0.0937c-0.019 0.018-0.042 0.0438-0.062 0.0625v-0.1562l0.625-0.1876zm13.5 0.625l-0.031 0.0626v0.5c0.162-0.0442 0.335-0.0728 0.5-0.0938-0.154-0.159-0.308-0.3175-0.469-0.4688zm-3.687 0.0626v0.3437l0.218 0.25v0.5313l-0.125 0.7187 0.594-0.125 0.406-0.4063-0.375-0.375c-0.124-0.3308-0.251-0.6201-0.406-0.9374h-0.312zm4.218 0.4687l-0.5 0.375-0.062 0.25-0.719 0.625-0.719-0.1875v-0.4375l-0.344 0.2187 0.157 0.4063h-0.531l-0.313 0.5-0.344 0.4063-0.656 0.125 0.375 0.375 0.094 0.375h-0.469l-0.625 0.3442v1h0.281l0.281 0.281 0.594-0.281 0.219-0.594 0.469-0.282 0.094-0.218 0.718-0.1878 0.406 0.4378 0.407 0.25-0.25 0.468 0.406-0.093 0.187-0.5-0.5-0.5628h0.219l0.5 0.4058 0.063 0.532 0.437 0.5 0.125-0.719 0.219-0.125c0.239 0.249 0.423 0.563 0.625 0.844l0.75 0.031 0.406 0.281-0.187 0.282-0.438 0.406h-0.625l-0.812-0.282-0.438 0.063-0.312 0.344-0.906-0.907-0.626-0.187-0.937 0.125-0.813 0.219c-0.462 0.524-0.937 1.049-1.374 1.593l-0.5 1.282 0.25 0.281-0.469 0.625 0.5 1.156c0.412 0.467 0.838 0.94 1.25 1.406l0.593-0.531 0.25 0.313 0.657-0.406 0.219 0.25h0.656l0.375 0.406-0.219 0.781 0.469 0.531-0.031 0.875 0.343 0.657-0.25 0.562c-0.024 0.404-0.062 0.815-0.062 1.219 0.198 0.547 0.406 1.073 0.593 1.625l0.126 0.875v0.469h0.218c0.885-0.838 1.651-1.794 2.282-2.844 0.482-0.804 0.881-1.661 1.187-2.563v-0.656l0.437-0.937c0.179-0.869 0.282-1.768 0.282-2.688 0-3.561-1.408-6.7926-3.688-9.1875zm-4.718 0.25l-0.344 0.125 0.094 0.6563 0.468-0.25-0.218-0.5313zm6.593 5.9375l0.531 0.625 0.657 1.406 0.406 0.438-0.187 0.469 0.343 0.437c-0.165 0.011-0.33 0.031-0.5 0.031-0.308-0.649-0.546-1.32-0.781-2l-0.406-0.437-0.219-0.813 0.156-0.156z"/>
- <path opacity=".4" d="m28.333 15.999c0 6.812-5.5222 12.334-12.333 12.334-6.8111 0-12.333-5.5221-12.333-12.334-0.0003-6.811 5.5216-12.332 12.333-12.332 6.8107 0 12.333 5.5215 12.333 12.333z" stroke="url(#e)" stroke-width=".66667" fill="none"/>
- <g transform="matrix(.66660 -.0091343 .0091343 .66660 -.19246 .35724)">
-  <path stroke-linejoin="round" stroke="#666" fill="url(#c)" d="m30.5 20.937 17 16.5-7.75 0.25s3.25 6.75 3.25 6.75c1 3-3.5 4.125-4.25 1.875l-3-6.75-5.5 5.875 0.25-24.5z" fill-rule="evenodd"/>
-  <path opacity=".4" stroke="#FFF" d="m31.657 23.379 13.476 13.186-6.9219 0.27746s3.8721 7.7566 3.8721 7.7566c0.40273 1.6501-2.0283 2.4126-2.5071 1.1529l-3.6831-7.845-4.4247 4.7083 0.18907-19.236z" fill="none"/>
- </g>
-</svg>
diff --git a/core/img/filetypes/x-office-document.png b/core/img/filetypes/x-office-document.png
index 6c0c4f8c22..d9c5b89058 100644
Binary files a/core/img/filetypes/x-office-document.png and b/core/img/filetypes/x-office-document.png differ
diff --git a/core/img/filetypes/x-office-document.svg b/core/img/filetypes/x-office-document.svg
index eb2368722e..c9e404a03f 100644
--- a/core/img/filetypes/x-office-document.svg
+++ b/core/img/filetypes/x-office-document.svg
@@ -1,53 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="f" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.66892 0 0 .72973 1.8209 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.1779e-7 4.3522 -5.8956 -1.3064e-7 75.942 -39.435)" r="12.672">
-   <stop stop-color="#90dbec" offset="0"/>
-   <stop stop-color="#55c1ec" offset=".26238"/>
-   <stop stop-color="#3689e6" offset=".70495"/>
-   <stop stop-color="#2b63a0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="i" x1="21.982" gradientUnits="userSpaceOnUse" x2="21.982" gradientTransform="translate(-2.9821 -6.0421)" y1="36.042" y2="6.0421">
-   <stop stop-color="#AAA" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="e" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#e)"/>
-  <path opacity=".15" fill="url(#c)" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z"/>
-  <path opacity=".15" fill="url(#d)" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z"/>
- </g>
- <path d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" fill="url(#g)"/>
- <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#h)" stroke-linecap="round" fill="none"/>
- <path d="m11 5.505h1.3436zm1.6874 0h2.1875zm2.5312 0h1.9375zm2.25 0h0.84375zm1.1875 0h1.875zm2.25 0h3.0938zm-9.9061 2h2.6561zm3.0624 0h1.75zm2.0625 0h0.875zm1.2188 0h1.5938zm1.9375 0h1.625zm1.9375 0h2.5938zm-10.219 1.995h3.2811zm3.6249 0h4.625zm4.9375 0h1.8438zm-9.906 2h1.5938zm1.0936 0h5.9062zm-1.0936 3.0372h2.0936zm2.4061 0h5.0625zm5.375 0h2.4688zm2.7812 0h2.3125zm-10.562 1.963h1.3436zm1.6874 0h2.1562zm2.5312 0h1.9375zm2.25 0h0.84375zm1.1875 0h1.875zm2.25 0h3.0938zm-9.9061 2.0753h3.2811zm3.6249 0h4.625zm4.9375 0h1.8438zm-8.562 2.925h2.0936zm2.4061 0h5.0625zm5.375 0h2.4688zm-7.7811 2h2.8749zm3.2186 0h1.2188zm1.5312 0h2.7812zm3.0938 0h4.0938zm-7.8436 2h2.8749zm3.2186 0h1.75zm2.0625 0h2.75zm3.0625 0h2.9688z" stroke="url(#i)" stroke-width="1px" fill="none"/>
- <path style="color:#000000" fill="url(#b)" d="m8.0261 29.5h-3.3605c-0.31067-0.34338-0.074432-1.0251-0.14825-1.5112v-27.322l0.043327-0.11794 0.10492-0.048698h3.3084"/>
- <path opacity=".5" stroke-linejoin="round" d="m8.5 28.5h-3v-27h3" stroke="url(#f)" fill="none"/>
- <path opacity=".3" stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="#000" stroke-width=".99992" fill="none"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3496 1.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0 0.23 0.2061 0.438 0.4316 0.438h11.138c0.226 0 0.432-0.208 0.432-0.438v-10.142c-0.004-0.0669-0.023-0.133-0.055-0.1915l-3.312-3.1992c-0.043-0.0164-0.089-0.0255-0.135-0.0273h-8.0684c-0.0268-0.00265-0.0552-0.00265-0.082 0zm1.6504 1.998h6v1h-6v-1zm0 3h5v1h-5v-1zm0 3h8v1h-8v-1zm0 3h4v1h-4v-1z" fill="#49abea"/>
 </svg>
diff --git a/core/img/filetypes/x-office-presentation.png b/core/img/filetypes/x-office-presentation.png
index b129c76de6..5b3733b712 100644
Binary files a/core/img/filetypes/x-office-presentation.png and b/core/img/filetypes/x-office-presentation.png differ
diff --git a/core/img/filetypes/x-office-presentation.svg b/core/img/filetypes/x-office-presentation.svg
index 534e695537..4df4b40135 100644
--- a/core/img/filetypes/x-office-presentation.svg
+++ b/core/img/filetypes/x-office-presentation.svg
@@ -1,108 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="q" x1="24" gradientUnits="userSpaceOnUse" y1="3.5542" gradientTransform="matrix(.72973 0 0 .56757 -1.5146 3.3784)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".11257"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="p" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.82857 0 0 .49975 -3.8857 4.2392)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="o" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.66907 0 0 .46769 45.34 3.6823)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.019278 0 0 .0082353 17.982 24.981)" r="117.14"/>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.019278 0 0 .0082353 14.018 24.981)" r="117.14"/>
-  <linearGradient id="n" x1="302.86" gradientUnits="userSpaceOnUse" y1="366.65" gradientTransform="matrix(.056331 0 0 .0082353 -4.3598 24.981)" x2="302.86" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="m" x1="24" gradientUnits="userSpaceOnUse" x2="24" gradientTransform="matrix(.66892 0 0 .56757 -1.179 3.3784)" y1="5.5641" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <radialGradient id="b" fx="7.2758" gradientUnits="userSpaceOnUse" cy="9.9571" cx="7.8061" gradientTransform="matrix(-1.3251e-7 3.4517 -6.6326 -1.0361e-7 81.872 -26.173)" r="12.672">
-   <stop stop-color="#f9c590" offset="0"/>
-   <stop stop-color="#f19860" offset=".39698"/>
-   <stop stop-color="#ce5d36" offset="1"/>
-  </radialGradient>
-  <linearGradient id="l" x1="25" gradientUnits="userSpaceOnUse" x2="25" gradientTransform="matrix(.81963 0 0 .52284 -3.8316 5.2358)" y1="47.935" y2=".91791">
-   <stop stop-color="#71171c" offset="0"/>
-   <stop stop-color="#ed8137" offset="1"/>
-  </linearGradient>
-  <clipPath id="r">
-   <path style="color:#000000" fill="#FFF" d="m10.751-0.72642 19.105 0.025195v10.481l-19.105-0.025202z"/>
-  </clipPath>
-  <linearGradient id="k" x1="22.004" gradientUnits="userSpaceOnUse" y1="63.218" gradientTransform="matrix(1.3394 0 0 -1.9826 -11.198 94.863)" x2="22.004" y2="25.647">
-   <stop stop-color="#AAA" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="j" x1="25.132" gradientUnits="userSpaceOnUse" y1="15.285" gradientTransform="matrix(1.0813 0 0 .62485 -6.1735 -3.6471)" x2="25.132" y2="37.546">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="-51.786" gradientUnits="userSpaceOnUse" y1="41.798" gradientTransform="matrix(.87314 0 0 .58477 58.066 -4.3435)" x2="-51.786" y2="17.555">
-   <stop stop-color="#AAA" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="24" gradientUnits="userSpaceOnUse" y1="14.203" gradientTransform="matrix(1.0821 0 0 .61449 -5.648 -2.5358)" x2="24" y2="35.721">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="25.132" gradientUnits="userSpaceOnUse" y1="15.285" gradientTransform="matrix(1 0 0 .95617 -.49906 -2.93)" x2="25.132" y2="37.546">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="f" x1="-51.786" gradientUnits="userSpaceOnUse" y1="41.798" gradientTransform="matrix(.80750 0 0 .89483 58.911 -3.9957)" x2="-51.786" y2="17.555">
-   <stop stop-color="#AAA" offset="0"/>
-   <stop stop-color="#c8c8c8" offset="1"/>
-  </linearGradient>
-  <linearGradient id="e" x1="24" gradientUnits="userSpaceOnUse" y1="14.203" gradientTransform="matrix(1.0351 0 0 .98662 -.70292 -2.17)" x2="24" y2="35.721">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity="0" offset="1"/>
-  </linearGradient>
- </defs>
- <g>
-  <rect opacity=".15" height="2" width="27.2" y="28" x="2.4" fill="url(#n)"/>
-  <path opacity=".15" fill="url(#c)" d="m2.4 28v1.9999c-0.9928 0.004-2.4-0.448-2.4-1s1.1078-1 2.4-1z"/>
-  <path opacity=".15" fill="url(#d)" d="m29.6 28v1.9999c0.99276 0.0038 2.4-0.44808 2.4-1.0001 0-0.552-1.1078-0.99982-2.4-0.99982z"/>
- </g>
- <g stroke-linejoin="round" opacity=".5" clip-path="url(#r)" transform="matrix(1.6122 0 0 1.1261 -16.324 -7.0129)">
-  <path style="color:#000000" d="m13.531 7.5891h13.037v24.901h-13.037z" stroke="url(#f)" stroke-width=".74211" fill="url(#g)"/>
-  <path opacity=".6" style="color:#000000" d="m14.31 9.4115h11.413v22.194h-11.413z" stroke="url(#e)" stroke-width=".74211" fill="none"/>
- </g>
- <g stroke-linejoin="round" transform="translate(0,1)" stroke-width=".99992">
-  <path opacity=".75" style="color:#000000" d="m3.5 2.5 25 0.037621v16.962h-24.859z" stroke="url(#i)" fill="url(#j)"/>
-  <path opacity=".45" style="color:#000000" d="m4.5 3.5 23 0.016517-0.11298 14.984h-22.701z" stroke="url(#h)" fill="none"/>
- </g>
- <g>
-  <path stroke-linejoin="round" d="m1.5 5.5c6.6454 0 29 0.00149 29 0.00149l0.000036 22.999h-29v-23z" stroke="url(#o)" stroke-width=".99992" fill="url(#p)"/>
-  <path d="m29.5 27.5h-27v-21h27z" stroke="url(#q)" stroke-linecap="round" fill="none"/>
-  <path stroke-linejoin="round" style="color:#000000" d="m6 28.5h-4.3138c-0.3495-0.27233-0.083736-0.81302-0.16678-1.1986v-21.669l0.048743-0.093529 0.11803-0.038626h4.2551" stroke="url(#l)" fill="url(#b)"/>
- </g>
- <g fill="none">
-  <path opacity=".5" stroke-linejoin="round" d="m5.5 27.5h-3v-21h3" stroke="url(#m)" stroke-linecap="round"/>
-  <g stroke="#AAA" stroke-width="1px">
-   <path d="m11 8.5h4"/>
-   <path d="m16 8.5h2"/>
-   <path d="m19 8.5h1"/>
-   <path d="m21 8.5h2"/>
-  </g>
- </g>
- <g transform="matrix(1.1415 0 0 1.1415 -13.519 -19.587)">
-  <path opacity=".4" style="color:#000000" fill="#FFF" d="m34.75 25.813a3.8795 3.8795 0 1 1 -2.0522 -3.4222l-1.8273 3.4222z" transform="matrix(1.5701 0 0 1.5701 -16.478 -6.8527)"/>
-  <path opacity=".15" style="color:#000000" d="m34.75 25.813a3.8795 3.8795 0 1 1 -2.0522 -3.4222l-1.8273 3.4222z" transform="matrix(1.5701 0 0 1.5701 -16.478 -7.6015)"/>
- </g>
- <path style="block-progression:tb;text-indent:0;color:#000000;text-transform:none" d="m7.1562 25v-1h2.2188v1zm2.6562 0v-1h6.3438v1zm-2.6562-4v-1h2.9688v1zm3.7188 0v-1h2.3438v1zm2.9375 0v-1h1.1875v1zm-6.6562-4v-1h3.2812v1zm3.875 0v-1h1.6562v1zm2.2188 0v-1h1.75v1zm-6.0938-4v-1h3.2812v1zm3.9062 0v-1h2.3438v1z" fill="url(#k)"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m1.3438 2c-0.1975 0.0382-0.34736 0.2334-0.3438 0.4375v11.125c0 0.229 0.212 0.438 0.4375 0.438h13.125c0.22555-0.000006 0.4375-0.20846 0.4375-0.4375v-10.953c0-0.3362-0.265-0.611-0.516-0.609zm0.6562 3h12v6h-12z" fill="#f0965f"/>
 </svg>
diff --git a/core/img/filetypes/x-office-spreadsheet.png b/core/img/filetypes/x-office-spreadsheet.png
index 9efe6f2950..5a20026ebd 100644
Binary files a/core/img/filetypes/x-office-spreadsheet.png and b/core/img/filetypes/x-office-spreadsheet.png differ
diff --git a/core/img/filetypes/x-office-spreadsheet.svg b/core/img/filetypes/x-office-spreadsheet.svg
index aae8f3c95c..aac8c4e3f7 100644
--- a/core/img/filetypes/x-office-spreadsheet.svg
+++ b/core/img/filetypes/x-office-spreadsheet.svg
@@ -1,63 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32px" width="32px" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <defs>
-  <linearGradient id="j" x1="24" gradientUnits="userSpaceOnUse" y1="5.5641" gradientTransform="matrix(.56757 0 0 .72973 2.3784 -2.5135)" x2="24" y2="43">
-   <stop stop-color="#FFF" offset="0"/>
-   <stop stop-color="#FFF" stop-opacity=".23529" offset=".036262"/>
-   <stop stop-color="#FFF" stop-opacity=".15686" offset=".95056"/>
-   <stop stop-color="#FFF" stop-opacity=".39216" offset="1"/>
-  </linearGradient>
-  <linearGradient id="i" x1="25.132" gradientUnits="userSpaceOnUse" y1=".98521" gradientTransform="matrix(.65714 0 0 .63012 .22856 -1.0896)" x2="25.132" y2="47.013">
-   <stop stop-color="#f4f4f4" offset="0"/>
-   <stop stop-color="#dbdbdb" offset="1"/>
-  </linearGradient>
-  <linearGradient id="h" x1="-51.786" gradientUnits="userSpaceOnUse" y1="50.786" gradientTransform="matrix(.53064 0 0 .58970 39.27 -1.7919)" x2="-51.786" y2="2.9062">
-   <stop stop-color="#a0a0a0" offset="0"/>
-   <stop stop-color="#bebebe" offset="1"/>
-  </linearGradient>
-  <radialGradient id="d" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(.015663 0 0 .0082353 17.61 25.981)" r="117.14"/>
-  <linearGradient id="a">
-   <stop offset="0"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="c" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="486.65" cx="605.71" gradientTransform="matrix(-.015663 0 0 .0082353 14.39 25.981)" r="117.14"/>
-  <linearGradient id="e" x1="302.86" gradientUnits="userSpaceOnUse" x2="302.86" gradientTransform="matrix(.045769 0 0 .0082353 -.54232 25.981)" y1="366.65" y2="609.51">
-   <stop stop-opacity="0" offset="0"/>
-   <stop offset=".5"/>
-   <stop stop-opacity="0" offset="1"/>
-  </linearGradient>
-  <linearGradient id="b">
-   <stop stop-color="#a3c0d0" offset="0"/>
-   <stop stop-color="#5a8caa" offset="1"/>
-  </linearGradient>
-  <linearGradient id="g" x1="19.515" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="12.443" gradientTransform="matrix(.66298 0 0 .53532 -.83153 1.3896)" x2="19.515" y2="46.562"/>
-  <linearGradient id="f" x1="19.515" xlink:href="#b" gradientUnits="userSpaceOnUse" y1="12.443" gradientTransform="matrix(.53480 0 0 .65680 2.2155 -.57398)" x2="19.515" y2="46.562"/>
- </defs>
- <g>
-  <rect opacity=".15" height="2" width="22.1" y="29" x="4.95" fill="url(#e)"/>
-  <path opacity=".15" fill="url(#c)" d="m4.95 29v1.9999c-0.80662 0.0038-1.95-0.44807-1.95-1.0001 0-0.552 0.90012-0.99982 1.95-0.99982z"/>
-  <path opacity=".15" fill="url(#d)" d="m27.05 29v1.9999c0.80661 0.0038 1.95-0.44807 1.95-1.0001 0-0.552-0.90012-0.99982-1.95-0.99982z"/>
- </g>
- <path stroke-linejoin="round" d="m4.5 0.49996c5.2705 0 23 0.00185 23 0.00185l0.000028 28.998h-23v-29z" stroke="url(#h)" stroke-width=".99992" fill="url(#i)"/>
- <path stroke-linejoin="round" d="m26.5 28.5h-21v-27h21z" stroke="url(#j)" stroke-linecap="round" fill="none"/>
- <path d="m8.5605 7.7356h3.0828v17.645h-3.0828v-17.645z" fill="url(#f)"/>
- <path d="m11 6h12.036v2h-12.036v-2z" fill="url(#g)"/>
- <rect y="5.9254" width="3.0786" fill="#c0d4df" x="8.0005" height="2.0746"/>
- <g fill="none">
-  <path d="m15.5 5.5v20" stroke-opacity=".32418" stroke="#2c465d"/>
-  <path d="m23.333 8.5h-14.667" stroke="#6c6c6c"/>
-  <g stroke-opacity=".32418" stroke="#2c465d">
-   <path d="m23.334 10.5h-14.667"/>
-   <path d="m23.5 13.5h-15"/>
-   <path d="m23.5 16.5h-15"/>
-   <path d="m23.5 19.5h-15"/>
-  </g>
- </g>
- <path opacity=".2" stroke-linejoin="round" d="m8.5005 6.5093 13.946-0.0186" fill-rule="evenodd" stroke="#FFF" stroke-linecap="square" fill="#FFF"/>
- <g fill="none">
-  <path d="m11.5 5.5v20" stroke="#6c6c6c"/>
-  <rect height="19.998" width="14.998" stroke="#6c6c6c" stroke-linecap="square" x="8.5011" y="5.5011" stroke-width="1.0022"/>
-  <path d="m23.5 22.5h-15" stroke-opacity=".32418" stroke="#2c465d"/>
-  <path d="m19.5 5.5v20" stroke-opacity=".32418" stroke="#2c465d"/>
- </g>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" d="m2.3496 1.002c-0.1975 0.0382-0.3531 0.2333-0.3496 0.4375v13.122c0.000005 0.22905 0.20608 0.43749 0.43164 0.4375h11.139c0.22556-0.000006 0.43163-0.20845 0.43164-0.4375v-10.143c-0.004-0.06684-0.02269-0.1329-0.05469-0.19141l-3.3125-3.1992c-0.043-0.0164-0.08876-0.025544-0.13477-0.027344h-8.0684c-0.02684-0.0026-0.055194-0.0026-0.082028 2e-7zm1.6504 2.998h2v2h-2zm3 0h5v2h-5zm-3 3h2v2h-2zm3 0h5v2h-5zm-3 3h2v2h-2zm3 0h5v2h-5z" fill="#9abd4e"/>
 </svg>
diff --git a/core/img/places/file.png b/core/img/places/file.png
deleted file mode 100644
index e0f04c3173..0000000000
Binary files a/core/img/places/file.png and /dev/null differ
diff --git a/core/img/places/file.svg b/core/img/places/file.svg
deleted file mode 100644
index 7db9a201a9..0000000000
--- a/core/img/places/file.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
- <path opacity=".5" style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m3.3501 1.002c-0.1975 0.0382-0.3535 0.2333-0.35 0.4374v13.123c0.0000047 0.22904 0.20522 0.43743 0.43077 0.43744h10.139c0.22555-0.000006 0.43076-0.2084 0.43077-0.43744v-10.143c-0.004-0.06684-0.022-0.13284-0.054-0.19134-0.966-1.3896-2.035-2.4191-3.312-3.1988-0.043-0.0164-0.088-0.0256-0.134-0.0274h-7.0695c-0.026843-0.0026-0.053928-0.0026-0.080774 0zm5.6499 2.498c0-0.2357 0.2643-0.5 0.5-0.5h0.5v2h2v0.5c0 0.2357-0.264 0.5-0.5 0.5h-2c-0.2357 0-0.5-0.2643-0.5-0.5 0-0.46411 0.0000019-1.4917 0.0000019-2z"/>
-</svg>
diff --git a/core/img/places/files.png b/core/img/places/files.png
index 0ff943b077..e317fc3c72 100644
Binary files a/core/img/places/files.png and b/core/img/places/files.png differ
diff --git a/core/img/places/files.svg b/core/img/places/files.svg
index 72605afcc1..8f61739bc4 100644
--- a/core/img/places/files.svg
+++ b/core/img/places/files.svg
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path fill="#FFF" d="m2.92 3c-0.5012 0-0.9208 0.4197-0.9208 0.9208v24.158c0 0.51739 0.40324 0.92073 0.92082 0.92073h26.158c0.51756 0 0.92081-0.40316 0.92081-0.92073l0.00069-14.154c0-0.5011-0.41966-0.92524-0.92081-0.92524h-21.079l-0.0007 11.005c0 0.48012-0.52409 0.97706-1.0042 0.97706-0.48012 0-0.99573-0.49694-0.99573-0.97706l0.0007-12.143c0-0.48012 0.40484-0.86214 0.88497-0.86214h4.5944l14.521 0.00052-0.0007-2.9516c0-0.56713-0.42551-1.0481-0.99245-1.0481h-13.007v-3.0791c0-0.50118-0.40586-0.92081-0.90701-0.92081z" fill-rule="evenodd"/>
+ <g fill-rule="evenodd" transform="matrix(1.7333 0 0 1.7333 -344.09 -1727.8)" fill="#fff">
+  <path d="m200.2 999.72c-0.28913 0-0.53125 0.2421-0.53125 0.5312v12.784c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53124-0.2327 0.53124-0.5312l0.0004-10.474c0-0.2889-0.24211-0.5338-0.53124-0.5338l-7.5457 0.0005-2.3076-2.3078z" fill-rule="evenodd" fill="#fff"/>
+ </g>
 </svg>
diff --git a/core/img/places/folder.png b/core/img/places/folder.png
deleted file mode 100644
index e7882298a8..0000000000
Binary files a/core/img/places/folder.png and /dev/null differ
diff --git a/core/img/places/folder.svg b/core/img/places/folder.svg
deleted file mode 100644
index 08633f60a8..0000000000
--- a/core/img/places/folder.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <g fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.04 -864.43)">
-  <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2327 0.53125-0.5312l0.0004-8.1661c0-0.289-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.2771-0.30237 0.5638-0.57937 0.5638s-0.57447-0.2867-0.57447-0.5638l0.0004-7.0055c0-0.2771 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
- </g>
-</svg>
diff --git a/core/img/places/picture.png b/core/img/places/picture.png
index b60da3b5fd..171af526e9 100644
Binary files a/core/img/places/picture.png and b/core/img/places/picture.png differ
diff --git a/core/img/places/picture.svg b/core/img/places/picture.svg
index b4c81b7a93..3e105dcd33 100644
--- a/core/img/places/picture.svg
+++ b/core/img/places/picture.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m0.6875 4c-0.39495 0.0765-0.69461 0.4668-0.6875 0.875v22.25c0.00001 0.458 0.4239 0.875 0.875 0.875h30.25c0.4511-0.000012 0.87499-0.41692 0.875-0.875v-21.906c-0.001-0.6731-0.529-1.2229-1.031-1.219zm2.3125 3h26v10l-2-2-5 7-6.625-4-9.1875 7h-3.1875zm6 3c-1.6569 0-3 1.3431-3 3s1.3431 3 3 3 3-1.3431 3-3-1.3431-3-3-3z" fill="#fff"/>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="32" width="32" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path style="color:#000000;block-progression:tb;text-transform:none;text-indent:0" fill="#fff" d="m2.6876 4c-0.395 0.0765-0.6946 0.4668-0.6875 0.875v22.25c0 0.46 0.424 0.876 0.875 0.876h26.25c0.4511-0.000012 0.87498-0.41692 0.875-0.875v-21.906c-0.001-0.6731-0.529-1.2229-1.031-1.219zm1.3124 1.9999 24 0.000014v10l-2-2-6 8-6-6-8 8h-2zm5.0002 2c-1.6569 0-3 1.3431-3 3s1.3431 3 3 3 3-1.3431 3-3-1.3431-3-3-3z"/>
 </svg>
diff --git a/core/js/apps.js b/core/js/apps.js
index d0d351f514..d8f4bfdf1c 100644
--- a/core/js/apps.js
+++ b/core/js/apps.js
@@ -22,22 +22,26 @@
 
 	/**
 	 * Shows the #app-sidebar and add .with-app-sidebar to subsequent siblings
+	 *
+	 * @param {Object} [$el] sidebar element to show, defaults to $('#app-sidebar')
 	 */
-	exports.Apps.showAppSidebar = function() {
-		var $appSidebar = $('#app-sidebar');
-		$appSidebar.removeClass('disappear')
-		$('#app-content').addClass('with-app-sidebar');
+	exports.Apps.showAppSidebar = function($el) {
+		var $appSidebar = $el || $('#app-sidebar');
+		$appSidebar.removeClass('disappear');
+		$('#app-content').addClass('with-app-sidebar').trigger(new $.Event('appresized'));
 
 	};
 
 	/**
 	 * Shows the #app-sidebar and removes .with-app-sidebar from subsequent
 	 * siblings
+	 *
+	 * @param {Object} [$el] sidebar element to hide, defaults to $('#app-sidebar')
 	 */
-	exports.Apps.hideAppSidebar = function() {
-		var $appSidebar = $('#app-sidebar');
+	exports.Apps.hideAppSidebar = function($el) {
+		var $appSidebar = $el || $('#app-sidebar');
 		$appSidebar.addClass('disappear');
-		$('#app-content').removeClass('with-app-sidebar');
+		$('#app-content').removeClass('with-app-sidebar').trigger(new $.Event('appresized'));
 	};
 
 	/**
diff --git a/core/js/config.php b/core/js/config.php
index 95dd733028..5da610698d 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -62,7 +62,7 @@ if ($defaultExpireDateEnabled) {
 $outgoingServer2serverShareEnabled = $config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
 
 $array = array(
-	"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
+	"oc_debug" => $config->getSystemValue('debug', false) ? 'true' : 'false',
 	"oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false',
 	"oc_webroot" => "\"".OC::$WEBROOT."\"",
 	"oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
index 74acaac792..b0d1ca7d88 100644
--- a/core/js/jquery.avatar.js
+++ b/core/js/jquery.avatar.js
@@ -76,8 +76,8 @@
 		var $div = this;
 
 		var url = OC.generateUrl(
-			'/avatar/{user}/{size}?requesttoken={requesttoken}',
-			{user: user, size: size * window.devicePixelRatio, requesttoken: oc_requesttoken});
+			'/avatar/{user}/{size}',
+			{user: user, size: size * window.devicePixelRatio});
 
 		$.get(url, function(result) {
 			if (typeof(result) === 'object') {
diff --git a/core/js/js.js b/core/js/js.js
index 52cf076472..8d3756ae2e 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1393,13 +1393,19 @@ function initCore() {
 				// if there is a scrollbar …
 				if($('#app-content').get(0).scrollHeight > $('#app-content').height()) {
 					if($(window).width() > 768) {
-						controlsWidth = $('#content').width() - $('#app-navigation').width() - $('#app-sidebar').width() - getScrollBarWidth();
+						controlsWidth = $('#content').width() - $('#app-navigation').width() - getScrollBarWidth();
+						if (!$('#app-sidebar').hasClass('hidden') && !$('#app-sidebar').hasClass('disappear')) {
+							controlsWidth -= $('#app-sidebar').width();
+						}
 					} else {
 						controlsWidth = $('#content').width() - getScrollBarWidth();
 					}
 				} else { // if there is none
 					if($(window).width() > 768) {
-						controlsWidth = $('#content').width() - $('#app-navigation').width() - $('#app-sidebar').width();
+						controlsWidth = $('#content').width() - $('#app-navigation').width();
+						if (!$('#app-sidebar').hasClass('hidden') && !$('#app-sidebar').hasClass('disappear')) {
+							controlsWidth -= $('#app-sidebar').width();
+						}
 					} else {
 						controlsWidth = $('#content').width();
 					}
@@ -1411,7 +1417,7 @@ function initCore() {
 
 		$(window).resize(_.debounce(adjustControlsWidth, 250));
 
-		$('body').delegate('#app-content', 'apprendered', adjustControlsWidth);
+		$('body').delegate('#app-content', 'apprendered appresized', adjustControlsWidth);
 
 	}
 
diff --git a/core/js/login.js b/core/js/login.js
new file mode 100644
index 0000000000..33ec868cb2
--- /dev/null
+++ b/core/js/login.js
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2015
+ *  Vincent Petry <pvince81@owncloud.com>
+ *  Jan-Christoph Borchardt, http://jancborchardt.net
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * @namespace
+ * @memberOf OC
+ */
+OC.Login = _.extend(OC.Login || {}, {
+	onLogin: function () {
+		$('#submit')
+			.removeClass('icon-confirm')
+			.addClass('icon-loading-small')
+			.css('opacity', '1');
+		return true;
+	}
+});
+$(document).ready(function() {
+	$('form[name=login]').submit(OC.Login.onLogin);
+});
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index b4de98247d..e49ace6df7 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -9,23 +9,26 @@
 OC.MimeTypeList={
 	aliases: {
     "application/coreldraw": "image",
-    "application/font-sfnt": "font",
-    "application/font-woff": "font",
-    "application/illustrator": "image/vector",
+    "application/epub+zip": "text",
+    "application/font-sfnt": "image",
+    "application/font-woff": "image",
+    "application/illustrator": "image",
+	"application/javascript": "text/code",
     "application/json": "text/code",
-    "application/msaccess": "database",
+    "application/msaccess": "file",
     "application/msexcel": "x-office/spreadsheet",
     "application/mspowerpoint": "x-office/presentation",
     "application/msword": "x-office/document",
     "application/octet-stream": "file",
-    "application/postscript": "image/vector",
+    "application/postscript": "image",
+	"application/rss+xml": "text/code",
     "application/vnd.android.package-archive": "package/x-generic",
     "application/vnd.ms-excel": "x-office/spreadsheet",
     "application/vnd.ms-excel.addin.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.binary.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.sheet.macroEnabled.12": "x-office/spreadsheet",
     "application/vnd.ms-excel.template.macroEnabled.12": "x-office/spreadsheet",
-    "application/vnd.ms-fontobject": "font",
+    "application/vnd.ms-fontobject": "image",
     "application/vnd.ms-powerpoint": "x-office/presentation",
     "application/vnd.ms-powerpoint.addin.macroEnabled.12": "x-office/presentation",
     "application/vnd.ms-powerpoint.presentation.macroEnabled.12": "x-office/presentation",
@@ -49,58 +52,54 @@ OC.MimeTypeList={
     "application/vnd.openxmlformats-officedocument.wordprocessingml.document": "x-office/document",
     "application/vnd.openxmlformats-officedocument.wordprocessingml.template": "x-office/document",
     "application/x-7z-compressed": "package/x-generic",
+    "application/x-cbr": "text",
     "application/x-compressed": "package/x-generic",
     "application/x-dcraw": "image",
     "application/x-deb": "package/x-generic",
-    "application/x-font": "font",
+    "application/x-font": "image",
     "application/x-gimp": "image",
     "application/x-gzip": "package/x-generic",
     "application/x-perl": "text/code",
     "application/x-photoshop": "image",
     "application/x-php": "text/code",
     "application/x-rar-compressed": "package/x-generic",
+    "application/x-shockwave-flash": "application",
     "application/x-tar": "package/x-generic",
     "application/x-tex": "text",
     "application/xml": "text/html",
     "application/yaml": "text/code",
     "application/zip": "package/x-generic",
+    "database": "file",
     "httpd/unix-directory": "dir",
-    "image/svg+xml": "image/vector",
+    "image/svg+xml": "image",
+    "image/vector": "image",
     "text/css": "text/code",
     "text/csv": "x-office/spreadsheet",
-    "text/x-shellscript": "text/code"
+	"text/html": "text/code",
+	"text/x-c": "text/code",
+	"text/x-h": "text/code",
+	"text/x-python": "text/code",
+	"text/x-shellscript": "text/code",
+	"web": "text/code"
 },
 	files: [
-    "text-x-h",
-    "application-rss+xml",
     "video",
     "folder-drag-accept",
-    "application-epub+zip",
     "folder-public",
     "package-x-generic",
-    "application-x-shockwave-flash",
-    "text",
     "folder-external",
-    "web",
     "text-vcard",
     "application",
-    "image-vector",
-    "database",
     "text-code",
-    "text-x-python",
     "x-office-spreadsheet",
     "application-pdf",
     "folder",
     "x-office-document",
-    "text-html",
     "text-calendar",
     "x-office-presentation",
-    "text-x-c",
     "file",
-    "font",
+    "text",
     "folder-shared",
-    "application-x-cbr",
-    "application-javascript",
     "image",
     "audio"
 ],
diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 96144d39ee..41dc68ac05 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -53,7 +53,7 @@
 				settings.labels.push($(option).text().trim());
 			}
 		});
-		var button=$('<div class="multiselect button"><span>'+settings.title+'</span><span>▾</span></div>');
+		var button=$('<div class="multiselect button"><span>'+settings.title+'</span><span class="icon-triangle-s"></span></div>');
 		var span=$('<span/>');
 		span.append(button);
 		button.data('id',multiSelectId);
diff --git a/core/js/share.js b/core/js/share.js
index bf9250b3c3..cd4a614e9d 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -127,7 +127,7 @@ OC.Share={
 									if (img.attr('src') !== OC.imagePath('core', 'actions/public')) {
 										img.attr('src', image);
 										$(actions[i]).addClass('permanent');
-										$(actions[i]).html(' <span>'+t('core', 'Shared')+'</span>').prepend(img);
+										$(actions[i]).html('<span> '+t('core', 'Shared')+'</span>').prepend(img);
 									}
 								}
 								for(i = 0; i < files.length; i++) {
@@ -219,7 +219,7 @@ OC.Share={
 		return html;
 	},
 	/**
-	 * Loop over all recipients in the list and format them using 
+	 * Loop over all recipients in the list and format them using
 	 * all kind of fancy magic.
 	 *
 	 * @param {String[]} recipients array of all the recipients
@@ -249,6 +249,7 @@ OC.Share={
 		var owner = $tr.attr('data-share-owner');
 		var shareFolderIcon;
 		var image = OC.imagePath('core', 'actions/share');
+		action.removeClass('shared-style');
 		// update folder icon
 		if (type === 'dir' && (hasShares || hasLink || owner)) {
 			if (hasLink) {
@@ -265,6 +266,7 @@ OC.Share={
 		// update share action text / icon
 		if (hasShares || owner) {
 			recipients = $tr.attr('data-share-recipients');
+			action.addClass('shared-style');
 
 			message = t('core', 'Shared');
 			// even if reshared, only show "Shared by"
@@ -274,7 +276,7 @@ OC.Share={
 			else if (recipients) {
 				message = t('core', 'Shared with {recipients}', {recipients: this._formatShareList(recipients.split(", ")).join(", ")}, 0, {escape: false});
 			}
-			action.html(' <span>' + message + '</span>').prepend(img);
+			action.html('<span> ' + message + '</span>').prepend(img);
 			if (owner || recipients) {
 				action.find('.remoteAddress').tipsy({gravity: 's'});
 			}
diff --git a/core/js/tests/specs/appsSpec.js b/core/js/tests/specs/appsSpec.js
new file mode 100644
index 0000000000..536d41c7f1
--- /dev/null
+++ b/core/js/tests/specs/appsSpec.js
@@ -0,0 +1,48 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2015 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library 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 along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+describe('Apps base tests', function() {
+	describe('Sidebar utility functions', function() {
+		beforeEach(function() {
+			$('#testArea').append('<div id="app-content">Content</div><div id="app-sidebar">The sidebar</div>');
+		});
+		it('shows sidebar', function() {
+			var $el = $('#app-sidebar');
+			OC.Apps.showAppSidebar();
+			expect($el.hasClass('disappear')).toEqual(false);
+		});
+		it('hides sidebar', function() {
+			var $el = $('#app-sidebar');
+			OC.Apps.showAppSidebar();
+			OC.Apps.hideAppSidebar();
+			expect($el.hasClass('disappear')).toEqual(true);
+		});
+		it('triggers appresize event when visibility changed', function() {
+			var eventStub = sinon.stub();
+			$('#app-content').on('appresized', eventStub);
+			OC.Apps.showAppSidebar();
+			expect(eventStub.calledOnce).toEqual(true);
+			OC.Apps.hideAppSidebar();
+			expect(eventStub.calledTwice).toEqual(true);
+		});
+	});
+});
+
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
index 3dc25134f5..5a59a117d7 100644
--- a/core/js/tests/specs/shareSpec.js
+++ b/core/js/tests/specs/shareSpec.js
@@ -1132,7 +1132,7 @@ describe('OC.Share tests', function() {
 				OC.Share.markFileAsShared($file);
 
 				$action = $file.find('.action-share>span');
-				expect($action.text()).toEqual(output);
+				expect($action.text().trim()).toEqual(output);
 				if (_.isString(title)) {
 					expect($action.find('.remoteAddress').attr('title')).toEqual(title);
 				} else {
@@ -1236,7 +1236,7 @@ describe('OC.Share tests', function() {
 				OC.Share.markFileAsShared($file, true);
 
 				$action = $file.find('.action-share>span');
-				expect($action.text()).toEqual(output);
+				expect($action.text().trim()).toEqual(output);
 				if (_.isString(title)) {
 					expect($action.find('.remoteAddress').attr('title')).toEqual(title);
 				} else if (_.isArray(title)) {
diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
index 43f895fce8..a6f0448d1a 100644
--- a/core/l10n/af_ZA.js
+++ b/core/l10n/af_ZA.js
@@ -56,13 +56,13 @@ OC.L10N.register(
     "Good password" : "Goeie wagwoord",
     "Strong password" : "Sterk wagwoord",
     "Shared" : "Gedeel",
-    "Share" : "Deel",
     "Error" : "Fout",
     "Error while sharing" : "Deel veroorsaak fout",
     "Error while unsharing" : "Deel terugneem veroorsaak fout",
     "Error while changing permissions" : "Fout met verandering van regte",
     "Shared with you and the group {group} by {owner}" : "Met jou en die groep {group} gedeel deur {owner}",
     "Shared with you by {owner}" : "Met jou gedeel deur {owner}",
+    "Share" : "Deel",
     "Password protect" : "Beskerm met Wagwoord",
     "Password" : "Wagwoord",
     "Email link to person" : "E-pos aan persoon",
@@ -109,8 +109,8 @@ OC.L10N.register(
     "Database host" : "Databasis gasheer",
     "Finish setup" : "Maak opstelling klaar",
     "Log out" : "Teken uit",
-    "remember" : "onthou",
     "Log in" : "Teken aan",
+    "remember" : "onthou",
     "Alternative Logins" : "Alternatiewe aantekeninge",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
 },
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
index a919524c8c..d5b747b5a3 100644
--- a/core/l10n/af_ZA.json
+++ b/core/l10n/af_ZA.json
@@ -54,13 +54,13 @@
     "Good password" : "Goeie wagwoord",
     "Strong password" : "Sterk wagwoord",
     "Shared" : "Gedeel",
-    "Share" : "Deel",
     "Error" : "Fout",
     "Error while sharing" : "Deel veroorsaak fout",
     "Error while unsharing" : "Deel terugneem veroorsaak fout",
     "Error while changing permissions" : "Fout met verandering van regte",
     "Shared with you and the group {group} by {owner}" : "Met jou en die groep {group} gedeel deur {owner}",
     "Shared with you by {owner}" : "Met jou gedeel deur {owner}",
+    "Share" : "Deel",
     "Password protect" : "Beskerm met Wagwoord",
     "Password" : "Wagwoord",
     "Email link to person" : "E-pos aan persoon",
@@ -107,8 +107,8 @@
     "Database host" : "Databasis gasheer",
     "Finish setup" : "Maak opstelling klaar",
     "Log out" : "Teken uit",
-    "remember" : "onthou",
     "Log in" : "Teken aan",
+    "remember" : "onthou",
     "Alternative Logins" : "Alternatiewe aantekeninge",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Halo daar,<br><br>wou jou net laat weet dat %s <strong>%s</strong> met jou gedeel het.<br><a href=\"%s\">Sien alles!</a><br><br>"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index 3fcc7002be..e4bde6b47e 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -12,6 +12,13 @@ OC.L10N.register(
     "Thursday" : "الخميس",
     "Friday" : "الجمعه",
     "Saturday" : "السبت",
+    "Sun." : "الأحد",
+    "Mon." : "الأثنين",
+    "Tue." : "الثلاثاء",
+    "Wed." : "الأربعاء",
+    "Thu." : "الخميس",
+    "Fri." : "الجمعة",
+    "Sat." : "السبت",
     "January" : "كانون الثاني",
     "February" : "شباط",
     "March" : "آذار",
@@ -24,6 +31,18 @@ OC.L10N.register(
     "October" : "تشرين الاول",
     "November" : "تشرين الثاني",
     "December" : "كانون الاول",
+    "Jan." : "كانون الثاني",
+    "Feb." : "شباط",
+    "Mar." : "آذار",
+    "Apr." : "نيسان",
+    "May." : "أيار",
+    "Jun." : "حزيران",
+    "Jul." : "تموز",
+    "Aug." : "آب",
+    "Sep." : "أيلول",
+    "Oct." : "تشرين الأول",
+    "Nov." : "تشرين الثاني",
+    "Dec." : "كانون الأول",
     "Settings" : "إعدادات",
     "Saving..." : "جاري الحفظ...",
     "I know what I'm doing" : "أعرف ماذا أفعل",
@@ -45,13 +64,13 @@ OC.L10N.register(
     "Good password" : "كلمة السر جيدة",
     "Strong password" : "كلمة السر قوية",
     "Shared" : "مشارك",
-    "Share" : "شارك",
     "Error" : "خطأ",
     "Error while sharing" : "حصل خطأ عند عملية المشاركة",
     "Error while unsharing" : "حصل خطأ عند عملية إزالة المشاركة",
     "Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
     "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
     "Shared with you by {owner}" : "شورك معك من قبل {owner}",
+    "Share" : "شارك",
     "Share link" : "شارك الرابط",
     "Link" : "الرابط",
     "Password protect" : "حماية كلمة السر",
@@ -112,7 +131,6 @@ OC.L10N.register(
     "Log out" : "الخروج",
     "Search" : "البحث",
     "remember" : "تذكر",
-    "Log in" : "أدخل",
     "Alternative Logins" : "اسماء دخول بديلة"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index d1c70bacab..90168479a9 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -10,6 +10,13 @@
     "Thursday" : "الخميس",
     "Friday" : "الجمعه",
     "Saturday" : "السبت",
+    "Sun." : "الأحد",
+    "Mon." : "الأثنين",
+    "Tue." : "الثلاثاء",
+    "Wed." : "الأربعاء",
+    "Thu." : "الخميس",
+    "Fri." : "الجمعة",
+    "Sat." : "السبت",
     "January" : "كانون الثاني",
     "February" : "شباط",
     "March" : "آذار",
@@ -22,6 +29,18 @@
     "October" : "تشرين الاول",
     "November" : "تشرين الثاني",
     "December" : "كانون الاول",
+    "Jan." : "كانون الثاني",
+    "Feb." : "شباط",
+    "Mar." : "آذار",
+    "Apr." : "نيسان",
+    "May." : "أيار",
+    "Jun." : "حزيران",
+    "Jul." : "تموز",
+    "Aug." : "آب",
+    "Sep." : "أيلول",
+    "Oct." : "تشرين الأول",
+    "Nov." : "تشرين الثاني",
+    "Dec." : "كانون الأول",
     "Settings" : "إعدادات",
     "Saving..." : "جاري الحفظ...",
     "I know what I'm doing" : "أعرف ماذا أفعل",
@@ -43,13 +62,13 @@
     "Good password" : "كلمة السر جيدة",
     "Strong password" : "كلمة السر قوية",
     "Shared" : "مشارك",
-    "Share" : "شارك",
     "Error" : "خطأ",
     "Error while sharing" : "حصل خطأ عند عملية المشاركة",
     "Error while unsharing" : "حصل خطأ عند عملية إزالة المشاركة",
     "Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
     "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
     "Shared with you by {owner}" : "شورك معك من قبل {owner}",
+    "Share" : "شارك",
     "Share link" : "شارك الرابط",
     "Link" : "الرابط",
     "Password protect" : "حماية كلمة السر",
@@ -110,7 +129,6 @@
     "Log out" : "الخروج",
     "Search" : "البحث",
     "remember" : "تذكر",
-    "Log in" : "أدخل",
     "Alternative Logins" : "اسماء دخول بديلة"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
\ No newline at end of file
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index 0eb8951a04..675b3bd00a 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -20,6 +20,13 @@ OC.L10N.register(
     "Thursday" : "Xueves",
     "Friday" : "Vienres",
     "Saturday" : "Sábadu",
+    "Sun." : "Dom.",
+    "Mon." : "Llu.",
+    "Tue." : "Mar.",
+    "Wed." : "Mié.",
+    "Thu." : "Xue.",
+    "Fri." : "Vie.",
+    "Sat." : "Sáb.",
     "January" : "Xineru",
     "February" : "Febreru",
     "March" : "Marzu",
@@ -32,6 +39,18 @@ OC.L10N.register(
     "October" : "Ochobre",
     "November" : "Payares",
     "December" : "Avientu",
+    "Jan." : "Xin.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "May.",
+    "Jun." : "Xun.",
+    "Jul." : "Xnt.",
+    "Aug." : "Ago.",
+    "Sep." : "Set.",
+    "Oct." : "Och.",
+    "Nov." : "Pay.",
+    "Dec." : "Avi.",
     "Settings" : "Axustes",
     "Saving..." : "Guardando...",
     "Couldn't send reset email. Please contact your administrator." : "Nun pudo unviase'l corréu de reaniciu. Por favor, contauta col alministrador.",
@@ -63,13 +82,13 @@ OC.L10N.register(
     "Strong password" : "Contraseña mui bona",
     "Shared" : "Compartíu",
     "Shared with {recipients}" : "Compartío con {recipients}",
-    "Share" : "Compartir",
     "Error" : "Fallu",
     "Error while sharing" : "Fallu mientres la compartición",
     "Error while unsharing" : "Fallu mientres se dexaba de compartir",
     "Error while changing permissions" : "Fallu mientres camudaben los permisos",
     "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
     "Shared with you by {owner}" : "Compartíu contigo por {owner}",
+    "Share" : "Compartir",
     "Share link" : "Compartir enllaz",
     "The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
     "Password protect" : "Protexer con contraseña",
@@ -149,9 +168,7 @@ OC.L10N.register(
     "Search" : "Guetar",
     "Server side authentication failed!" : "Falló l'autenticación nel sirvidor!",
     "Please contact your administrator." : "Por favor, contauta col to alministrador",
-    "Forgot your password? Reset it!" : "¿Escaeciesti la to contraseña? ¡Reaníciala!",
     "remember" : "recordar",
-    "Log in" : "Aniciar sesión",
     "Alternative Logins" : "Anicios de sesión alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instalación d'ownCloud ta en mou d'usuariu únicu.",
@@ -161,8 +178,6 @@ OC.L10N.register(
     "You are accessing the server from an untrusted domain." : "Tas accediendo al sirvidor dende un dominiu non confiáu.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contauta col alministrador. Si yes l'alministrador, configura l'axuste \"trusted_domain\" en config/config.php. Hai un exemplu en config/config.sample.php.",
     "Add \"%s\" as trusted domain" : "Amestáu \"%s\" como dominiu de confianza",
-    "%s will be updated to version %s." : "%s anovaráse a la versión %s.",
-    "The following apps will be disabled:" : "Deshabilitaránse les siguientes aplicaciones:",
     "The theme %s has been disabled." : "Deshabilitóse'l tema %s.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enantes de siguir, asegúrate de que se fizo una copia de seguridá de la base de datos, la carpeta de configuración y la carpeta de datos.",
     "Start update" : "Aniciar anovamientu"
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index 4a6ffcbc03..5479fb6a52 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -18,6 +18,13 @@
     "Thursday" : "Xueves",
     "Friday" : "Vienres",
     "Saturday" : "Sábadu",
+    "Sun." : "Dom.",
+    "Mon." : "Llu.",
+    "Tue." : "Mar.",
+    "Wed." : "Mié.",
+    "Thu." : "Xue.",
+    "Fri." : "Vie.",
+    "Sat." : "Sáb.",
     "January" : "Xineru",
     "February" : "Febreru",
     "March" : "Marzu",
@@ -30,6 +37,18 @@
     "October" : "Ochobre",
     "November" : "Payares",
     "December" : "Avientu",
+    "Jan." : "Xin.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "May.",
+    "Jun." : "Xun.",
+    "Jul." : "Xnt.",
+    "Aug." : "Ago.",
+    "Sep." : "Set.",
+    "Oct." : "Och.",
+    "Nov." : "Pay.",
+    "Dec." : "Avi.",
     "Settings" : "Axustes",
     "Saving..." : "Guardando...",
     "Couldn't send reset email. Please contact your administrator." : "Nun pudo unviase'l corréu de reaniciu. Por favor, contauta col alministrador.",
@@ -61,13 +80,13 @@
     "Strong password" : "Contraseña mui bona",
     "Shared" : "Compartíu",
     "Shared with {recipients}" : "Compartío con {recipients}",
-    "Share" : "Compartir",
     "Error" : "Fallu",
     "Error while sharing" : "Fallu mientres la compartición",
     "Error while unsharing" : "Fallu mientres se dexaba de compartir",
     "Error while changing permissions" : "Fallu mientres camudaben los permisos",
     "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
     "Shared with you by {owner}" : "Compartíu contigo por {owner}",
+    "Share" : "Compartir",
     "Share link" : "Compartir enllaz",
     "The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
     "Password protect" : "Protexer con contraseña",
@@ -147,9 +166,7 @@
     "Search" : "Guetar",
     "Server side authentication failed!" : "Falló l'autenticación nel sirvidor!",
     "Please contact your administrator." : "Por favor, contauta col to alministrador",
-    "Forgot your password? Reset it!" : "¿Escaeciesti la to contraseña? ¡Reaníciala!",
     "remember" : "recordar",
-    "Log in" : "Aniciar sesión",
     "Alternative Logins" : "Anicios de sesión alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instalación d'ownCloud ta en mou d'usuariu únicu.",
@@ -159,8 +176,6 @@
     "You are accessing the server from an untrusted domain." : "Tas accediendo al sirvidor dende un dominiu non confiáu.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contauta col alministrador. Si yes l'alministrador, configura l'axuste \"trusted_domain\" en config/config.php. Hai un exemplu en config/config.sample.php.",
     "Add \"%s\" as trusted domain" : "Amestáu \"%s\" como dominiu de confianza",
-    "%s will be updated to version %s." : "%s anovaráse a la versión %s.",
-    "The following apps will be disabled:" : "Deshabilitaránse les siguientes aplicaciones:",
     "The theme %s has been disabled." : "Deshabilitóse'l tema %s.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enantes de siguir, asegúrate de que se fizo una copia de seguridá de la base de datos, la carpeta de configuración y la carpeta de datos.",
     "Start update" : "Aniciar anovamientu"
diff --git a/core/l10n/az.js b/core/l10n/az.js
index be8608bdec..29e643c665 100644
--- a/core/l10n/az.js
+++ b/core/l10n/az.js
@@ -16,6 +16,13 @@ OC.L10N.register(
     "Thursday" : "Cümə axşamı",
     "Friday" : "Cümə",
     "Saturday" : "Şənbə",
+    "Sun." : "Baz.",
+    "Mon." : "Ber.",
+    "Tue." : "Çax.",
+    "Wed." : "Çər.",
+    "Thu." : "Cax.",
+    "Fri." : "Cüm.",
+    "Sat." : "Şnb.",
     "January" : "Yanvar",
     "February" : "Fevral",
     "March" : "Mart",
@@ -28,6 +35,18 @@ OC.L10N.register(
     "October" : "Oktyabr",
     "November" : "Noyabr.",
     "December" : "Dekabr",
+    "Jan." : "Yan.",
+    "Feb." : "Fev.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "May.",
+    "Jun." : "İyn.",
+    "Jul." : "İyl.",
+    "Aug." : "Avq.",
+    "Sep." : "Sen.",
+    "Oct." : "Okt.",
+    "Nov." : "Noy.",
+    "Dec." : "Dek.",
     "Settings" : "Quraşdırmalar",
     "Saving..." : "Saxlama...",
     "No" : "Xeyir",
@@ -40,8 +59,8 @@ OC.L10N.register(
     "So-so password" : "Elə-belə şifrə",
     "Good password" : "Yaxşı şifrə",
     "Strong password" : "Çətin şifrə",
-    "Share" : "Yayımla",
     "Error" : "Səhv",
+    "Share" : "Yayımla",
     "Share link" : "Linki yayımla",
     "Password" : "Şifrə",
     "Send" : "Göndər",
@@ -64,7 +83,6 @@ OC.L10N.register(
     "Username" : "İstifadəçi adı",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Xüsusilə fayl sinxronizasiyası üçün desktop client-dən istifadə edilərsə, SQLite məsləhət görülmür.",
     "Search" : "Axtarış",
-    "Log in" : "Giriş",
     "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin.  Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir."
 },
diff --git a/core/l10n/az.json b/core/l10n/az.json
index 54987978c0..6827838c94 100644
--- a/core/l10n/az.json
+++ b/core/l10n/az.json
@@ -14,6 +14,13 @@
     "Thursday" : "Cümə axşamı",
     "Friday" : "Cümə",
     "Saturday" : "Şənbə",
+    "Sun." : "Baz.",
+    "Mon." : "Ber.",
+    "Tue." : "Çax.",
+    "Wed." : "Çər.",
+    "Thu." : "Cax.",
+    "Fri." : "Cüm.",
+    "Sat." : "Şnb.",
     "January" : "Yanvar",
     "February" : "Fevral",
     "March" : "Mart",
@@ -26,6 +33,18 @@
     "October" : "Oktyabr",
     "November" : "Noyabr.",
     "December" : "Dekabr",
+    "Jan." : "Yan.",
+    "Feb." : "Fev.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "May.",
+    "Jun." : "İyn.",
+    "Jul." : "İyl.",
+    "Aug." : "Avq.",
+    "Sep." : "Sen.",
+    "Oct." : "Okt.",
+    "Nov." : "Noy.",
+    "Dec." : "Dek.",
     "Settings" : "Quraşdırmalar",
     "Saving..." : "Saxlama...",
     "No" : "Xeyir",
@@ -38,8 +57,8 @@
     "So-so password" : "Elə-belə şifrə",
     "Good password" : "Yaxşı şifrə",
     "Strong password" : "Çətin şifrə",
-    "Share" : "Yayımla",
     "Error" : "Səhv",
+    "Share" : "Yayımla",
     "Share link" : "Linki yayımla",
     "Password" : "Şifrə",
     "Send" : "Göndər",
@@ -62,7 +81,6 @@
     "Username" : "İstifadəçi adı",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Xüsusilə fayl sinxronizasiyası üçün desktop client-dən istifadə edilərsə, SQLite məsləhət görülmür.",
     "Search" : "Axtarış",
-    "Log in" : "Giriş",
     "You are accessing the server from an untrusted domain." : "Siz serverə inamsız domain-dən girməyə çalışırsız.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Xahiş olunur inzibatçı ilə əlaqə saxlayasınız. Eger siz bu xidmətin inzibatçısısınizsa, \"trusted_domain\" configini config/config.php faylinda düzgün qeyd edin.  Config nüsxəsi config/config.sample.php faylında qeyd edilmişdir."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
index e96f8e2d6b..e7914ca571 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -24,6 +24,13 @@ OC.L10N.register(
     "Thursday" : "Четвъртък",
     "Friday" : "Петък",
     "Saturday" : "Събота",
+    "Sun." : "Нед.",
+    "Mon." : "Пон.",
+    "Tue." : "Вт.",
+    "Wed." : "Ср.",
+    "Thu." : "Чет.",
+    "Fri." : "Пет.",
+    "Sat." : "Съб.",
     "January" : "Януари",
     "February" : "Февруари",
     "March" : "Март",
@@ -36,6 +43,18 @@ OC.L10N.register(
     "October" : "Октомври",
     "November" : "Ноември",
     "December" : "Декември",
+    "Jan." : "Яну.",
+    "Feb." : "Фев.",
+    "Mar." : "Март.",
+    "Apr." : "Апр.",
+    "May." : "Май.",
+    "Jun." : "Юни.",
+    "Jul." : "Юли.",
+    "Aug." : "Авг.",
+    "Sep." : "Сеп.",
+    "Oct." : "Окт.",
+    "Nov." : "Ное.",
+    "Dec." : "Дек.",
     "Settings" : "Настройки",
     "Saving..." : "Запазване...",
     "Couldn't send reset email. Please contact your administrator." : "Изпращането на електронна поща е неуспешно. Моля, свържете се с вашия администратор.",
@@ -72,13 +91,13 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Настъпи грешка при проверката на настройките на сървъра.",
     "Shared" : "Споделено",
     "Shared with {recipients}" : "Споделено с {recipients}.",
-    "Share" : "Споделяне",
     "Error" : "Грешка",
     "Error while sharing" : "Грешка при споделяне",
     "Error while unsharing" : "Грешка при премахване на споделянето",
     "Error while changing permissions" : "Грешка при промяна на привилегиите",
     "Shared with you and the group {group} by {owner}" : "Споделено от {owner} с Вас и групата {group} .",
     "Shared with you by {owner}" : "Споделено с Вас от {owner}.",
+    "Share" : "Споделяне",
     "Share link" : "Връзка за споделяне",
     "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дни след създаването ѝ.",
     "Link" : "Връзка",
@@ -192,9 +211,8 @@ OC.L10N.register(
     "Search" : "Търсене",
     "Server side authentication failed!" : "Удостоверяването от страна на сървъра е неуспешно!",
     "Please contact your administrator." : "Моля, свържете се с администратора.",
-    "Forgot your password? Reset it!" : "Забравихте паролата си? Възстановете я!",
-    "remember" : "запомняне",
     "Log in" : "Вписване",
+    "remember" : "запомняне",
     "Alternative Logins" : "Алтернативни методи на вписване",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<br><a href=\"%s\">Разгледай го!</a><br><br>.",
     "This ownCloud instance is currently in single user mode." : "В момента този ownCloud е в режим допускащ само един потребител.",
@@ -205,8 +223,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Моля, свържи се с администратора. Ако ти си администраторът, на този сървър, промени \"trusted_domain\" настройките в  config/config.php. Примерна конфигурация е приложена в config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимост от конфигурацията ти, като администратор може натискайки бутонът по-долу да отбележиш домейнът като сигурен.",
     "Add \"%s\" as trusted domain" : "Добави \"%s\" като сигурен домейн",
-    "%s will be updated to version %s." : "%s ще бъде обновена до версия %s.",
-    "The following apps will be disabled:" : "Следните програми ще бъдат изключени:",
     "The theme %s has been disabled." : "Темата %s бе изключена.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Моля, увери се, че си направил копия на базата данни, папките с настройки и данни, преди да продължиш.",
     "Start update" : "Започване на обновяването",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index 84b5a5b72a..271cb44435 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -22,6 +22,13 @@
     "Thursday" : "Четвъртък",
     "Friday" : "Петък",
     "Saturday" : "Събота",
+    "Sun." : "Нед.",
+    "Mon." : "Пон.",
+    "Tue." : "Вт.",
+    "Wed." : "Ср.",
+    "Thu." : "Чет.",
+    "Fri." : "Пет.",
+    "Sat." : "Съб.",
     "January" : "Януари",
     "February" : "Февруари",
     "March" : "Март",
@@ -34,6 +41,18 @@
     "October" : "Октомври",
     "November" : "Ноември",
     "December" : "Декември",
+    "Jan." : "Яну.",
+    "Feb." : "Фев.",
+    "Mar." : "Март.",
+    "Apr." : "Апр.",
+    "May." : "Май.",
+    "Jun." : "Юни.",
+    "Jul." : "Юли.",
+    "Aug." : "Авг.",
+    "Sep." : "Сеп.",
+    "Oct." : "Окт.",
+    "Nov." : "Ное.",
+    "Dec." : "Дек.",
     "Settings" : "Настройки",
     "Saving..." : "Запазване...",
     "Couldn't send reset email. Please contact your administrator." : "Изпращането на електронна поща е неуспешно. Моля, свържете се с вашия администратор.",
@@ -70,13 +89,13 @@
     "Error occurred while checking server setup" : "Настъпи грешка при проверката на настройките на сървъра.",
     "Shared" : "Споделено",
     "Shared with {recipients}" : "Споделено с {recipients}.",
-    "Share" : "Споделяне",
     "Error" : "Грешка",
     "Error while sharing" : "Грешка при споделяне",
     "Error while unsharing" : "Грешка при премахване на споделянето",
     "Error while changing permissions" : "Грешка при промяна на привилегиите",
     "Shared with you and the group {group} by {owner}" : "Споделено от {owner} с Вас и групата {group} .",
     "Shared with you by {owner}" : "Споделено с Вас от {owner}.",
+    "Share" : "Споделяне",
     "Share link" : "Връзка за споделяне",
     "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дни след създаването ѝ.",
     "Link" : "Връзка",
@@ -190,9 +209,8 @@
     "Search" : "Търсене",
     "Server side authentication failed!" : "Удостоверяването от страна на сървъра е неуспешно!",
     "Please contact your administrator." : "Моля, свържете се с администратора.",
-    "Forgot your password? Reset it!" : "Забравихте паролата си? Възстановете я!",
-    "remember" : "запомняне",
     "Log in" : "Вписване",
+    "remember" : "запомняне",
     "Alternative Logins" : "Алтернативни методи на вписване",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<br><a href=\"%s\">Разгледай го!</a><br><br>.",
     "This ownCloud instance is currently in single user mode." : "В момента този ownCloud е в режим допускащ само един потребител.",
@@ -203,8 +221,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Моля, свържи се с администратора. Ако ти си администраторът, на този сървър, промени \"trusted_domain\" настройките в  config/config.php. Примерна конфигурация е приложена в config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимост от конфигурацията ти, като администратор може натискайки бутонът по-долу да отбележиш домейнът като сигурен.",
     "Add \"%s\" as trusted domain" : "Добави \"%s\" като сигурен домейн",
-    "%s will be updated to version %s." : "%s ще бъде обновена до версия %s.",
-    "The following apps will be disabled:" : "Следните програми ще бъдат изключени:",
     "The theme %s has been disabled." : "Темата %s бе изключена.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Моля, увери се, че си направил копия на базата данни, папките с настройки и данни, преди да продължиш.",
     "Start update" : "Започване на обновяването",
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
index 92e47f1b28..d9bce487f4 100644
--- a/core/l10n/bn_BD.js
+++ b/core/l10n/bn_BD.js
@@ -15,6 +15,13 @@ OC.L10N.register(
     "Thursday" : "বৃহস্পতিবার",
     "Friday" : "শুক্রবার",
     "Saturday" : "শনিবার",
+    "Sun." : "রবি.",
+    "Mon." : "সোম.",
+    "Tue." : "মঙ্গল.",
+    "Wed." : "বুধ.",
+    "Thu." : "বৃহঃ.",
+    "Fri." : "শুক্র.",
+    "Sat." : "শনি.",
     "January" : "জানুয়ারি",
     "February" : "ফেব্রুয়ারি",
     "March" : "মার্চ",
@@ -27,6 +34,18 @@ OC.L10N.register(
     "October" : "অক্টোবর",
     "November" : "নভেম্বর",
     "December" : "ডিসেম্বর",
+    "Jan." : "জানু.",
+    "Feb." : "ফেব্রু.",
+    "Mar." : "মার্চ.",
+    "Apr." : "এপ্রিল.",
+    "May." : "মে.",
+    "Jun." : "জুন.",
+    "Jul." : "জুলাই.",
+    "Aug." : "অগাস্ট.",
+    "Sep." : "সেপ্টে.",
+    "Oct." : "অক্টো.",
+    "Nov." : "নভে.",
+    "Dec." : "ডিসে.",
     "Settings" : "নিয়ামকসমূহ",
     "Saving..." : "সংরক্ষণ করা হচ্ছে..",
     "No" : "না",
@@ -42,13 +61,13 @@ OC.L10N.register(
     "Continue" : "চালিয়ে যাও",
     "Strong password" : "শক্তিশালী কুটশব্দ",
     "Shared" : "ভাগাভাগিকৃত",
-    "Share" : "ভাগাভাগি কর",
     "Error" : "সমস্যা",
     "Error while sharing" : "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  ",
     "Error while unsharing" : "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
     "Error while changing permissions" : "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
     "Shared with you and the group {group} by {owner}" : "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
     "Shared with you by {owner}" : "{owner} আপনার সাথে ভাগাভাগি করেছেন",
+    "Share" : "ভাগাভাগি কর",
     "Share link" : "লিংক ভাগাভাগি করেন",
     "Password protect" : "কূটশব্দ সুরক্ষিত",
     "Password" : "কূটশব্দ",
@@ -107,7 +126,6 @@ OC.L10N.register(
     "Log out" : "প্রস্থান",
     "Search" : "অনুসন্ধান",
     "remember" : "মনে রাখ",
-    "Log in" : "প্রবেশ",
     "Alternative Logins" : "বিকল্প লগইন"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
index b68c9f2841..8474fa61f1 100644
--- a/core/l10n/bn_BD.json
+++ b/core/l10n/bn_BD.json
@@ -13,6 +13,13 @@
     "Thursday" : "বৃহস্পতিবার",
     "Friday" : "শুক্রবার",
     "Saturday" : "শনিবার",
+    "Sun." : "রবি.",
+    "Mon." : "সোম.",
+    "Tue." : "মঙ্গল.",
+    "Wed." : "বুধ.",
+    "Thu." : "বৃহঃ.",
+    "Fri." : "শুক্র.",
+    "Sat." : "শনি.",
     "January" : "জানুয়ারি",
     "February" : "ফেব্রুয়ারি",
     "March" : "মার্চ",
@@ -25,6 +32,18 @@
     "October" : "অক্টোবর",
     "November" : "নভেম্বর",
     "December" : "ডিসেম্বর",
+    "Jan." : "জানু.",
+    "Feb." : "ফেব্রু.",
+    "Mar." : "মার্চ.",
+    "Apr." : "এপ্রিল.",
+    "May." : "মে.",
+    "Jun." : "জুন.",
+    "Jul." : "জুলাই.",
+    "Aug." : "অগাস্ট.",
+    "Sep." : "সেপ্টে.",
+    "Oct." : "অক্টো.",
+    "Nov." : "নভে.",
+    "Dec." : "ডিসে.",
     "Settings" : "নিয়ামকসমূহ",
     "Saving..." : "সংরক্ষণ করা হচ্ছে..",
     "No" : "না",
@@ -40,13 +59,13 @@
     "Continue" : "চালিয়ে যাও",
     "Strong password" : "শক্তিশালী কুটশব্দ",
     "Shared" : "ভাগাভাগিকৃত",
-    "Share" : "ভাগাভাগি কর",
     "Error" : "সমস্যা",
     "Error while sharing" : "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  ",
     "Error while unsharing" : "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
     "Error while changing permissions" : "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
     "Shared with you and the group {group} by {owner}" : "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
     "Shared with you by {owner}" : "{owner} আপনার সাথে ভাগাভাগি করেছেন",
+    "Share" : "ভাগাভাগি কর",
     "Share link" : "লিংক ভাগাভাগি করেন",
     "Password protect" : "কূটশব্দ সুরক্ষিত",
     "Password" : "কূটশব্দ",
@@ -105,7 +124,6 @@
     "Log out" : "প্রস্থান",
     "Search" : "অনুসন্ধান",
     "remember" : "মনে রাখ",
-    "Log in" : "প্রবেশ",
     "Alternative Logins" : "বিকল্প লগইন"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/bn_IN.js b/core/l10n/bn_IN.js
index 69c51dab41..21b59beec8 100644
--- a/core/l10n/bn_IN.js
+++ b/core/l10n/bn_IN.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Settings" : "সেটিংস",
     "Saving..." : "সংরক্ষণ করা হচ্ছে ...",
     "Cancel" : "বাতিল করা",
-    "Share" : "শেয়ার",
     "Error" : "ভুল",
+    "Share" : "শেয়ার",
     "Warning" : "সতর্কীকরণ",
     "Delete" : "মুছে ফেলা",
     "Add" : "যোগ করা",
diff --git a/core/l10n/bn_IN.json b/core/l10n/bn_IN.json
index f0f53afe5a..67eddf4cfb 100644
--- a/core/l10n/bn_IN.json
+++ b/core/l10n/bn_IN.json
@@ -2,8 +2,8 @@
     "Settings" : "সেটিংস",
     "Saving..." : "সংরক্ষণ করা হচ্ছে ...",
     "Cancel" : "বাতিল করা",
-    "Share" : "শেয়ার",
     "Error" : "ভুল",
+    "Share" : "শেয়ার",
     "Warning" : "সতর্কীকরণ",
     "Delete" : "মুছে ফেলা",
     "Add" : "যোগ করা",
diff --git a/core/l10n/bs.js b/core/l10n/bs.js
index 819308dd66..f237de9d8c 100644
--- a/core/l10n/bs.js
+++ b/core/l10n/bs.js
@@ -19,6 +19,13 @@ OC.L10N.register(
     "Thursday" : "Četvrtak",
     "Friday" : "Petak",
     "Saturday" : "Subota",
+    "Sun." : "Ned.",
+    "Mon." : "Pon.",
+    "Tue." : "Ut.",
+    "Wed." : "Sri.",
+    "Thu." : "Čet.",
+    "Fri." : "Pet.",
+    "Sat." : "Sub.",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mart",
@@ -31,6 +38,18 @@ OC.L10N.register(
     "October" : "Oktobar",
     "November" : "Novembar",
     "December" : "Decembar",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Maj.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Avg.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Postavke",
     "Saving..." : "Spašavam...",
     "Couldn't send reset email. Please contact your administrator." : "Slanje emaila resetovanja nije moguće. Molim kontaktirajte administratora.",
@@ -63,13 +82,13 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Došlo je do pogreške prilikom provjere serverskih postavki",
     "Shared" : "Podijeljen",
     "Shared with {recipients}" : "Podijeljen sa {recipients}",
-    "Share" : "Podijeli",
     "Error" : "Greška",
     "Error while sharing" : "Greška pri dijeljenju",
     "Error while unsharing" : "Ggreška pri prestanku dijeljenja",
     "Error while changing permissions" : "Greška pri mijenjanju dozvola",
     "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
     "Shared with you by {owner}" : "Podijeljeno sa vama od {owner}",
+    "Share" : "Podijeli",
     "Share link" : "Podijelite vezu",
     "The public link will expire no later than {days} days after it is created" : "Javna veza ističe najkasnije {days} dana nakon što je kreirana",
     "Link" : "Veza",
@@ -170,9 +189,7 @@ OC.L10N.register(
     "Search" : "Potraži",
     "Server side authentication failed!" : "Autentikacija na strani servera nije uspjela!",
     "Please contact your administrator." : "Molim kontaktirajte svog administratora.",
-    "Forgot your password? Reset it!" : "Zaboravili ste svoju lozinku? Resetujte ju!",
     "remember" : "zapamti",
-    "Log in" : "Prijava",
     "Alternative Logins" : "Alternativne Prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> upravo vam javljam da je %s s vama podijelio <strong>%s</strong>.<br><a href=\"%s\">Pogledajte!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u jednokorisničkom načinu rada.",
@@ -183,8 +200,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molim kontaktirajte vašeg administratora. Ako ste vi administrator ove instance, konfigurišite postavku \"trusted_domain\" u config/config.php. Primjer konfiguracije ponuđen je u config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristiti dugme ispod za povjeru toj domeni.",
     "Add \"%s\" as trusted domain" : "Dodajte \"%s\" kao povjerenu/pouzdanu domenu.",
-    "%s will be updated to version %s." : "%s će biti ažuriran u verziju %s",
-    "The following apps will be disabled:" : "Sljedeće aplikacije bit će onemogućene:",
     "The theme %s has been disabled." : "Tema %s je onemogućena",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Prije nego nastavite, molim osigurajte se da su baza podataka, direktorij konfiguracije i direktorij podataka sigurnosno kopirani.",
     "Start update" : "Započnite ažuriranje",
diff --git a/core/l10n/bs.json b/core/l10n/bs.json
index b1f860fda1..c4f7962b14 100644
--- a/core/l10n/bs.json
+++ b/core/l10n/bs.json
@@ -17,6 +17,13 @@
     "Thursday" : "Četvrtak",
     "Friday" : "Petak",
     "Saturday" : "Subota",
+    "Sun." : "Ned.",
+    "Mon." : "Pon.",
+    "Tue." : "Ut.",
+    "Wed." : "Sri.",
+    "Thu." : "Čet.",
+    "Fri." : "Pet.",
+    "Sat." : "Sub.",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mart",
@@ -29,6 +36,18 @@
     "October" : "Oktobar",
     "November" : "Novembar",
     "December" : "Decembar",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Maj.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Avg.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Postavke",
     "Saving..." : "Spašavam...",
     "Couldn't send reset email. Please contact your administrator." : "Slanje emaila resetovanja nije moguće. Molim kontaktirajte administratora.",
@@ -61,13 +80,13 @@
     "Error occurred while checking server setup" : "Došlo je do pogreške prilikom provjere serverskih postavki",
     "Shared" : "Podijeljen",
     "Shared with {recipients}" : "Podijeljen sa {recipients}",
-    "Share" : "Podijeli",
     "Error" : "Greška",
     "Error while sharing" : "Greška pri dijeljenju",
     "Error while unsharing" : "Ggreška pri prestanku dijeljenja",
     "Error while changing permissions" : "Greška pri mijenjanju dozvola",
     "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
     "Shared with you by {owner}" : "Podijeljeno sa vama od {owner}",
+    "Share" : "Podijeli",
     "Share link" : "Podijelite vezu",
     "The public link will expire no later than {days} days after it is created" : "Javna veza ističe najkasnije {days} dana nakon što je kreirana",
     "Link" : "Veza",
@@ -168,9 +187,7 @@
     "Search" : "Potraži",
     "Server side authentication failed!" : "Autentikacija na strani servera nije uspjela!",
     "Please contact your administrator." : "Molim kontaktirajte svog administratora.",
-    "Forgot your password? Reset it!" : "Zaboravili ste svoju lozinku? Resetujte ju!",
     "remember" : "zapamti",
-    "Log in" : "Prijava",
     "Alternative Logins" : "Alternativne Prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> upravo vam javljam da je %s s vama podijelio <strong>%s</strong>.<br><a href=\"%s\">Pogledajte!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u jednokorisničkom načinu rada.",
@@ -181,8 +198,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molim kontaktirajte vašeg administratora. Ako ste vi administrator ove instance, konfigurišite postavku \"trusted_domain\" u config/config.php. Primjer konfiguracije ponuđen je u config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristiti dugme ispod za povjeru toj domeni.",
     "Add \"%s\" as trusted domain" : "Dodajte \"%s\" kao povjerenu/pouzdanu domenu.",
-    "%s will be updated to version %s." : "%s će biti ažuriran u verziju %s",
-    "The following apps will be disabled:" : "Sljedeće aplikacije bit će onemogućene:",
     "The theme %s has been disabled." : "Tema %s je onemogućena",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Prije nego nastavite, molim osigurajte se da su baza podataka, direktorij konfiguracije i direktorij podataka sigurnosno kopirani.",
     "Start update" : "Započnite ažuriranje",
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index 7ed783d68e..1fa4f12a3e 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -2,20 +2,28 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "No s'ha pogut enviar correu als usuaris següents: %s",
+    "Preparing update" : "Preparant l'actualització",
     "Turned on maintenance mode" : "Activat el mode de manteniment",
     "Turned off maintenance mode" : "Desactivat el mode de manteniment",
+    "Maintenance mode is kept active" : "El mode de manteniment es manté activat",
     "Updated database" : "Actualitzada la base de dades",
     "Checked database schema update" : "S'ha comprobat l'actualització de l'esquema de la base de dades",
     "Checked database schema update for apps" : "S'ha comprobat l'actualització de l'esquema de la base de dades per les apps",
     "Updated \"%s\" to %s" : "Actualitzat \"%s\" a %s",
     "Repair warning: " : "Advertiment de reparació:",
+    "Repair error: " : "Error de reparació:",
     "Following incompatible apps have been disabled: %s" : "Les següents apps incompatibles s'han deshabilitat: %s",
+    "Following apps have been disabled: %s" : "Les aplicacions següents s'han deshabilitat: %s",
+    "Already up to date" : "Ja actualitzat",
+    "File is too big" : "El fitxer és massa gran",
     "Invalid file provided" : "L'arxiu proporcionat no és vàlid",
     "No image or file provided" : "No s'han proporcionat imatges o fitxers",
     "Unknown filetype" : "Tipus de fitxer desconegut",
     "Invalid image" : "Imatge no vàlida",
     "No temporary profile picture available, try again" : "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho",
     "No crop data provided" : "No heu proporcionat dades del retall",
+    "No valid crop data provided" : "Les dades del retall proporcionades no són vàlides",
+    "Crop is not square" : "El retall no és quadrat",
     "Sunday" : "Diumenge",
     "Monday" : "Dilluns",
     "Tuesday" : "Dimarts",
@@ -23,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Dijous",
     "Friday" : "Divendres",
     "Saturday" : "Dissabte",
+    "Sun." : "Dg.",
+    "Mon." : "Dl.",
+    "Tue." : "Dm.",
+    "Wed." : "Dc.",
+    "Thu." : "Dj.",
+    "Fri." : "Dv.",
+    "Sat." : "Ds.",
+    "Su" : "Dg",
+    "Mo" : "Dl",
+    "Tu" : "Dm",
+    "We" : "Dc",
+    "Th" : "Dj",
+    "Fr" : "Dv",
+    "Sa" : "Ds",
     "January" : "Gener",
     "February" : "Febrer",
     "March" : "Març",
@@ -35,6 +57,18 @@ OC.L10N.register(
     "October" : "Octubre",
     "November" : "Novembre",
     "December" : "Desembre",
+    "Jan." : "Gen.",
+    "Feb." : "Febr.",
+    "Mar." : "Març",
+    "Apr." : "Abr.",
+    "May." : "Maig",
+    "Jun." : "Juny",
+    "Jul." : "Jul.",
+    "Aug." : "Ag.",
+    "Sep." : "Set.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Des.",
     "Settings" : "Configuració",
     "Saving..." : "Desant...",
     "Couldn't send reset email. Please contact your administrator." : "No s'ha pogut restablir el correu. Contacteu amb l'administrador.",
@@ -65,10 +99,16 @@ OC.L10N.register(
     "So-so password" : "Contrasenya passable",
     "Good password" : "Contrasenya bona",
     "Strong password" : "Contrasenya forta",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Aquest servidor no té connexió a internet. Això significa que algunes de les característiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu tenir totes les característiques.",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "La carpeta de dades i els vostres fitxers probablement són accessibles des d'Internet. El fitxer .htaccess no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "No hi ha configurada cap memòria cau. Per millorar el rendiment configureu una memòria cau si està disponible. Podeu trobar més informació a la <a href=\"{docLink}\">documentació</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "PHP no pot llegir /dev/urandom, cosa poc recomanable per raons de seguretat. Podeu trobar més informació a la <a href=\"{docLink}\">documentació</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La versió de PHP ({version}) ja no està <a href=\"{phpLink}\">mantinguda per PHP</a>. Us recomanem que actualitzeu la versió per gaudir de les millores de rendiment i seguretat proporcionades per PHP.",
     "Error occurred while checking server setup" : "Hi ha hagut un error en comprovar la configuració del servidor",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Esteu accedint aquesta web a través de HTTP. Us recomanem que configureu el servidor per requerir HTTPS tal i com es descriu als <a href=\"{docUrl}\">consells de seguretat</a>",
     "Shared" : "Compartit",
     "Shared with {recipients}" : "Compartit amb {recipients}",
-    "Share" : "Comparteix",
     "Error" : "Error",
     "Error while sharing" : "Error en compartir",
     "Error while unsharing" : "Error en deixar de compartir",
@@ -77,6 +117,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Compartit amb vos per {owner}",
     "Share with users or groups …" : "Comparteix amb usuaris o grups ...",
     "Share with users, groups or remote users …" : "Comparteix amb usuaris, grups o usuaris remots ...",
+    "Share" : "Comparteix",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir amb la gent en altres ownClouds utilitzant la sintaxi username@example.com/owncloud",
     "Share link" : "Enllaç de compartició",
     "The public link will expire no later than {days} days after it is created" : "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
@@ -123,11 +164,14 @@ OC.L10N.register(
     "Hello {name}, the weather is {weather}" : "Hola {name}, el temps és {weather}",
     "Hello {name}" : "Hola {name}",
     "_download %n file_::_download %n files_" : ["descarregar l'arxiu %n","descarregar arxius %n "],
+    "{version} is available. Get more information on how to update." : "Hi ha disponible la versió {version}. Obtingueu més informació sobre com actualitzar.",
     "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
     "Please reload the page." : "Carregueu la pàgina de nou.",
     "The update was unsuccessful. " : "La actualització no ha tingut èxit",
+    "The update was successful. There were warnings." : "La actualització ha estat exitosa. Hi ha alertes.",
     "The update was successful. Redirecting you to ownCloud now." : "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
     "Couldn't reset password because the token is invalid" : "No es pot restablir la contrasenya perquè el testimoni no és vàlid",
+    "Couldn't reset password because the token is expired" : "No es pot restablir la contrasenya perquè el testimoni ha vençut",
     "Couldn't send reset email. Please make sure your username is correct." : "No s'ha pogut enviar el correu de restabliment. Assegureu-vos que el vostre nom d'usuari és correcte.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No s'ha pogut enviar el correu de restabliment perquè no hi ha cap correu electrònic per aquest usuari. Contacteu amb l'administrador.",
     "%s password reset" : "restableix la contrasenya %s",
@@ -136,6 +180,7 @@ OC.L10N.register(
     "New Password" : "Contrasenya nova",
     "Reset password" : "Reinicialitza la contrasenya",
     "Searching other places" : "Buscant altres ubicacions",
+    "No search results in other places" : "No hi ha resultats de cerques a altres llocs",
     "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultat de cerca en altres ubicacions","{count} resultats de cerca en altres ubicacions"],
     "Personal" : "Personal",
     "Users" : "Usuaris",
@@ -168,6 +213,7 @@ OC.L10N.register(
     "Message: %s" : "Missatge: %s",
     "File: %s" : "Fitxer: %s",
     "Line: %s" : "Línia: %s",
+    "Trace" : "Traça",
     "Security warning" : "Advertiment de seguretat",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
@@ -177,11 +223,14 @@ OC.L10N.register(
     "Data folder" : "Carpeta de dades",
     "Configure the database" : "Configura la base de dades",
     "Only %s is available." : "Només hi ha disponible %s",
+    "Install and activate additional PHP modules to choose other database types." : "Instal·la i activa mòduls PHP addicionals per seleccionar altres tipus de bases de dades.",
+    "For more details check out the documentation." : "Per més detalls consulteu la documentació.",
     "Database user" : "Usuari de la base de dades",
     "Database password" : "Contrasenya de la base de dades",
     "Database name" : "Nom de la base de dades",
     "Database tablespace" : "Espai de taula de la base de dades",
     "Database host" : "Ordinador central de la base de dades",
+    "Performance warning" : "Alerta de rendiment",
     "SQLite will be used as database." : "SQLite s'utilitzarà com a base de dades.",
     "For larger installations we recommend to choose a different database backend." : "Per a instal·lacions més grans es recomana triar una base de dades diferent.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "L'ús de SQLite està desaconsellat especialment quan s'usa el client d'escriptori per sincronitzar els fitxers.",
@@ -196,9 +245,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Contacteu amb l'administrador.",
     "An internal error occured." : "S'ha produït un error intern.",
     "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.",
-    "Forgot your password? Reset it!" : "Heu oblidat la contrasenya? Restabliu-la!",
-    "remember" : "recorda'm",
     "Log in" : "Inici de sessió",
+    "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?",
+    "remember" : "recorda'm",
     "Alternative Logins" : "Acreditacions alternatives",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ei, <br><br>només fer-vos saber que %s us ha comparti <strong>%s</strong>. <br><a href=\"%s\">Mireu-ho!</a>",
     "This ownCloud instance is currently in single user mode." : "La instància ownCloud està en mode d'usuari únic.",
@@ -209,8 +258,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacteu amb l'administrador. Si sou un administrador d'aquesta instància, configureu el paràmetre \"trusted_domain\" a config/config.php. Hi ha un exemple de configuració a config/config.sampe.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En funció de la teva configuració, com a administrador podries utilitzar el botó d'abaix per confiar en aquest domini.",
     "Add \"%s\" as trusted domain" : "Afegeix \"%s\" com a domini de confiança",
-    "%s will be updated to version %s." : "%s s'actualitzarà a la versió %s.",
-    "The following apps will be disabled:" : "Les següents aplicacions es desactivaran:",
+    "App update required" : "Cal que actualitzeu la aplicació",
+    "%s will be updated to version %s" : "%s s'actualitzarà a la versió %s",
+    "These apps will be updated:" : "Aquestes aplicacions s'actualitzaran:",
+    "These incompatible apps will be disabled:" : "Aquestes aplicacions incompatibles es desactivaran:",
     "The theme %s has been disabled." : "S'ha desactivat el tema %s",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assegureu-vos que heu fet una còpia de seguretat de la base de dades, del fitxer de configuració i de la carpeta de dades abans de continuar.",
     "Start update" : "Inicia l'actualització",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index fc855c2e7b..55962a2536 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -1,19 +1,27 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "No s'ha pogut enviar correu als usuaris següents: %s",
+    "Preparing update" : "Preparant l'actualització",
     "Turned on maintenance mode" : "Activat el mode de manteniment",
     "Turned off maintenance mode" : "Desactivat el mode de manteniment",
+    "Maintenance mode is kept active" : "El mode de manteniment es manté activat",
     "Updated database" : "Actualitzada la base de dades",
     "Checked database schema update" : "S'ha comprobat l'actualització de l'esquema de la base de dades",
     "Checked database schema update for apps" : "S'ha comprobat l'actualització de l'esquema de la base de dades per les apps",
     "Updated \"%s\" to %s" : "Actualitzat \"%s\" a %s",
     "Repair warning: " : "Advertiment de reparació:",
+    "Repair error: " : "Error de reparació:",
     "Following incompatible apps have been disabled: %s" : "Les següents apps incompatibles s'han deshabilitat: %s",
+    "Following apps have been disabled: %s" : "Les aplicacions següents s'han deshabilitat: %s",
+    "Already up to date" : "Ja actualitzat",
+    "File is too big" : "El fitxer és massa gran",
     "Invalid file provided" : "L'arxiu proporcionat no és vàlid",
     "No image or file provided" : "No s'han proporcionat imatges o fitxers",
     "Unknown filetype" : "Tipus de fitxer desconegut",
     "Invalid image" : "Imatge no vàlida",
     "No temporary profile picture available, try again" : "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho",
     "No crop data provided" : "No heu proporcionat dades del retall",
+    "No valid crop data provided" : "Les dades del retall proporcionades no són vàlides",
+    "Crop is not square" : "El retall no és quadrat",
     "Sunday" : "Diumenge",
     "Monday" : "Dilluns",
     "Tuesday" : "Dimarts",
@@ -21,6 +29,20 @@
     "Thursday" : "Dijous",
     "Friday" : "Divendres",
     "Saturday" : "Dissabte",
+    "Sun." : "Dg.",
+    "Mon." : "Dl.",
+    "Tue." : "Dm.",
+    "Wed." : "Dc.",
+    "Thu." : "Dj.",
+    "Fri." : "Dv.",
+    "Sat." : "Ds.",
+    "Su" : "Dg",
+    "Mo" : "Dl",
+    "Tu" : "Dm",
+    "We" : "Dc",
+    "Th" : "Dj",
+    "Fr" : "Dv",
+    "Sa" : "Ds",
     "January" : "Gener",
     "February" : "Febrer",
     "March" : "Març",
@@ -33,6 +55,18 @@
     "October" : "Octubre",
     "November" : "Novembre",
     "December" : "Desembre",
+    "Jan." : "Gen.",
+    "Feb." : "Febr.",
+    "Mar." : "Març",
+    "Apr." : "Abr.",
+    "May." : "Maig",
+    "Jun." : "Juny",
+    "Jul." : "Jul.",
+    "Aug." : "Ag.",
+    "Sep." : "Set.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Des.",
     "Settings" : "Configuració",
     "Saving..." : "Desant...",
     "Couldn't send reset email. Please contact your administrator." : "No s'ha pogut restablir el correu. Contacteu amb l'administrador.",
@@ -63,10 +97,16 @@
     "So-so password" : "Contrasenya passable",
     "Good password" : "Contrasenya bona",
     "Strong password" : "Contrasenya forta",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Aquest servidor no té connexió a internet. Això significa que algunes de les característiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu tenir totes les característiques.",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "La carpeta de dades i els vostres fitxers probablement són accessibles des d'Internet. El fitxer .htaccess no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "No hi ha configurada cap memòria cau. Per millorar el rendiment configureu una memòria cau si està disponible. Podeu trobar més informació a la <a href=\"{docLink}\">documentació</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "PHP no pot llegir /dev/urandom, cosa poc recomanable per raons de seguretat. Podeu trobar més informació a la <a href=\"{docLink}\">documentació</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La versió de PHP ({version}) ja no està <a href=\"{phpLink}\">mantinguda per PHP</a>. Us recomanem que actualitzeu la versió per gaudir de les millores de rendiment i seguretat proporcionades per PHP.",
     "Error occurred while checking server setup" : "Hi ha hagut un error en comprovar la configuració del servidor",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Esteu accedint aquesta web a través de HTTP. Us recomanem que configureu el servidor per requerir HTTPS tal i com es descriu als <a href=\"{docUrl}\">consells de seguretat</a>",
     "Shared" : "Compartit",
     "Shared with {recipients}" : "Compartit amb {recipients}",
-    "Share" : "Comparteix",
     "Error" : "Error",
     "Error while sharing" : "Error en compartir",
     "Error while unsharing" : "Error en deixar de compartir",
@@ -75,6 +115,7 @@
     "Shared with you by {owner}" : "Compartit amb vos per {owner}",
     "Share with users or groups …" : "Comparteix amb usuaris o grups ...",
     "Share with users, groups or remote users …" : "Comparteix amb usuaris, grups o usuaris remots ...",
+    "Share" : "Comparteix",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartir amb la gent en altres ownClouds utilitzant la sintaxi username@example.com/owncloud",
     "Share link" : "Enllaç de compartició",
     "The public link will expire no later than {days} days after it is created" : "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
@@ -121,11 +162,14 @@
     "Hello {name}, the weather is {weather}" : "Hola {name}, el temps és {weather}",
     "Hello {name}" : "Hola {name}",
     "_download %n file_::_download %n files_" : ["descarregar l'arxiu %n","descarregar arxius %n "],
+    "{version} is available. Get more information on how to update." : "Hi ha disponible la versió {version}. Obtingueu més informació sobre com actualitzar.",
     "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
     "Please reload the page." : "Carregueu la pàgina de nou.",
     "The update was unsuccessful. " : "La actualització no ha tingut èxit",
+    "The update was successful. There were warnings." : "La actualització ha estat exitosa. Hi ha alertes.",
     "The update was successful. Redirecting you to ownCloud now." : "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
     "Couldn't reset password because the token is invalid" : "No es pot restablir la contrasenya perquè el testimoni no és vàlid",
+    "Couldn't reset password because the token is expired" : "No es pot restablir la contrasenya perquè el testimoni ha vençut",
     "Couldn't send reset email. Please make sure your username is correct." : "No s'ha pogut enviar el correu de restabliment. Assegureu-vos que el vostre nom d'usuari és correcte.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No s'ha pogut enviar el correu de restabliment perquè no hi ha cap correu electrònic per aquest usuari. Contacteu amb l'administrador.",
     "%s password reset" : "restableix la contrasenya %s",
@@ -134,6 +178,7 @@
     "New Password" : "Contrasenya nova",
     "Reset password" : "Reinicialitza la contrasenya",
     "Searching other places" : "Buscant altres ubicacions",
+    "No search results in other places" : "No hi ha resultats de cerques a altres llocs",
     "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultat de cerca en altres ubicacions","{count} resultats de cerca en altres ubicacions"],
     "Personal" : "Personal",
     "Users" : "Usuaris",
@@ -166,6 +211,7 @@
     "Message: %s" : "Missatge: %s",
     "File: %s" : "Fitxer: %s",
     "Line: %s" : "Línia: %s",
+    "Trace" : "Traça",
     "Security warning" : "Advertiment de seguretat",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
@@ -175,11 +221,14 @@
     "Data folder" : "Carpeta de dades",
     "Configure the database" : "Configura la base de dades",
     "Only %s is available." : "Només hi ha disponible %s",
+    "Install and activate additional PHP modules to choose other database types." : "Instal·la i activa mòduls PHP addicionals per seleccionar altres tipus de bases de dades.",
+    "For more details check out the documentation." : "Per més detalls consulteu la documentació.",
     "Database user" : "Usuari de la base de dades",
     "Database password" : "Contrasenya de la base de dades",
     "Database name" : "Nom de la base de dades",
     "Database tablespace" : "Espai de taula de la base de dades",
     "Database host" : "Ordinador central de la base de dades",
+    "Performance warning" : "Alerta de rendiment",
     "SQLite will be used as database." : "SQLite s'utilitzarà com a base de dades.",
     "For larger installations we recommend to choose a different database backend." : "Per a instal·lacions més grans es recomana triar una base de dades diferent.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "L'ús de SQLite està desaconsellat especialment quan s'usa el client d'escriptori per sincronitzar els fitxers.",
@@ -194,9 +243,9 @@
     "Please contact your administrator." : "Contacteu amb l'administrador.",
     "An internal error occured." : "S'ha produït un error intern.",
     "Please try again or contact your administrator." : "Intenti-ho de nou o posi's en contacte amb el seu administrador.",
-    "Forgot your password? Reset it!" : "Heu oblidat la contrasenya? Restabliu-la!",
-    "remember" : "recorda'm",
     "Log in" : "Inici de sessió",
+    "Wrong password. Reset it?" : "Contrasenya incorrecta. Voleu restablir-la?",
+    "remember" : "recorda'm",
     "Alternative Logins" : "Acreditacions alternatives",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ei, <br><br>només fer-vos saber que %s us ha comparti <strong>%s</strong>. <br><a href=\"%s\">Mireu-ho!</a>",
     "This ownCloud instance is currently in single user mode." : "La instància ownCloud està en mode d'usuari únic.",
@@ -207,8 +256,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacteu amb l'administrador. Si sou un administrador d'aquesta instància, configureu el paràmetre \"trusted_domain\" a config/config.php. Hi ha un exemple de configuració a config/config.sampe.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En funció de la teva configuració, com a administrador podries utilitzar el botó d'abaix per confiar en aquest domini.",
     "Add \"%s\" as trusted domain" : "Afegeix \"%s\" com a domini de confiança",
-    "%s will be updated to version %s." : "%s s'actualitzarà a la versió %s.",
-    "The following apps will be disabled:" : "Les següents aplicacions es desactivaran:",
+    "App update required" : "Cal que actualitzeu la aplicació",
+    "%s will be updated to version %s" : "%s s'actualitzarà a la versió %s",
+    "These apps will be updated:" : "Aquestes aplicacions s'actualitzaran:",
+    "These incompatible apps will be disabled:" : "Aquestes aplicacions incompatibles es desactivaran:",
     "The theme %s has been disabled." : "S'ha desactivat el tema %s",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assegureu-vos que heu fet una còpia de seguretat de la base de dades, del fitxer de configuració i de la carpeta de dades abans de continuar.",
     "Start update" : "Inicia l'actualització",
diff --git a/core/l10n/ca@valencia.js b/core/l10n/ca@valencia.js
deleted file mode 100644
index 4cb36aaaaa..0000000000
--- a/core/l10n/ca@valencia.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ca@valencia.json b/core/l10n/ca@valencia.json
deleted file mode 100644
index 43fce52c5c..0000000000
--- a/core/l10n/ca@valencia.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index 3e24ec2633..0ee3a06e45 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Nebylo možné odeslat email následujícím uživatelům: %s",
+    "Preparing update" : "Příprava na aktualizaci",
     "Turned on maintenance mode" : "Zapnut režim údržby",
     "Turned off maintenance mode" : "Vypnut režim údržby",
     "Maintenance mode is kept active" : "Mód údržby je aktivní",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Chyba opravy:",
     "Following incompatible apps have been disabled: %s" : "Následující nekompatibilní aplikace byly zakázány: %s",
     "Following apps have been disabled: %s" : "Následující aplikace byly vypnuty: %s",
+    "Already up to date" : "Je již aktuální",
     "File is too big" : "Soubor je příliš velký",
     "Invalid file provided" : "Zadán neplatný soubor",
     "No image or file provided" : "Soubor nebo obrázek nebyl zadán",
@@ -29,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Čtvrtek",
     "Friday" : "Pátek",
     "Saturday" : "Sobota",
+    "Sun." : "Ne",
+    "Mon." : "Po",
+    "Tue." : "Út",
+    "Wed." : "St",
+    "Thu." : "Čt",
+    "Fri." : "Pá",
+    "Sat." : "So",
+    "Su" : "Ne",
+    "Mo" : "Po",
+    "Tu" : "Út",
+    "We" : "St",
+    "Th" : "Čt",
+    "Fr" : "Pá",
+    "Sa" : "So",
     "January" : "Leden",
     "February" : "Únor",
     "March" : "Březen",
@@ -41,6 +57,18 @@ OC.L10N.register(
     "October" : "Říjen",
     "November" : "Listopad",
     "December" : "Prosinec",
+    "Jan." : "leden",
+    "Feb." : "únor",
+    "Mar." : "březen",
+    "Apr." : "duben",
+    "May." : "květen",
+    "Jun." : "červen",
+    "Jul." : "červenec",
+    "Aug." : "srpen",
+    "Sep." : "září",
+    "Oct." : "íjen",
+    "Nov." : "listopad",
+    "Dec." : "prosinec",
     "Settings" : "Nastavení",
     "Saving..." : "Ukládám...",
     "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte svého správce systému.",
@@ -76,13 +104,13 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z Internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nebyla nakonfigurována paměťová cache. Pro zlepšení výkonu a dostupnosti ji prosím nakonfigurujte. Další informace lze nalézt v naší <a href=\"{docLink}\">dokumentaci</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "PHP nemá práva pro čtení v /dev/urandom, to je ale z bezpečnostních důvodů velmi doporučováno. Více informací lze nalézt v <a href=\"{docLink}\">dokumentaci</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Vaše verze PHP ({version}) již není <a href=\"{phpLink}\">podporována</a>. Doporučujeme aktualizovat na poslední verzi PHP pro využití vylepšení výkonu a bezpečnosti.",
     "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP hlavička \"{header}\" není nakonfigurována ve shodě s \"{expected}\". To značí možné ohrožení bezpečnosti a soukromí a je doporučeno toto nastavení upravit.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP hlavička \"Strict-Transport-Security\" není nakonfigurována na minimum \"{seconds}\" sekund. Pro vylepšení bezpečnosti doporučujeme povolit HSTS dle popisu v našich <a href=\"{docUrl}\">bezpečnostních tipech</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Přistupujete na tuto stránku přes protokol HTTP. Důrazně doporučujeme nakonfigurovat server tak, aby vyžadoval použití HTTPS jak je popsáno v našich <a href=\"{docUrl}\">bezpečnostních tipech</a>.",
     "Shared" : "Sdílené",
     "Shared with {recipients}" : "Sdíleno s {recipients}",
-    "Share" : "Sdílet",
     "Error" : "Chyba",
     "Error while sharing" : "Chyba při sdílení",
     "Error while unsharing" : "Chyba při rušení sdílení",
@@ -91,6 +119,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "S Vámi sdílí {owner}",
     "Share with users or groups …" : "Sdílet s uživateli nebo skupinami",
     "Share with users, groups or remote users …" : "Sdílet s uživateli, skupinami nebo vzdálenými uživateli",
+    "Share" : "Sdílet",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Sdílejte s lidmi na ownClouds použitím syntaxe username@example.com/owncloud",
     "Share link" : "Sdílet odkaz",
     "The public link will expire no later than {days} days after it is created" : "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
@@ -144,6 +173,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Aktualizace byla úspěšná. Zachycen výskyt varování.",
     "The update was successful. Redirecting you to ownCloud now." : "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Heslo nebylo změněno kvůli neplatnému tokenu",
+    "Couldn't reset password because the token is expired" : "Heslo nebylo změněno z důvodu vypršení tokenu",
     "Couldn't send reset email. Please make sure your username is correct." : "Nelze odeslat email pro změnu hesla. Ujistěte se prosím, že zadáváte správné uživatelské jméno.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nelze odeslat email pro změnu hesla, protože u tohoto uživatelského jména není uvedena emailová adresa. Kontaktujte prosím svého správce systému.",
     "%s password reset" : "reset hesla %s",
@@ -217,9 +247,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Kontaktujte prosím svého správce systému.",
     "An internal error occured." : "Nastala vnitřní chyba.",
     "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.",
-    "Forgot your password? Reset it!" : "Zapomenuté heslo? Nastavte si nové!",
-    "remember" : "zapamatovat",
     "Log in" : "Přihlásit",
+    "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?",
+    "remember" : "zapamatovat",
     "Alternative Logins" : "Alternativní přihlášení",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
@@ -230,8 +260,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako správci, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
     "Add \"%s\" as trusted domain" : "Přidat \"%s\" jako důvěryhodnou doménu",
-    "%s will be updated to version %s." : "%s bude aktualizován na verzi %s.",
-    "The following apps will be disabled:" : "Následující aplikace budou zakázány:",
+    "App update required" : "Vyžadována aktualizace aplikace",
+    "%s will be updated to version %s" : "%s bude aktualizován na verzi %s",
+    "These apps will be updated:" : "Následující aplikace budou aktualizovány:",
+    "These incompatible apps will be disabled:" : "Následující nekompatibilní aplikace budou zakázány:",
     "The theme %s has been disabled." : "Vzhled %s byl zakázán.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány.  ",
     "Start update" : "Spustit aktualizaci",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 4069b611b5..1c38e7cc15 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Nebylo možné odeslat email následujícím uživatelům: %s",
+    "Preparing update" : "Příprava na aktualizaci",
     "Turned on maintenance mode" : "Zapnut režim údržby",
     "Turned off maintenance mode" : "Vypnut režim údržby",
     "Maintenance mode is kept active" : "Mód údržby je aktivní",
@@ -11,6 +12,7 @@
     "Repair error: " : "Chyba opravy:",
     "Following incompatible apps have been disabled: %s" : "Následující nekompatibilní aplikace byly zakázány: %s",
     "Following apps have been disabled: %s" : "Následující aplikace byly vypnuty: %s",
+    "Already up to date" : "Je již aktuální",
     "File is too big" : "Soubor je příliš velký",
     "Invalid file provided" : "Zadán neplatný soubor",
     "No image or file provided" : "Soubor nebo obrázek nebyl zadán",
@@ -27,6 +29,20 @@
     "Thursday" : "Čtvrtek",
     "Friday" : "Pátek",
     "Saturday" : "Sobota",
+    "Sun." : "Ne",
+    "Mon." : "Po",
+    "Tue." : "Út",
+    "Wed." : "St",
+    "Thu." : "Čt",
+    "Fri." : "Pá",
+    "Sat." : "So",
+    "Su" : "Ne",
+    "Mo" : "Po",
+    "Tu" : "Út",
+    "We" : "St",
+    "Th" : "Čt",
+    "Fr" : "Pá",
+    "Sa" : "So",
     "January" : "Leden",
     "February" : "Únor",
     "March" : "Březen",
@@ -39,6 +55,18 @@
     "October" : "Říjen",
     "November" : "Listopad",
     "December" : "Prosinec",
+    "Jan." : "leden",
+    "Feb." : "únor",
+    "Mar." : "březen",
+    "Apr." : "duben",
+    "May." : "květen",
+    "Jun." : "červen",
+    "Jul." : "červenec",
+    "Aug." : "srpen",
+    "Sep." : "září",
+    "Oct." : "íjen",
+    "Nov." : "listopad",
+    "Dec." : "prosinec",
     "Settings" : "Nastavení",
     "Saving..." : "Ukládám...",
     "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte svého správce systému.",
@@ -74,13 +102,13 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z Internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nebyla nakonfigurována paměťová cache. Pro zlepšení výkonu a dostupnosti ji prosím nakonfigurujte. Další informace lze nalézt v naší <a href=\"{docLink}\">dokumentaci</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "PHP nemá práva pro čtení v /dev/urandom, to je ale z bezpečnostních důvodů velmi doporučováno. Více informací lze nalézt v <a href=\"{docLink}\">dokumentaci</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Vaše verze PHP ({version}) již není <a href=\"{phpLink}\">podporována</a>. Doporučujeme aktualizovat na poslední verzi PHP pro využití vylepšení výkonu a bezpečnosti.",
     "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP hlavička \"{header}\" není nakonfigurována ve shodě s \"{expected}\". To značí možné ohrožení bezpečnosti a soukromí a je doporučeno toto nastavení upravit.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP hlavička \"Strict-Transport-Security\" není nakonfigurována na minimum \"{seconds}\" sekund. Pro vylepšení bezpečnosti doporučujeme povolit HSTS dle popisu v našich <a href=\"{docUrl}\">bezpečnostních tipech</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Přistupujete na tuto stránku přes protokol HTTP. Důrazně doporučujeme nakonfigurovat server tak, aby vyžadoval použití HTTPS jak je popsáno v našich <a href=\"{docUrl}\">bezpečnostních tipech</a>.",
     "Shared" : "Sdílené",
     "Shared with {recipients}" : "Sdíleno s {recipients}",
-    "Share" : "Sdílet",
     "Error" : "Chyba",
     "Error while sharing" : "Chyba při sdílení",
     "Error while unsharing" : "Chyba při rušení sdílení",
@@ -89,6 +117,7 @@
     "Shared with you by {owner}" : "S Vámi sdílí {owner}",
     "Share with users or groups …" : "Sdílet s uživateli nebo skupinami",
     "Share with users, groups or remote users …" : "Sdílet s uživateli, skupinami nebo vzdálenými uživateli",
+    "Share" : "Sdílet",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Sdílejte s lidmi na ownClouds použitím syntaxe username@example.com/owncloud",
     "Share link" : "Sdílet odkaz",
     "The public link will expire no later than {days} days after it is created" : "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
@@ -142,6 +171,7 @@
     "The update was successful. There were warnings." : "Aktualizace byla úspěšná. Zachycen výskyt varování.",
     "The update was successful. Redirecting you to ownCloud now." : "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
     "Couldn't reset password because the token is invalid" : "Heslo nebylo změněno kvůli neplatnému tokenu",
+    "Couldn't reset password because the token is expired" : "Heslo nebylo změněno z důvodu vypršení tokenu",
     "Couldn't send reset email. Please make sure your username is correct." : "Nelze odeslat email pro změnu hesla. Ujistěte se prosím, že zadáváte správné uživatelské jméno.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nelze odeslat email pro změnu hesla, protože u tohoto uživatelského jména není uvedena emailová adresa. Kontaktujte prosím svého správce systému.",
     "%s password reset" : "reset hesla %s",
@@ -215,9 +245,9 @@
     "Please contact your administrator." : "Kontaktujte prosím svého správce systému.",
     "An internal error occured." : "Nastala vnitřní chyba.",
     "Please try again or contact your administrator." : "Prosím zkuste to znovu nebo kontaktujte vašeho správce.",
-    "Forgot your password? Reset it!" : "Zapomenuté heslo? Nastavte si nové!",
-    "remember" : "zapamatovat",
     "Log in" : "Přihlásit",
+    "Wrong password. Reset it?" : "Nesprávné heslo. Resetovat?",
+    "remember" : "zapamatovat",
     "Alternative Logins" : "Alternativní přihlášení",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ahoj,<br><br>jen ti dávám vědět, že s tebou %s sdílí <strong>%s</strong>.<br><a href=\"%s\">Zkontroluj to!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
@@ -228,8 +258,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako správci, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
     "Add \"%s\" as trusted domain" : "Přidat \"%s\" jako důvěryhodnou doménu",
-    "%s will be updated to version %s." : "%s bude aktualizován na verzi %s.",
-    "The following apps will be disabled:" : "Následující aplikace budou zakázány:",
+    "App update required" : "Vyžadována aktualizace aplikace",
+    "%s will be updated to version %s" : "%s bude aktualizován na verzi %s",
+    "These apps will be updated:" : "Následující aplikace budou aktualizovány:",
+    "These incompatible apps will be disabled:" : "Následující nekompatibilní aplikace budou zakázány:",
     "The theme %s has been disabled." : "Vzhled %s byl zakázán.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány.  ",
     "Start update" : "Spustit aktualizaci",
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
index f72771889d..27df5177ff 100644
--- a/core/l10n/cy_GB.js
+++ b/core/l10n/cy_GB.js
@@ -8,6 +8,13 @@ OC.L10N.register(
     "Thursday" : "Iau",
     "Friday" : "Gwener",
     "Saturday" : "Sadwrn",
+    "Sun." : "Sul.",
+    "Mon." : "Llun.",
+    "Tue." : "Maw.",
+    "Wed." : "Mer.",
+    "Thu." : "Iau.",
+    "Fri." : "Gwe.",
+    "Sat." : "Sad.",
     "January" : "Ionawr",
     "February" : "Chwefror",
     "March" : "Mawrth",
@@ -20,6 +27,18 @@ OC.L10N.register(
     "October" : "Hydref",
     "November" : "Tachwedd",
     "December" : "Rhagfyr",
+    "Jan." : "Ion.",
+    "Feb." : "Chwe.",
+    "Mar." : "Maw.",
+    "Apr." : "Ebr.",
+    "May." : "Mai.",
+    "Jun." : "Meh.",
+    "Jul." : "Gor.",
+    "Aug." : "Aws.",
+    "Sep." : "Med.",
+    "Oct." : "Hyd.",
+    "Nov." : "Tach.",
+    "Dec." : "Rhag.",
     "Settings" : "Gosodiadau",
     "Saving..." : "Yn cadw...",
     "No" : "Na",
@@ -28,13 +47,13 @@ OC.L10N.register(
     "Ok" : "Iawn",
     "Cancel" : "Diddymu",
     "Shared" : "Rhannwyd",
-    "Share" : "Rhannu",
     "Error" : "Gwall",
     "Error while sharing" : "Gwall wrth rannu",
     "Error while unsharing" : "Gwall wrth ddad-rannu",
     "Error while changing permissions" : "Gwall wrth newid caniatâd",
     "Shared with you and the group {group} by {owner}" : "Rhannwyd â chi a'r grŵp {group} gan {owner}",
     "Shared with you by {owner}" : "Rhannwyd â chi gan {owner}",
+    "Share" : "Rhannu",
     "Password protect" : "Diogelu cyfrinair",
     "Password" : "Cyfrinair",
     "Email link to person" : "E-bostio dolen at berson",
@@ -81,8 +100,8 @@ OC.L10N.register(
     "Finish setup" : "Gorffen sefydlu",
     "Log out" : "Allgofnodi",
     "Search" : "Chwilio",
-    "remember" : "cofio",
     "Log in" : "Mewngofnodi",
+    "remember" : "cofio",
     "Alternative Logins" : "Mewngofnodiadau Amgen"
 },
 "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json
index a8cac06d4f..37f1aefb52 100644
--- a/core/l10n/cy_GB.json
+++ b/core/l10n/cy_GB.json
@@ -6,6 +6,13 @@
     "Thursday" : "Iau",
     "Friday" : "Gwener",
     "Saturday" : "Sadwrn",
+    "Sun." : "Sul.",
+    "Mon." : "Llun.",
+    "Tue." : "Maw.",
+    "Wed." : "Mer.",
+    "Thu." : "Iau.",
+    "Fri." : "Gwe.",
+    "Sat." : "Sad.",
     "January" : "Ionawr",
     "February" : "Chwefror",
     "March" : "Mawrth",
@@ -18,6 +25,18 @@
     "October" : "Hydref",
     "November" : "Tachwedd",
     "December" : "Rhagfyr",
+    "Jan." : "Ion.",
+    "Feb." : "Chwe.",
+    "Mar." : "Maw.",
+    "Apr." : "Ebr.",
+    "May." : "Mai.",
+    "Jun." : "Meh.",
+    "Jul." : "Gor.",
+    "Aug." : "Aws.",
+    "Sep." : "Med.",
+    "Oct." : "Hyd.",
+    "Nov." : "Tach.",
+    "Dec." : "Rhag.",
     "Settings" : "Gosodiadau",
     "Saving..." : "Yn cadw...",
     "No" : "Na",
@@ -26,13 +45,13 @@
     "Ok" : "Iawn",
     "Cancel" : "Diddymu",
     "Shared" : "Rhannwyd",
-    "Share" : "Rhannu",
     "Error" : "Gwall",
     "Error while sharing" : "Gwall wrth rannu",
     "Error while unsharing" : "Gwall wrth ddad-rannu",
     "Error while changing permissions" : "Gwall wrth newid caniatâd",
     "Shared with you and the group {group} by {owner}" : "Rhannwyd â chi a'r grŵp {group} gan {owner}",
     "Shared with you by {owner}" : "Rhannwyd â chi gan {owner}",
+    "Share" : "Rhannu",
     "Password protect" : "Diogelu cyfrinair",
     "Password" : "Cyfrinair",
     "Email link to person" : "E-bostio dolen at berson",
@@ -79,8 +98,8 @@
     "Finish setup" : "Gorffen sefydlu",
     "Log out" : "Allgofnodi",
     "Search" : "Chwilio",
-    "remember" : "cofio",
     "Log in" : "Mewngofnodi",
+    "remember" : "cofio",
     "Alternative Logins" : "Mewngofnodiadau Amgen"
 },"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
 }
\ No newline at end of file
diff --git a/core/l10n/da.js b/core/l10n/da.js
index 8c244641c3..c8684b3483 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Kunne ikke sende mail til følgende brugere: %s",
+    "Preparing update" : "Forbereder opdatering",
     "Turned on maintenance mode" : "Startede vedligeholdelsestilstand",
     "Turned off maintenance mode" : "standsede vedligeholdelsestilstand",
     "Maintenance mode is kept active" : "Vedligeholdelsestilstanden holdes kørende",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Reparationsfejl:",
     "Following incompatible apps have been disabled: %s" : "Følgende inkompatible apps er blevet deaktiveret: %s",
     "Following apps have been disabled: %s" : "Følgende apps er blevet deaktiveret: %s",
+    "Already up to date" : "Allerede opdateret",
     "File is too big" : "Filen er for stor",
     "Invalid file provided" : "Der er angivet en ugyldig fil",
     "No image or file provided" : "Ingen fil eller billede givet",
@@ -29,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Torsdag",
     "Friday" : "Fredag",
     "Saturday" : "Lørdag",
+    "Sun." : "Søn.",
+    "Mon." : "Man.",
+    "Tue." : "Tir.",
+    "Wed." : "Ons.",
+    "Thu." : "Tor.",
+    "Fri." : "Fre.",
+    "Sat." : "Lør.",
+    "Su" : "Sø",
+    "Mo" : "Ma",
+    "Tu" : "Ti",
+    "We" : "On",
+    "Th" : "To",
+    "Fr" : "Fr",
+    "Sa" : "Lø",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Marts",
@@ -41,6 +57,18 @@ OC.L10N.register(
     "October" : "Oktober",
     "November" : "November",
     "December" : "December",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Maj",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Indstillinger",
     "Saving..." : "Gemmer...",
     "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
@@ -76,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. Filen .htaccess fungerer ikke. Vi anbefaler på det kraftigste, at du konfigurerer din webserver således at datamappen ikke længere er tilgængelig, eller at du flytter datamappen uden for webserverens dokumentrod.  ",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Der er ikke konfigureret et hukommelsesmellemlager. For at forbedre din ydelse, skal du konfigurere et mellemlager, hvis den er tilgængelig. Du finder mere information i din <a href=\"{docLink}\">dokumentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom kan ikke læses af PHP, hvilket stærkt frarådes af sikkerhedsmæssige årsager. Der fås mere information i vores <a href=\"{docLink}\">dokumentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Din version af PHP ({version}) bliver ikke længere <a href=\"{phpLink}\">understøttet af PHP</a>. Vi opfordrer dig til at opgradere din PHP-version, for at opnå fordelene i ydelse og sikkerhed gennem opdateringerne som fås fra PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Den omvendte konnfiguration af proxyen er ikke korrekt, eller også tilgår du ownCloud fra en proxy som der er tillid til. Hvis ikke tilgår ownCloud fra en proxy som der er tillid til, så er der er et sikkerhedsproblem, hvilket kan tillade at en angriber kan forfalske deres IP-adresse som synlig for ownCloud. Mere information fås i vores <a href=\"{docLink}\">dokumentation</a>.",
     "Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-hovedet \"{header}\" er ikke konfigureret til at være lig med \"{expected}\". Dette er en potentiel sikkerhedsrisiko, og vi anbefaler at du justerer denne indstilling.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP-hovedet \"Strict-Transport-Security\" er ikke konfigureret til mindst \"{seconds}\" sekunder. For udvidet sikkerhed anbefaler vi at aktivere HSTS, som foreskrevet i vores <a href=\"{docUrl}\">sikkerhedstips</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du tilgår dette sted gennem HTTP. Vi anbefaler kraftigt at du konfigurerer din server, så der kræves brug af HTTPS i stedet for, som foreskrevet i vores <a href=\"{docUrl}\">sikkerhedstips</a>.",
     "Shared" : "Delt",
     "Shared with {recipients}" : "Delt med {recipients}",
-    "Share" : "Del",
     "Error" : "Fejl",
     "Error while sharing" : "Fejl under deling",
     "Error while unsharing" : "Fejl under annullering af deling",
@@ -91,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Delt med dig af {owner}",
     "Share with users or groups …" : "Del med brugere eller grupper",
     "Share with users, groups or remote users …" : "Del med brugere, grupper eller eksterne brugere...",
+    "Share" : "Del",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
     "Share link" : "Del link",
     "The public link will expire no later than {days} days after it is created" : "Det offentlige link udløber senest {days} dage efter det blev oprettet",
@@ -144,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Opdateringen blev gennemført. Der fremkom advarsler.",
     "The update was successful. Redirecting you to ownCloud now." : "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
     "Couldn't reset password because the token is invalid" : "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt",
+    "Couldn't reset password because the token is expired" : "Kunne ikke nulstille kodeord, da tokenet er udløbet",
     "Couldn't send reset email. Please make sure your username is correct." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
     "%s password reset" : "%s adgangskode nulstillet",
@@ -217,9 +248,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Kontakt venligst din administrator",
     "An internal error occured." : "Der skete en intern fejl.",
     "Please try again or contact your administrator." : "Kontakt venligst din administrator.",
-    "Forgot your password? Reset it!" : "Glemt din adgangskode? Nulstil det!",
-    "remember" : "husk",
     "Log in" : "Log ind",
+    "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?",
+    "remember" : "husk",
     "Alternative Logins" : "Alternative logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denne ownCloud instans er lige nu i enkeltbruger tilstand.",
@@ -230,8 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontakt venligst din administrator. Hvis du er administrator, konfigurer \"trusted_domain\" indstillingen i config/config.php. Et eksempel kan ses i config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhænger af din konfiguration, da du som administrator eventuelt også er i stand til at gøre brug af knappen nedenfor til at tildele tillid til dette domæne.",
     "Add \"%s\" as trusted domain" : "Tilføj \"%s\" som et troværdigt domæne",
-    "%s will be updated to version %s." : "%s vil blive opdateret til version %s.",
-    "The following apps will be disabled:" : "Følgende apps bliver deaktiveret:",
+    "App update required" : "Opdatering af app påkræves",
+    "%s will be updated to version %s" : "%s vil blive opdateret til version %s",
+    "These apps will be updated:" : "Følgende apps vil blive opdateret:",
+    "These incompatible apps will be disabled:" : "Følgende inkompatible apps vil blive slået fra:",
     "The theme %s has been disabled." : "Temaet, %s, er blevet deaktiveret.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Sørg venligst for at sikre, at databasen, config-mappen og data-mappen er blevet sikkerhedskopieret inden vi fortsætter.",
     "Start update" : "Begynd opdatering",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index 0b79a2731b..067d5e6914 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Kunne ikke sende mail til følgende brugere: %s",
+    "Preparing update" : "Forbereder opdatering",
     "Turned on maintenance mode" : "Startede vedligeholdelsestilstand",
     "Turned off maintenance mode" : "standsede vedligeholdelsestilstand",
     "Maintenance mode is kept active" : "Vedligeholdelsestilstanden holdes kørende",
@@ -11,6 +12,7 @@
     "Repair error: " : "Reparationsfejl:",
     "Following incompatible apps have been disabled: %s" : "Følgende inkompatible apps er blevet deaktiveret: %s",
     "Following apps have been disabled: %s" : "Følgende apps er blevet deaktiveret: %s",
+    "Already up to date" : "Allerede opdateret",
     "File is too big" : "Filen er for stor",
     "Invalid file provided" : "Der er angivet en ugyldig fil",
     "No image or file provided" : "Ingen fil eller billede givet",
@@ -27,6 +29,20 @@
     "Thursday" : "Torsdag",
     "Friday" : "Fredag",
     "Saturday" : "Lørdag",
+    "Sun." : "Søn.",
+    "Mon." : "Man.",
+    "Tue." : "Tir.",
+    "Wed." : "Ons.",
+    "Thu." : "Tor.",
+    "Fri." : "Fre.",
+    "Sat." : "Lør.",
+    "Su" : "Sø",
+    "Mo" : "Ma",
+    "Tu" : "Ti",
+    "We" : "On",
+    "Th" : "To",
+    "Fr" : "Fr",
+    "Sa" : "Lø",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Marts",
@@ -39,6 +55,18 @@
     "October" : "Oktober",
     "November" : "November",
     "December" : "December",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Maj",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Indstillinger",
     "Saving..." : "Gemmer...",
     "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
@@ -74,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. Filen .htaccess fungerer ikke. Vi anbefaler på det kraftigste, at du konfigurerer din webserver således at datamappen ikke længere er tilgængelig, eller at du flytter datamappen uden for webserverens dokumentrod.  ",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Der er ikke konfigureret et hukommelsesmellemlager. For at forbedre din ydelse, skal du konfigurere et mellemlager, hvis den er tilgængelig. Du finder mere information i din <a href=\"{docLink}\">dokumentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom kan ikke læses af PHP, hvilket stærkt frarådes af sikkerhedsmæssige årsager. Der fås mere information i vores <a href=\"{docLink}\">dokumentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Din version af PHP ({version}) bliver ikke længere <a href=\"{phpLink}\">understøttet af PHP</a>. Vi opfordrer dig til at opgradere din PHP-version, for at opnå fordelene i ydelse og sikkerhed gennem opdateringerne som fås fra PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Den omvendte konnfiguration af proxyen er ikke korrekt, eller også tilgår du ownCloud fra en proxy som der er tillid til. Hvis ikke tilgår ownCloud fra en proxy som der er tillid til, så er der er et sikkerhedsproblem, hvilket kan tillade at en angriber kan forfalske deres IP-adresse som synlig for ownCloud. Mere information fås i vores <a href=\"{docLink}\">dokumentation</a>.",
     "Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-hovedet \"{header}\" er ikke konfigureret til at være lig med \"{expected}\". Dette er en potentiel sikkerhedsrisiko, og vi anbefaler at du justerer denne indstilling.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP-hovedet \"Strict-Transport-Security\" er ikke konfigureret til mindst \"{seconds}\" sekunder. For udvidet sikkerhed anbefaler vi at aktivere HSTS, som foreskrevet i vores <a href=\"{docUrl}\">sikkerhedstips</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du tilgår dette sted gennem HTTP. Vi anbefaler kraftigt at du konfigurerer din server, så der kræves brug af HTTPS i stedet for, som foreskrevet i vores <a href=\"{docUrl}\">sikkerhedstips</a>.",
     "Shared" : "Delt",
     "Shared with {recipients}" : "Delt med {recipients}",
-    "Share" : "Del",
     "Error" : "Fejl",
     "Error while sharing" : "Fejl under deling",
     "Error while unsharing" : "Fejl under annullering af deling",
@@ -89,6 +118,7 @@
     "Shared with you by {owner}" : "Delt med dig af {owner}",
     "Share with users or groups …" : "Del med brugere eller grupper",
     "Share with users, groups or remote users …" : "Del med brugere, grupper eller eksterne brugere...",
+    "Share" : "Del",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med andre på ownCloud ved hjælp af syntaxen username@example.com/owncloud",
     "Share link" : "Del link",
     "The public link will expire no later than {days} days after it is created" : "Det offentlige link udløber senest {days} dage efter det blev oprettet",
@@ -142,6 +172,7 @@
     "The update was successful. There were warnings." : "Opdateringen blev gennemført. Der fremkom advarsler.",
     "The update was successful. Redirecting you to ownCloud now." : "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
     "Couldn't reset password because the token is invalid" : "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt",
+    "Couldn't reset password because the token is expired" : "Kunne ikke nulstille kodeord, da tokenet er udløbet",
     "Couldn't send reset email. Please make sure your username is correct." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
     "%s password reset" : "%s adgangskode nulstillet",
@@ -215,9 +246,9 @@
     "Please contact your administrator." : "Kontakt venligst din administrator",
     "An internal error occured." : "Der skete en intern fejl.",
     "Please try again or contact your administrator." : "Kontakt venligst din administrator.",
-    "Forgot your password? Reset it!" : "Glemt din adgangskode? Nulstil det!",
-    "remember" : "husk",
     "Log in" : "Log ind",
+    "Wrong password. Reset it?" : "Forkert kodeord. Skal det nulstilles?",
+    "remember" : "husk",
     "Alternative Logins" : "Alternative logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej med dig,<br><br>Dette er blot for at informere dig om, at %s har delt <strong>%s</strong> med dig.<br><a href=\"%s\">Se det her!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denne ownCloud instans er lige nu i enkeltbruger tilstand.",
@@ -228,8 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontakt venligst din administrator. Hvis du er administrator, konfigurer \"trusted_domain\" indstillingen i config/config.php. Et eksempel kan ses i config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhænger af din konfiguration, da du som administrator eventuelt også er i stand til at gøre brug af knappen nedenfor til at tildele tillid til dette domæne.",
     "Add \"%s\" as trusted domain" : "Tilføj \"%s\" som et troværdigt domæne",
-    "%s will be updated to version %s." : "%s vil blive opdateret til version %s.",
-    "The following apps will be disabled:" : "Følgende apps bliver deaktiveret:",
+    "App update required" : "Opdatering af app påkræves",
+    "%s will be updated to version %s" : "%s vil blive opdateret til version %s",
+    "These apps will be updated:" : "Følgende apps vil blive opdateret:",
+    "These incompatible apps will be disabled:" : "Følgende inkompatible apps vil blive slået fra:",
     "The theme %s has been disabled." : "Temaet, %s, er blevet deaktiveret.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Sørg venligst for at sikre, at databasen, config-mappen og data-mappen er blevet sikkerhedskopieret inden vi fortsætter.",
     "Start update" : "Begynd opdatering",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 6764ac18bd..495ea72c71 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Repair error: " : "Reperaturfehler:",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
+    "File is too big" : "Datei ist zu groß",
     "Invalid file provided" : "Ungültige Datei zur Verfügung gestellt",
     "No image or file provided" : "Es wurde weder ein Bild noch eine Datei zur Verfügung gestellt",
     "Unknown filetype" : "Unbekannter Dateityp",
@@ -28,6 +29,13 @@ OC.L10N.register(
     "Thursday" : "Donnerstag",
     "Friday" : "Freitag",
     "Saturday" : "Samstag",
+    "Sun." : "So",
+    "Mon." : "Mo",
+    "Tue." : "Di",
+    "Wed." : "Mi",
+    "Thu." : "Do",
+    "Fri." : "Fr",
+    "Sat." : "Sa",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "März",
@@ -40,6 +48,18 @@ OC.L10N.register(
     "October" : "Oktober",
     "November" : "November",
     "December" : "Dezember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mär.",
+    "Apr." : "Apr.",
+    "May." : "Mai",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Einstellungen",
     "Saving..." : "Speichern…",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
@@ -75,13 +95,13 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Deinen Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Du es aus dem Document-Root-Verzeichnis des Webservers herausverschiebst.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ist für PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu findest Du in unserer <a href=\"{docLink}\">Dokumentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Deine PHP Version ({version}) ist nicht länger <a href=\"{phpLink}\">supported</a>. Wir empfehlen ein Upgrade deiner PHP Version, um die volle Performance und Sicherheit zu gewährleisten.",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für umfassende Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> erläutert ist.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du greifst auf diese Site über HTTP zu. Wir raten dringend dazu, Deinen Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.",
     "Shared" : "Geteilt",
     "Shared with {recipients}" : "Geteilt mit {recipients}",
-    "Share" : "Teilen",
     "Error" : "Fehler",
     "Error while sharing" : "Fehler beim Teilen",
     "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
@@ -90,6 +110,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
     "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
     "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
+    "Share" : "Teilen",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
     "Share link" : "Link teilen",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
@@ -171,7 +192,7 @@ OC.L10N.register(
     "You can click here to return to %s." : "Du kannst zur Rückkehr zu %s hier klicken.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass %s %s mit Dir geteilt hat.\nZum Anzeigen: %s\n\n",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
-    "Cheers!" : "Hallo!",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Internal Server Error" : "Interner Serverfehler",
     "The server encountered an internal error and was unable to complete your request." : "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wende Dich an den Serveradministrator, sollte dieser Fehler mehrfach auftreten, und füge Deiner Anfrage die unten stehenden technischen Details bei.",
@@ -216,9 +237,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.",
     "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
     "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.",
-    "Forgot your password? Reset it!" : "Du hast Dein Passwort vergessen? Setze es zurück!",
+    "Log in" : "Anmelden",
+    "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "remember" : "merken",
-    "Log in" : "Einloggen",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass %s <strong>%s</strong> mit Dir geteilt hat.<br><a href=\"%s\">Sieh es Dir an!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
@@ -229,8 +250,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktiere Deinen Administrator. Wenn Du Administrator dieser Instanz bist, konfiguriere bitte die „trusted_domain“-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereitgestellt.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Wenn es Deine Konfiguration zulässt, kannst Du als Administrator gegebenenfalls den Button unten benutzen, um diese Domain als vertrauenswürdig einzustufen.",
     "Add \"%s\" as trusted domain" : "„%s“ als vertrauenswürdige Domain hinzufügen",
-    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
-    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
     "The theme %s has been disabled." : "Das Theme %s wurde deaktiviert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Bitte stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.",
     "Start update" : "Aktualisierung starten",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index ee41ef1810..fc826c7fde 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -11,6 +11,7 @@
     "Repair error: " : "Reperaturfehler:",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
+    "File is too big" : "Datei ist zu groß",
     "Invalid file provided" : "Ungültige Datei zur Verfügung gestellt",
     "No image or file provided" : "Es wurde weder ein Bild noch eine Datei zur Verfügung gestellt",
     "Unknown filetype" : "Unbekannter Dateityp",
@@ -26,6 +27,13 @@
     "Thursday" : "Donnerstag",
     "Friday" : "Freitag",
     "Saturday" : "Samstag",
+    "Sun." : "So",
+    "Mon." : "Mo",
+    "Tue." : "Di",
+    "Wed." : "Mi",
+    "Thu." : "Do",
+    "Fri." : "Fr",
+    "Sat." : "Sa",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "März",
@@ -38,6 +46,18 @@
     "October" : "Oktober",
     "November" : "November",
     "December" : "Dezember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mär.",
+    "Apr." : "Apr.",
+    "May." : "Mai",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Einstellungen",
     "Saving..." : "Speichern…",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
@@ -73,13 +93,13 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Deinen Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Du es aus dem Document-Root-Verzeichnis des Webservers herausverschiebst.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfiguriere zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a href=\"{docLink}\">Dokumentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ist für PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu findest Du in unserer <a href=\"{docLink}\">Dokumentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Deine PHP Version ({version}) ist nicht länger <a href=\"{phpLink}\">supported</a>. Wir empfehlen ein Upgrade deiner PHP Version, um die volle Performance und Sicherheit zu gewährleisten.",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Der „{header}“-HTTP-Header ist nicht so konfiguriert, dass er „{expected}“ entspricht. Dies ist ein potentielles Sicherheitsrisiko und es wird empfohlen, diese Einstellung zu ändern.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Der „Strict-Transport-Security“-HTTP-Header ist nicht auf mindestens „{seconds}“ Sekunden eingestellt. Für umfassende Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> erläutert ist.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du greifst auf diese Site über HTTP zu. Wir raten dringend dazu, Deinen Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.",
     "Shared" : "Geteilt",
     "Shared with {recipients}" : "Geteilt mit {recipients}",
-    "Share" : "Teilen",
     "Error" : "Fehler",
     "Error while sharing" : "Fehler beim Teilen",
     "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
@@ -88,6 +108,7 @@
     "Shared with you by {owner}" : "{owner} hat dies mit Dir geteilt",
     "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
     "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
+    "Share" : "Teilen",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
     "Share link" : "Link teilen",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
@@ -169,7 +190,7 @@
     "You can click here to return to %s." : "Du kannst zur Rückkehr zu %s hier klicken.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass %s %s mit Dir geteilt hat.\nZum Anzeigen: %s\n\n",
     "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
-    "Cheers!" : "Hallo!",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Internal Server Error" : "Interner Serverfehler",
     "The server encountered an internal error and was unable to complete your request." : "Der Server hat einen internen Fehler und konnte Ihre Anfrage nicht vervollständigen.",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Bitte wende Dich an den Serveradministrator, sollte dieser Fehler mehrfach auftreten, und füge Deiner Anfrage die unten stehenden technischen Details bei.",
@@ -214,9 +235,9 @@
     "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.",
     "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
     "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere Deinen Administrator.",
-    "Forgot your password? Reset it!" : "Du hast Dein Passwort vergessen? Setze es zurück!",
+    "Log in" : "Anmelden",
+    "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "remember" : "merken",
-    "Log in" : "Einloggen",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass %s <strong>%s</strong> mit Dir geteilt hat.<br><a href=\"%s\">Sieh es Dir an!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
@@ -227,8 +248,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktiere Deinen Administrator. Wenn Du Administrator dieser Instanz bist, konfiguriere bitte die „trusted_domain“-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereitgestellt.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Wenn es Deine Konfiguration zulässt, kannst Du als Administrator gegebenenfalls den Button unten benutzen, um diese Domain als vertrauenswürdig einzustufen.",
     "Add \"%s\" as trusted domain" : "„%s“ als vertrauenswürdige Domain hinzufügen",
-    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
-    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
     "The theme %s has been disabled." : "Das Theme %s wurde deaktiviert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Bitte stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.",
     "Start update" : "Aktualisierung starten",
diff --git a/core/l10n/de_AT.js b/core/l10n/de_AT.js
index 7fafeb4020..716851f53b 100644
--- a/core/l10n/de_AT.js
+++ b/core/l10n/de_AT.js
@@ -8,6 +8,13 @@ OC.L10N.register(
     "Thursday" : "Donnerstag",
     "Friday" : "Freitag",
     "Saturday" : "Samstag",
+    "Sun." : "So",
+    "Mon." : "Mo",
+    "Tue." : "Di",
+    "Wed." : "Mi",
+    "Thu." : "Do",
+    "Fri." : "Fr",
+    "Sat." : "Sa",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "März",
@@ -20,13 +27,25 @@ OC.L10N.register(
     "October" : "Oktober",
     "November" : "November",
     "December" : "Dezember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mär.",
+    "Apr." : "Apr.",
+    "May." : "Mai",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Einstellungen",
     "No" : "Nein",
     "Yes" : "Ja",
     "Cancel" : "Abbrechen",
     "Continue" : "Weiter",
-    "Share" : "Freigeben",
     "Error" : "Fehler",
+    "Share" : "Freigeben",
     "Share link" : "Link teilen",
     "Password" : "Passwort",
     "Send" : "Senden",
diff --git a/core/l10n/de_AT.json b/core/l10n/de_AT.json
index 56557d96d9..a0798f9a82 100644
--- a/core/l10n/de_AT.json
+++ b/core/l10n/de_AT.json
@@ -6,6 +6,13 @@
     "Thursday" : "Donnerstag",
     "Friday" : "Freitag",
     "Saturday" : "Samstag",
+    "Sun." : "So",
+    "Mon." : "Mo",
+    "Tue." : "Di",
+    "Wed." : "Mi",
+    "Thu." : "Do",
+    "Fri." : "Fr",
+    "Sat." : "Sa",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "März",
@@ -18,13 +25,25 @@
     "October" : "Oktober",
     "November" : "November",
     "December" : "Dezember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mär.",
+    "Apr." : "Apr.",
+    "May." : "Mai",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Einstellungen",
     "No" : "Nein",
     "Yes" : "Ja",
     "Cancel" : "Abbrechen",
     "Continue" : "Weiter",
-    "Share" : "Freigeben",
     "Error" : "Fehler",
+    "Share" : "Freigeben",
     "Share link" : "Link teilen",
     "Password" : "Passwort",
     "Send" : "Senden",
diff --git a/core/l10n/de_CH.js b/core/l10n/de_CH.js
deleted file mode 100644
index a95205b439..0000000000
--- a/core/l10n/de_CH.js
+++ /dev/null
@@ -1,105 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
-    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
-    "Updated database" : "Datenbank aktualisiert",
-    "Sunday" : "Sonntag",
-    "Monday" : "Montag",
-    "Tuesday" : "Dienstag",
-    "Wednesday" : "Mittwoch",
-    "Thursday" : "Donnerstag",
-    "Friday" : "Freitag",
-    "Saturday" : "Samstag",
-    "January" : "Januar",
-    "February" : "Februar",
-    "March" : "März",
-    "April" : "April",
-    "May" : "Mai",
-    "June" : "Juni",
-    "July" : "Juli",
-    "August" : "August",
-    "September" : "September",
-    "October" : "Oktober",
-    "November" : "November",
-    "December" : "Dezember",
-    "Settings" : "Einstellungen",
-    "Saving..." : "Speichern...",
-    "Reset password" : "Passwort zurücksetzen",
-    "No" : "Nein",
-    "Yes" : "Ja",
-    "Choose" : "Auswählen",
-    "Ok" : "OK",
-    "New Files" : "Neue Dateien",
-    "Cancel" : "Abbrechen",
-    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
-    "Shared" : "Geteilt",
-    "Share" : "Teilen",
-    "Error" : "Fehler",
-    "Error while sharing" : "Fehler beim Teilen",
-    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
-    "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
-    "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
-    "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
-    "Password protect" : "Passwortschutz",
-    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
-    "Email link to person" : "Link per E-Mail verschicken",
-    "Send" : "Senden",
-    "Set expiration date" : "Ein Ablaufdatum setzen",
-    "Expiration date" : "Ablaufdatum",
-    "group" : "Gruppe",
-    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
-    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
-    "Unshare" : "Freigabe aufheben",
-    "can edit" : "kann bearbeiten",
-    "access control" : "Zugriffskontrolle",
-    "create" : "erstellen",
-    "update" : "aktualisieren",
-    "delete" : "löschen",
-    "Password protected" : "Passwortgeschützt",
-    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
-    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
-    "Sending ..." : "Sende ...",
-    "Email sent" : "Email gesendet",
-    "Warning" : "Warnung",
-    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
-    "Delete" : "Löschen",
-    "Add" : "Hinzufügen",
-    "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
-    "%s password reset" : "%s-Passwort zurücksetzen",
-    "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
-    "Username" : "Benutzername",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
-    "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
-    "Reset" : "Zurücksetzen",
-    "New password" : "Neues Passwort",
-    "Personal" : "Persönlich",
-    "Users" : "Benutzer",
-    "Apps" : "Apps",
-    "Admin" : "Administrator",
-    "Help" : "Hilfe",
-    "Access forbidden" : "Zugriff verboten",
-    "Security Warning" : "Sicherheitshinweis",
-    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-    "Please update your PHP installation to use %s securely." : "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
-    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
-    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
-    "Password" : "Passwort",
-    "Data folder" : "Datenverzeichnis",
-    "Configure the database" : "Datenbank einrichten",
-    "Database user" : "Datenbank-Benutzer",
-    "Database password" : "Datenbank-Passwort",
-    "Database name" : "Datenbank-Name",
-    "Database tablespace" : "Datenbank-Tablespace",
-    "Database host" : "Datenbank-Host",
-    "Finish setup" : "Installation abschliessen",
-    "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
-    "Log out" : "Abmelden",
-    "remember" : "merken",
-    "Log in" : "Einloggen",
-    "Alternative Logins" : "Alternative Logins"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de_CH.json b/core/l10n/de_CH.json
deleted file mode 100644
index 8d84ade00c..0000000000
--- a/core/l10n/de_CH.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{ "translations": {
-    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
-    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
-    "Updated database" : "Datenbank aktualisiert",
-    "Sunday" : "Sonntag",
-    "Monday" : "Montag",
-    "Tuesday" : "Dienstag",
-    "Wednesday" : "Mittwoch",
-    "Thursday" : "Donnerstag",
-    "Friday" : "Freitag",
-    "Saturday" : "Samstag",
-    "January" : "Januar",
-    "February" : "Februar",
-    "March" : "März",
-    "April" : "April",
-    "May" : "Mai",
-    "June" : "Juni",
-    "July" : "Juli",
-    "August" : "August",
-    "September" : "September",
-    "October" : "Oktober",
-    "November" : "November",
-    "December" : "Dezember",
-    "Settings" : "Einstellungen",
-    "Saving..." : "Speichern...",
-    "Reset password" : "Passwort zurücksetzen",
-    "No" : "Nein",
-    "Yes" : "Ja",
-    "Choose" : "Auswählen",
-    "Ok" : "OK",
-    "New Files" : "Neue Dateien",
-    "Cancel" : "Abbrechen",
-    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
-    "Shared" : "Geteilt",
-    "Share" : "Teilen",
-    "Error" : "Fehler",
-    "Error while sharing" : "Fehler beim Teilen",
-    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
-    "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
-    "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
-    "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
-    "Password protect" : "Passwortschutz",
-    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
-    "Email link to person" : "Link per E-Mail verschicken",
-    "Send" : "Senden",
-    "Set expiration date" : "Ein Ablaufdatum setzen",
-    "Expiration date" : "Ablaufdatum",
-    "group" : "Gruppe",
-    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
-    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
-    "Unshare" : "Freigabe aufheben",
-    "can edit" : "kann bearbeiten",
-    "access control" : "Zugriffskontrolle",
-    "create" : "erstellen",
-    "update" : "aktualisieren",
-    "delete" : "löschen",
-    "Password protected" : "Passwortgeschützt",
-    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
-    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
-    "Sending ..." : "Sende ...",
-    "Email sent" : "Email gesendet",
-    "Warning" : "Warnung",
-    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
-    "Delete" : "Löschen",
-    "Add" : "Hinzufügen",
-    "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
-    "%s password reset" : "%s-Passwort zurücksetzen",
-    "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
-    "Username" : "Benutzername",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
-    "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
-    "Reset" : "Zurücksetzen",
-    "New password" : "Neues Passwort",
-    "Personal" : "Persönlich",
-    "Users" : "Benutzer",
-    "Apps" : "Apps",
-    "Admin" : "Administrator",
-    "Help" : "Hilfe",
-    "Access forbidden" : "Zugriff verboten",
-    "Security Warning" : "Sicherheitshinweis",
-    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-    "Please update your PHP installation to use %s securely." : "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
-    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
-    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
-    "Password" : "Passwort",
-    "Data folder" : "Datenverzeichnis",
-    "Configure the database" : "Datenbank einrichten",
-    "Database user" : "Datenbank-Benutzer",
-    "Database password" : "Datenbank-Passwort",
-    "Database name" : "Datenbank-Name",
-    "Database tablespace" : "Datenbank-Tablespace",
-    "Database host" : "Datenbank-Host",
-    "Finish setup" : "Installation abschliessen",
-    "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
-    "Log out" : "Abmelden",
-    "remember" : "merken",
-    "Log in" : "Einloggen",
-    "Alternative Logins" : "Alternative Logins"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 82026f4fab..0a4689261a 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
+    "Preparing update" : "Update vorbereiten",
     "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ",
     "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
     "Maintenance mode is kept active" : "Wartungsmodus wird aktiv gehalten",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "Reperaturfehler:",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
+    "Already up to date" : "Bereits aktuell",
+    "File is too big" : "Datei ist zu groß",
     "Invalid file provided" : "Ungültige Datei zur Verfügung gestellt",
     "No image or file provided" : "Es wurde weder ein Bild noch eine Datei zur Verfügung gestellt",
     "Unknown filetype" : "Unbekannter Dateityp",
@@ -28,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Donnerstag",
     "Friday" : "Freitag",
     "Saturday" : "Samstag",
+    "Sun." : "So",
+    "Mon." : "Mo",
+    "Tue." : "Di",
+    "Wed." : "Mi",
+    "Thu." : "Do",
+    "Fri." : "Fr",
+    "Sat." : "Sa",
+    "Su" : "So",
+    "Mo" : "Mo",
+    "Tu" : "Di",
+    "We" : "Mi",
+    "Th" : "Do",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "März",
@@ -40,6 +57,18 @@ OC.L10N.register(
     "October" : "Oktober",
     "November" : "November",
     "December" : "Dezember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mär.",
+    "Apr." : "Apr.",
+    "May." : "Mai",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Einstellungen",
     "Saving..." : "Speichervorgang…",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
@@ -81,7 +110,6 @@ OC.L10N.register(
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Sie greifen auf diese Site über HTTP zu. Wir raten dringend dazu, Ihren Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.",
     "Shared" : "Geteilt",
     "Shared with {recipients}" : "Geteilt mit {recipients}",
-    "Share" : "Teilen",
     "Error" : "Fehler",
     "Error while sharing" : "Fehler beim Teilen",
     "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
@@ -90,6 +118,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
     "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
     "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
+    "Share" : "Teilen",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
     "Share link" : "Link teilen",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
@@ -216,9 +245,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.",
     "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
     "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.",
-    "Forgot your password? Reset it!" : "Sie haben Ihr Passwort vergessen? Setzen Sie es zurück!",
-    "remember" : "merken",
     "Log in" : "Einloggen",
+    "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
+    "remember" : "merken",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Sehen Sie es sich an!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
@@ -229,8 +258,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktieren Sie Ihren Administrator. Wenn Sie Administrator dieser Instanz sind, konfigurieren Sie bitte die „trusted_domain“-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereitgestellt.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Wenn es Ihre Konfiguration zulässt, können Sie als Administrator gegebenenfalls den Button unten benutzen, um diese Domain als vertrauenswürdig einzustufen.",
     "Add \"%s\" as trusted domain" : "„%s“ als vertrauenswürdige Domain hinzufügen",
-    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
-    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
+    "App update required" : "App-Update notwendig",
+    "%s will be updated to version %s" : "%s wird auf Version %s aktualisiert",
+    "These apps will be updated:" : "Diese Apps werden aktualisiert:",
+    "These incompatible apps will be disabled:" : "Diese inkompatiblen Apps werden deaktiviert:",
     "The theme %s has been disabled." : "Das Thema %s wurde deaktiviert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stellen Sie vor dem Fortsetzen bitte sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.",
     "Start update" : "Aktualisierung starten",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 7b15799a10..a5f2d5857e 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
+    "Preparing update" : "Update vorbereiten",
     "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ",
     "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
     "Maintenance mode is kept active" : "Wartungsmodus wird aktiv gehalten",
@@ -11,6 +12,8 @@
     "Repair error: " : "Reperaturfehler:",
     "Following incompatible apps have been disabled: %s" : "Die folgenden inkompatiblen Apps sind deaktiviert worden: %s",
     "Following apps have been disabled: %s" : "Die folgenden Apps sind deaktiviert worden: %s",
+    "Already up to date" : "Bereits aktuell",
+    "File is too big" : "Datei ist zu groß",
     "Invalid file provided" : "Ungültige Datei zur Verfügung gestellt",
     "No image or file provided" : "Es wurde weder ein Bild noch eine Datei zur Verfügung gestellt",
     "Unknown filetype" : "Unbekannter Dateityp",
@@ -26,6 +29,20 @@
     "Thursday" : "Donnerstag",
     "Friday" : "Freitag",
     "Saturday" : "Samstag",
+    "Sun." : "So",
+    "Mon." : "Mo",
+    "Tue." : "Di",
+    "Wed." : "Mi",
+    "Thu." : "Do",
+    "Fri." : "Fr",
+    "Sat." : "Sa",
+    "Su" : "So",
+    "Mo" : "Mo",
+    "Tu" : "Di",
+    "We" : "Mi",
+    "Th" : "Do",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "März",
@@ -38,6 +55,18 @@
     "October" : "Oktober",
     "November" : "November",
     "December" : "Dezember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mär.",
+    "Apr." : "Apr.",
+    "May." : "Mai",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Einstellungen",
     "Saving..." : "Speichervorgang…",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
@@ -79,7 +108,6 @@
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Sie greifen auf diese Site über HTTP zu. Wir raten dringend dazu, Ihren Server so zu konfigurieren, dass er stattdessen nur HTTPS akzeptiert, wie es in unseren <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.",
     "Shared" : "Geteilt",
     "Shared with {recipients}" : "Geteilt mit {recipients}",
-    "Share" : "Teilen",
     "Error" : "Fehler",
     "Error while sharing" : "Fehler beim Teilen",
     "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
@@ -88,6 +116,7 @@
     "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
     "Share with users or groups …" : "Mit Benutzern oder Gruppen teilen…",
     "Share with users, groups or remote users …" : "Mit Benutzern, Gruppen oder entfernten Benutzern teilen…",
+    "Share" : "Teilen",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Mit Benutzern anderer ownClouds unter Verwendung der Syntax benutzername@beispiel.com/owncloud teilen",
     "Share link" : "Link teilen",
     "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens {days} Tage nach seiner Erstellung ablaufen",
@@ -214,9 +243,9 @@
     "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.",
     "An internal error occured." : "Es ist ein interner Fehler aufgetreten.",
     "Please try again or contact your administrator." : "Bitte versuchen Sie es noch einmal oder kontaktieren Sie Ihren Administrator.",
-    "Forgot your password? Reset it!" : "Sie haben Ihr Passwort vergessen? Setzen Sie es zurück!",
-    "remember" : "merken",
     "Log in" : "Einloggen",
+    "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
+    "remember" : "merken",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Sehen Sie es sich an!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
@@ -227,8 +256,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Bitte kontaktieren Sie Ihren Administrator. Wenn Sie Administrator dieser Instanz sind, konfigurieren Sie bitte die „trusted_domain“-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereitgestellt.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Wenn es Ihre Konfiguration zulässt, können Sie als Administrator gegebenenfalls den Button unten benutzen, um diese Domain als vertrauenswürdig einzustufen.",
     "Add \"%s\" as trusted domain" : "„%s“ als vertrauenswürdige Domain hinzufügen",
-    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
-    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
+    "App update required" : "App-Update notwendig",
+    "%s will be updated to version %s" : "%s wird auf Version %s aktualisiert",
+    "These apps will be updated:" : "Diese Apps werden aktualisiert:",
+    "These incompatible apps will be disabled:" : "Diese inkompatiblen Apps werden deaktiviert:",
     "The theme %s has been disabled." : "Das Thema %s wurde deaktiviert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stellen Sie vor dem Fortsetzen bitte sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurden.",
     "Start update" : "Aktualisierung starten",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index ad5a1310e6..28e9763e13 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
+    "Preparing update" : "Προετοιμασία ενημέρωσης",
     "Turned on maintenance mode" : "Η κατάσταση συντήρησης ενεργοποιήθηκε",
     "Turned off maintenance mode" : "Η κατάσταση συντήρησης απενεργοποιήθηκε",
     "Maintenance mode is kept active" : "Η λειτουργία συντήρησης διατηρήθηκε ενεργή",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "Σφάλμα διόρθωσης:",
     "Following incompatible apps have been disabled: %s" : "Οι παρακάτω εφαρμογές έχουν απενεργοποιηθεί: %s",
     "Following apps have been disabled: %s" : "Οι ακόλουθες εφαρμογές έχουν απενεργοποιηθεί: %s",
+    "Already up to date" : "Ήδη ενημερωμένο",
+    "File is too big" : "Το αρχείο είναι πολύ μεγάλο",
     "Invalid file provided" : "Έχει δοθεί μη έγκυρο αρχείο",
     "No image or file provided" : "Δεν δόθηκε εικόνα ή αρχείο",
     "Unknown filetype" : "Άγνωστος τύπος αρχείου",
@@ -28,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Πέμπτη",
     "Friday" : "Παρασκευή",
     "Saturday" : "Σάββατο",
+    "Sun." : "Κυρ.",
+    "Mon." : "Δευ.",
+    "Tue." : "Τρί.",
+    "Wed." : "Τετ.",
+    "Thu." : "Πέμ.",
+    "Fri." : "Παρ.",
+    "Sat." : "Σαβ.",
+    "Su" : "Κυ",
+    "Mo" : "Δε",
+    "Tu" : "Τρ",
+    "We" : "Τε",
+    "Th" : "Πε",
+    "Fr" : "Πα",
+    "Sa" : "Σα",
     "January" : "Ιανουάριος",
     "February" : "Φεβρουάριος",
     "March" : "Μάρτιος",
@@ -40,6 +57,18 @@ OC.L10N.register(
     "October" : "Οκτώβριος",
     "November" : "Νοέμβριος",
     "December" : "Δεκέμβριος",
+    "Jan." : "Ιαν.",
+    "Feb." : "Φεβ.",
+    "Mar." : "Μαρ.",
+    "Apr." : "Απρ.",
+    "May." : "Μαι.",
+    "Jun." : "Ιουν.",
+    "Jul." : "Ιουλ.",
+    "Aug." : "Αυγ.",
+    "Sep." : "Σεπ.",
+    "Oct." : "Οκτ.",
+    "Nov." : "Νοε.",
+    "Dec." : "Δεκ.",
     "Settings" : "Ρυθμίσεις",
     "Saving..." : "Γίνεται αποθήκευση...",
     "Couldn't send reset email. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
@@ -75,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανόν διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess δεν λειτουργεί. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων εκτός του καταλόγου της ρίζας εγγράφων-document root του διακομιστή.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Δεν έχει οριστεί προσωρινή μνήμη.  Για να βελτιώσετε την απόδοσή σας παρακαλούμε να διαμορφώσετε ένα χώρο προσωρινής αποθήκευσης εάν υπάρχει διαθέσιμος. Περαιτέρω πληροφορίες μπορείτε να βρείτε στην <a href=\"{docLink}\">τεκμηρίωση</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Το /dev/urandom δεν είναι αναγνώσιμο από την PHP, το οποίο δεν συνίσταται για λόγους ασφαλείας. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωσή</a> μας.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Η έκδοσή σας της PHP ({version}) <a href=\"{phpLink}\">δεν υποστηρίζεται πια από την PHP</a>. Σας παροτρύνουμε να αναβαθμίσετε την PHP για να επωφεληθείτε από την απόδοση και την ασφάλεια που παρέχει η PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Η διαμόρφωση των reverse proxy headers δεν είναι σωστή ή συνδέεστε στο ownCloud από ένα έμπιστο διαμεσολαβητή. Αν δεν συνδέεστε στο ownCloud από έμπιστο διαμεσολαβητή, αυτό είναι ένα θέμα ασφαλείας και μπορεί να επιτρέψει σε έναν επιτιθέμενο να μασκαρέψει τη διεύθυνση IP του ως ορατή στο ownCloud. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωση</a>.",
     "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "H \"{header}\" κεφαλίδα HTTP δεν έχει ρυθμιστεί ώστε να ισούται με \"{expected}\". Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας ή ιδιωτικότητας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Η «Strict-Transport-Security\" κεφαλίδα HTTP δεν έχει ρυθμιστεί για τουλάχιστον \"{seconds}\" δευτερόλεπτα. Για αυξημένη ασφάλεια συστήνουμε την ενεργοποίηση του HSTS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Έχετε πρόσβαση σε αυτό τον ιστότοπο μέσω HTTP. Προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας ώστε να απαιτεί τη χρήση HTTPS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.",
     "Shared" : "Κοινόχρηστα",
     "Shared with {recipients}" : "Διαμοιράστηκε με {recipients}",
-    "Share" : "Διαμοιρασμός",
     "Error" : "Σφάλμα",
     "Error while sharing" : "Σφάλμα κατά τον διαμοιρασμό",
     "Error while unsharing" : "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
@@ -90,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
     "Share with users or groups …" : "Διαμοιρασμός με χρήστες ή ομάδες ...",
     "Share with users, groups or remote users …" : "Διαμοιρασμός με χρήστες, ομάδες ή απομακρυσμένους χρήστες ...",
+    "Share" : "Διαμοιρασμός",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud",
     "Share link" : "Διαμοιρασμός συνδέσμου",
     "The public link will expire no later than {days} days after it is created" : "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
@@ -143,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Η ενημέρωση ήταν επιτυχής. Υπήρχαν προειδοποιήσεις.",
     "The update was successful. Redirecting you to ownCloud now." : "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
     "Couldn't reset password because the token is invalid" : "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο",
+    "Couldn't reset password because the token is expired" : "Αδυναμία επαναφοράς κωδικού πρόσβασης επειδή το token έχει λήξει",
     "Couldn't send reset email. Please make sure your username is correct." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ ελέγξτε ότι το όνομα χρήστη σας είναι ορθό.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "%s password reset" : "%s επαναφορά κωδικού πρόσβασης",
@@ -216,9 +248,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
     "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.",
     "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.",
-    "Forgot your password? Reset it!" : "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!",
-    "remember" : "απομνημόνευση",
     "Log in" : "Είσοδος",
+    "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;",
+    "remember" : "απομνημόνευση",
     "Alternative Logins" : "Εναλλακτικές Συνδέσεις",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.",
@@ -229,8 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή συστημάτων σας. Αν είστε διαχειριστής αυτού του στιγμιοτύπο, ρυθμίστε το κλειδί \"trusted_domain\" στο αρχείο config/config.php. Ένα παράδειγμα παρέχεται στο αρχείο config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ανάλογα με τις ρυθμίσεις σας, σαν διαχειριστής θα μπορούσατε επίσης να χρησιμοποιήσετε το παρακάτω κουμπί για να εμπιστευθείτε αυτή την περιοχή.",
     "Add \"%s\" as trusted domain" : "Προσθήκη \"%s\" ως αξιόπιστη περιοχή",
-    "%s will be updated to version %s." : "Το %s θα ενημερωθεί στην έκδοση %s.",
-    "The following apps will be disabled:" : "Οι παρακάτω εφαρμογές θα απενεργοποιηθούν:",
+    "App update required" : "Απαιτείται ενημέρωση εφαρμογής",
+    "%s will be updated to version %s" : "%s θα αναβαθμιστεί σε έκδοση %s",
+    "These apps will be updated:" : "Αυτές οι εφαρμογές θα αναβαθμιστούν:",
+    "These incompatible apps will be disabled:" : "Αυτές οι μη συμβατές εφαρμογές θα απενεργοποιηθούν:",
     "The theme %s has been disabled." : "Το θέμα %s έχει απενεργοποιηθεί.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Παρακαλώ βεβαιωθείτε ότι έχουν ληψθεί αντίγραφα ασφαλείας της βάσης δεδομένων, του φακέλου ρυθμίσεων και του φακέλου δεδομένων πριν προχωρήσετε.",
     "Start update" : "Έναρξη ενημέρωσης",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index e604d813f2..6c68066738 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
+    "Preparing update" : "Προετοιμασία ενημέρωσης",
     "Turned on maintenance mode" : "Η κατάσταση συντήρησης ενεργοποιήθηκε",
     "Turned off maintenance mode" : "Η κατάσταση συντήρησης απενεργοποιήθηκε",
     "Maintenance mode is kept active" : "Η λειτουργία συντήρησης διατηρήθηκε ενεργή",
@@ -11,6 +12,8 @@
     "Repair error: " : "Σφάλμα διόρθωσης:",
     "Following incompatible apps have been disabled: %s" : "Οι παρακάτω εφαρμογές έχουν απενεργοποιηθεί: %s",
     "Following apps have been disabled: %s" : "Οι ακόλουθες εφαρμογές έχουν απενεργοποιηθεί: %s",
+    "Already up to date" : "Ήδη ενημερωμένο",
+    "File is too big" : "Το αρχείο είναι πολύ μεγάλο",
     "Invalid file provided" : "Έχει δοθεί μη έγκυρο αρχείο",
     "No image or file provided" : "Δεν δόθηκε εικόνα ή αρχείο",
     "Unknown filetype" : "Άγνωστος τύπος αρχείου",
@@ -26,6 +29,20 @@
     "Thursday" : "Πέμπτη",
     "Friday" : "Παρασκευή",
     "Saturday" : "Σάββατο",
+    "Sun." : "Κυρ.",
+    "Mon." : "Δευ.",
+    "Tue." : "Τρί.",
+    "Wed." : "Τετ.",
+    "Thu." : "Πέμ.",
+    "Fri." : "Παρ.",
+    "Sat." : "Σαβ.",
+    "Su" : "Κυ",
+    "Mo" : "Δε",
+    "Tu" : "Τρ",
+    "We" : "Τε",
+    "Th" : "Πε",
+    "Fr" : "Πα",
+    "Sa" : "Σα",
     "January" : "Ιανουάριος",
     "February" : "Φεβρουάριος",
     "March" : "Μάρτιος",
@@ -38,6 +55,18 @@
     "October" : "Οκτώβριος",
     "November" : "Νοέμβριος",
     "December" : "Δεκέμβριος",
+    "Jan." : "Ιαν.",
+    "Feb." : "Φεβ.",
+    "Mar." : "Μαρ.",
+    "Apr." : "Απρ.",
+    "May." : "Μαι.",
+    "Jun." : "Ιουν.",
+    "Jul." : "Ιουλ.",
+    "Aug." : "Αυγ.",
+    "Sep." : "Σεπ.",
+    "Oct." : "Οκτ.",
+    "Nov." : "Νοε.",
+    "Dec." : "Δεκ.",
     "Settings" : "Ρυθμίσεις",
     "Saving..." : "Γίνεται αποθήκευση...",
     "Couldn't send reset email. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
@@ -73,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανόν διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess δεν λειτουργεί. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων εκτός του καταλόγου της ρίζας εγγράφων-document root του διακομιστή.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Δεν έχει οριστεί προσωρινή μνήμη.  Για να βελτιώσετε την απόδοσή σας παρακαλούμε να διαμορφώσετε ένα χώρο προσωρινής αποθήκευσης εάν υπάρχει διαθέσιμος. Περαιτέρω πληροφορίες μπορείτε να βρείτε στην <a href=\"{docLink}\">τεκμηρίωση</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Το /dev/urandom δεν είναι αναγνώσιμο από την PHP, το οποίο δεν συνίσταται για λόγους ασφαλείας. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωσή</a> μας.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Η έκδοσή σας της PHP ({version}) <a href=\"{phpLink}\">δεν υποστηρίζεται πια από την PHP</a>. Σας παροτρύνουμε να αναβαθμίσετε την PHP για να επωφεληθείτε από την απόδοση και την ασφάλεια που παρέχει η PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Η διαμόρφωση των reverse proxy headers δεν είναι σωστή ή συνδέεστε στο ownCloud από ένα έμπιστο διαμεσολαβητή. Αν δεν συνδέεστε στο ownCloud από έμπιστο διαμεσολαβητή, αυτό είναι ένα θέμα ασφαλείας και μπορεί να επιτρέψει σε έναν επιτιθέμενο να μασκαρέψει τη διεύθυνση IP του ως ορατή στο ownCloud. Περισσότερες πληροφορίες υπάρχουν στην <a href=\"{docLink}\">τεκμηρίωση</a>.",
     "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "H \"{header}\" κεφαλίδα HTTP δεν έχει ρυθμιστεί ώστε να ισούται με \"{expected}\". Αυτό αποτελεί ενδεχόμενο κίνδυνο ασφάλειας ή ιδιωτικότητας και συστήνουμε τη διόρθωση αυτής της ρύθμισης.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Η «Strict-Transport-Security\" κεφαλίδα HTTP δεν έχει ρυθμιστεί για τουλάχιστον \"{seconds}\" δευτερόλεπτα. Για αυξημένη ασφάλεια συστήνουμε την ενεργοποίηση του HSTS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Έχετε πρόσβαση σε αυτό τον ιστότοπο μέσω HTTP. Προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας ώστε να απαιτεί τη χρήση HTTPS όπως περιγράφεται στις <a href=\"{docUrl}\">προτάσεις ασφαλείας</a> μας.",
     "Shared" : "Κοινόχρηστα",
     "Shared with {recipients}" : "Διαμοιράστηκε με {recipients}",
-    "Share" : "Διαμοιρασμός",
     "Error" : "Σφάλμα",
     "Error while sharing" : "Σφάλμα κατά τον διαμοιρασμό",
     "Error while unsharing" : "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
@@ -88,6 +118,7 @@
     "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
     "Share with users or groups …" : "Διαμοιρασμός με χρήστες ή ομάδες ...",
     "Share with users, groups or remote users …" : "Διαμοιρασμός με χρήστες, ομάδες ή απομακρυσμένους χρήστες ...",
+    "Share" : "Διαμοιρασμός",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud",
     "Share link" : "Διαμοιρασμός συνδέσμου",
     "The public link will expire no later than {days} days after it is created" : "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
@@ -141,6 +172,7 @@
     "The update was successful. There were warnings." : "Η ενημέρωση ήταν επιτυχής. Υπήρχαν προειδοποιήσεις.",
     "The update was successful. Redirecting you to ownCloud now." : "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
     "Couldn't reset password because the token is invalid" : "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο",
+    "Couldn't reset password because the token is expired" : "Αδυναμία επαναφοράς κωδικού πρόσβασης επειδή το token έχει λήξει",
     "Couldn't send reset email. Please make sure your username is correct." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς. Παρακαλώ ελέγξτε ότι το όνομα χρήστη σας είναι ορθό.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "%s password reset" : "%s επαναφορά κωδικού πρόσβασης",
@@ -214,9 +246,9 @@
     "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
     "An internal error occured." : "Παρουσιάστηκε εσωτερικό σφάλμα.",
     "Please try again or contact your administrator." : "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με τον διαχειριστή σας.",
-    "Forgot your password? Reset it!" : "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!",
-    "remember" : "απομνημόνευση",
     "Log in" : "Είσοδος",
+    "Wrong password. Reset it?" : "Λάθος Κωδικός. Επαναφορά;",
+    "remember" : "απομνημόνευση",
     "Alternative Logins" : "Εναλλακτικές Συνδέσεις",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.",
@@ -227,8 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή συστημάτων σας. Αν είστε διαχειριστής αυτού του στιγμιοτύπο, ρυθμίστε το κλειδί \"trusted_domain\" στο αρχείο config/config.php. Ένα παράδειγμα παρέχεται στο αρχείο config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ανάλογα με τις ρυθμίσεις σας, σαν διαχειριστής θα μπορούσατε επίσης να χρησιμοποιήσετε το παρακάτω κουμπί για να εμπιστευθείτε αυτή την περιοχή.",
     "Add \"%s\" as trusted domain" : "Προσθήκη \"%s\" ως αξιόπιστη περιοχή",
-    "%s will be updated to version %s." : "Το %s θα ενημερωθεί στην έκδοση %s.",
-    "The following apps will be disabled:" : "Οι παρακάτω εφαρμογές θα απενεργοποιηθούν:",
+    "App update required" : "Απαιτείται ενημέρωση εφαρμογής",
+    "%s will be updated to version %s" : "%s θα αναβαθμιστεί σε έκδοση %s",
+    "These apps will be updated:" : "Αυτές οι εφαρμογές θα αναβαθμιστούν:",
+    "These incompatible apps will be disabled:" : "Αυτές οι μη συμβατές εφαρμογές θα απενεργοποιηθούν:",
     "The theme %s has been disabled." : "Το θέμα %s έχει απενεργοποιηθεί.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Παρακαλώ βεβαιωθείτε ότι έχουν ληψθεί αντίγραφα ασφαλείας της βάσης δεδομένων, του φακέλου ρυθμίσεων και του φακέλου δεδομένων πριν προχωρήσετε.",
     "Start update" : "Έναρξη ενημέρωσης",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index 4eb6b35426..e3760b6f2b 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -26,6 +26,13 @@ OC.L10N.register(
     "Thursday" : "Thursday",
     "Friday" : "Friday",
     "Saturday" : "Saturday",
+    "Sun." : "Sun.",
+    "Mon." : "Mon.",
+    "Tue." : "Tue.",
+    "Wed." : "Wed.",
+    "Thu." : "Thu.",
+    "Fri." : "Fri.",
+    "Sat." : "Sat.",
     "January" : "January",
     "February" : "February",
     "March" : "March",
@@ -38,6 +45,18 @@ OC.L10N.register(
     "October" : "October",
     "November" : "November",
     "December" : "December",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "May.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Settings",
     "Saving..." : "Saving...",
     "Couldn't send reset email. Please contact your administrator." : "Couldn't send reset email. Please contact your administrator.",
@@ -77,7 +96,6 @@ OC.L10N.register(
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting.",
     "Shared" : "Shared",
     "Shared with {recipients}" : "Shared with {recipients}",
-    "Share" : "Share",
     "Error" : "Error",
     "Error while sharing" : "Error whilst sharing",
     "Error while unsharing" : "Error whilst unsharing",
@@ -86,6 +104,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Shared with you by {owner}",
     "Share with users or groups …" : "Share with users or groups …",
     "Share with users, groups or remote users …" : "Share with users, groups or remote users …",
+    "Share" : "Share",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Share with people on other ownClouds using the syntax username@example.com/owncloud",
     "Share link" : "Share link",
     "The public link will expire no later than {days} days after it is created" : "The public link will expire no later than {days} days after it is created",
@@ -211,9 +230,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Please contact your administrator.",
     "An internal error occured." : "An internal error occured.",
     "Please try again or contact your administrator." : "Please try again or contact your administrator.",
-    "Forgot your password? Reset it!" : "Forgot your password? Reset it!",
     "remember" : "remember",
-    "Log in" : "Log in",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "This ownCloud instance is currently in single user mode.",
@@ -224,8 +241,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.",
     "Add \"%s\" as trusted domain" : "Add \"%s\" as a trusted domain",
-    "%s will be updated to version %s." : "%s will be updated to version %s.",
-    "The following apps will be disabled:" : "The following apps will be disabled:",
     "The theme %s has been disabled." : "The theme %s has been disabled.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.",
     "Start update" : "Start update",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index e05bd7c73f..4c76d47111 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -24,6 +24,13 @@
     "Thursday" : "Thursday",
     "Friday" : "Friday",
     "Saturday" : "Saturday",
+    "Sun." : "Sun.",
+    "Mon." : "Mon.",
+    "Tue." : "Tue.",
+    "Wed." : "Wed.",
+    "Thu." : "Thu.",
+    "Fri." : "Fri.",
+    "Sat." : "Sat.",
     "January" : "January",
     "February" : "February",
     "March" : "March",
@@ -36,6 +43,18 @@
     "October" : "October",
     "November" : "November",
     "December" : "December",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "May.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Settings",
     "Saving..." : "Saving...",
     "Couldn't send reset email. Please contact your administrator." : "Couldn't send reset email. Please contact your administrator.",
@@ -75,7 +94,6 @@
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting.",
     "Shared" : "Shared",
     "Shared with {recipients}" : "Shared with {recipients}",
-    "Share" : "Share",
     "Error" : "Error",
     "Error while sharing" : "Error whilst sharing",
     "Error while unsharing" : "Error whilst unsharing",
@@ -84,6 +102,7 @@
     "Shared with you by {owner}" : "Shared with you by {owner}",
     "Share with users or groups …" : "Share with users or groups …",
     "Share with users, groups or remote users …" : "Share with users, groups or remote users …",
+    "Share" : "Share",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Share with people on other ownClouds using the syntax username@example.com/owncloud",
     "Share link" : "Share link",
     "The public link will expire no later than {days} days after it is created" : "The public link will expire no later than {days} days after it is created",
@@ -209,9 +228,7 @@
     "Please contact your administrator." : "Please contact your administrator.",
     "An internal error occured." : "An internal error occured.",
     "Please try again or contact your administrator." : "Please try again or contact your administrator.",
-    "Forgot your password? Reset it!" : "Forgot your password? Reset it!",
     "remember" : "remember",
-    "Log in" : "Log in",
     "Alternative Logins" : "Alternative Logins",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "This ownCloud instance is currently in single user mode.",
@@ -222,8 +239,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.",
     "Add \"%s\" as trusted domain" : "Add \"%s\" as a trusted domain",
-    "%s will be updated to version %s." : "%s will be updated to version %s.",
-    "The following apps will be disabled:" : "The following apps will be disabled:",
     "The theme %s has been disabled." : "The theme %s has been disabled.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.",
     "Start update" : "Start update",
diff --git a/core/l10n/en_NZ.js b/core/l10n/en_NZ.js
deleted file mode 100644
index 4cb36aaaaa..0000000000
--- a/core/l10n/en_NZ.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en_NZ.json b/core/l10n/en_NZ.json
deleted file mode 100644
index 43fce52c5c..0000000000
--- a/core/l10n/en_NZ.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
index 1b80409126..eee2a35495 100644
--- a/core/l10n/eo.js
+++ b/core/l10n/eo.js
@@ -11,6 +11,13 @@ OC.L10N.register(
     "Thursday" : "ĵaŭdo",
     "Friday" : "vendredo",
     "Saturday" : "sabato",
+    "Sun." : "dim.",
+    "Mon." : "lun.",
+    "Tue." : "mar.",
+    "Wed." : "mer.",
+    "Thu." : "ĵaŭ.",
+    "Fri." : "ven.",
+    "Sat." : "sab.",
     "January" : "Januaro",
     "February" : "Februaro",
     "March" : "Marto",
@@ -23,6 +30,18 @@ OC.L10N.register(
     "October" : "Oktobro",
     "November" : "Novembro",
     "December" : "Decembro",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Maj.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aŭg.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Agordo",
     "Saving..." : "Konservante...",
     "No" : "Ne",
@@ -43,13 +62,13 @@ OC.L10N.register(
     "Good password" : "Bona pasvorto",
     "Strong password" : "Forta pasvorto",
     "Shared" : "Kunhavata",
-    "Share" : "Kunhavigi",
     "Error" : "Eraro",
     "Error while sharing" : "Eraro dum kunhavigo",
     "Error while unsharing" : "Eraro dum malkunhavigo",
     "Error while changing permissions" : "Eraro dum ŝanĝo de permesoj",
     "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
     "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
+    "Share" : "Kunhavigi",
     "Share link" : "Konhavigi ligilon",
     "Password protect" : "Protekti per pasvorto",
     "Password" : "Pasvorto",
@@ -110,8 +129,8 @@ OC.L10N.register(
     "Log out" : "Elsaluti",
     "Search" : "Serĉi",
     "Please contact your administrator." : "Bonvolu kontakti vian administranton.",
-    "remember" : "memori",
     "Log in" : "Ensaluti",
+    "remember" : "memori",
     "Alternative Logins" : "Alternativaj ensalutoj",
     "Thank you for your patience." : "Dankon pro via pacienco."
 },
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
index 8bd13d5cd3..fb1ad50003 100644
--- a/core/l10n/eo.json
+++ b/core/l10n/eo.json
@@ -9,6 +9,13 @@
     "Thursday" : "ĵaŭdo",
     "Friday" : "vendredo",
     "Saturday" : "sabato",
+    "Sun." : "dim.",
+    "Mon." : "lun.",
+    "Tue." : "mar.",
+    "Wed." : "mer.",
+    "Thu." : "ĵaŭ.",
+    "Fri." : "ven.",
+    "Sat." : "sab.",
     "January" : "Januaro",
     "February" : "Februaro",
     "March" : "Marto",
@@ -21,6 +28,18 @@
     "October" : "Oktobro",
     "November" : "Novembro",
     "December" : "Decembro",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Maj.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aŭg.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Agordo",
     "Saving..." : "Konservante...",
     "No" : "Ne",
@@ -41,13 +60,13 @@
     "Good password" : "Bona pasvorto",
     "Strong password" : "Forta pasvorto",
     "Shared" : "Kunhavata",
-    "Share" : "Kunhavigi",
     "Error" : "Eraro",
     "Error while sharing" : "Eraro dum kunhavigo",
     "Error while unsharing" : "Eraro dum malkunhavigo",
     "Error while changing permissions" : "Eraro dum ŝanĝo de permesoj",
     "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
     "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
+    "Share" : "Kunhavigi",
     "Share link" : "Konhavigi ligilon",
     "Password protect" : "Protekti per pasvorto",
     "Password" : "Pasvorto",
@@ -108,8 +127,8 @@
     "Log out" : "Elsaluti",
     "Search" : "Serĉi",
     "Please contact your administrator." : "Bonvolu kontakti vian administranton.",
-    "remember" : "memori",
     "Log in" : "Ensaluti",
+    "remember" : "memori",
     "Alternative Logins" : "Alternativaj ensalutoj",
     "Thank you for your patience." : "Dankon pro via pacienco."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/es.js b/core/l10n/es.js
index 982e5383f0..d525319995 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "No se pudo enviar el mensaje a los siguientes usuarios: %s",
+    "Preparing update" : "Preparando la actualización",
     "Turned on maintenance mode" : "Modo mantenimiento activado",
     "Turned off maintenance mode" : "Modo mantenimiento desactivado",
     "Maintenance mode is kept active" : "El modo mantenimiento aún está activo.",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Error que reparar:",
     "Following incompatible apps have been disabled: %s" : "Las siguientes apps incompatibles se han deshabilitado: %s",
     "Following apps have been disabled: %s" : "Siguiendo aplicaciones ha sido deshabilitado: %s",
+    "Already up to date" : "Ya actualizado",
     "File is too big" : "El archivo es demasiado grande",
     "Invalid file provided" : "Archivo inválido",
     "No image or file provided" : "No se especificó ningún archivo o imagen",
@@ -29,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Jueves",
     "Friday" : "Viernes",
     "Saturday" : "Sábado",
+    "Sun." : "Dom.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mier.",
+    "Thu." : "Jue.",
+    "Fri." : "Vie.",
+    "Sat." : "Sab.",
+    "Su" : "Do",
+    "Mo" : "Lu",
+    "Tu" : "Ma",
+    "We" : "Mi",
+    "Th" : "Ju",
+    "Fr" : "Vi",
+    "Sa" : "Sa",
     "January" : "Enero",
     "February" : "Febrero",
     "March" : "Marzo",
@@ -41,6 +57,18 @@ OC.L10N.register(
     "October" : "Octubre",
     "November" : "Noviembre",
     "December" : "Diciembre",
+    "Jan." : "Ene.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "May.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ago.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dic.",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
     "Couldn't send reset email. Please contact your administrator." : "No pudo enviarse el correo para restablecer la contraseña. Por favor, contacte con su administrador.",
@@ -76,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Su directorio de datos y sus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La memoria caché no ha sido configurada. Para aumentar su performance por favor configure memcache si está disponible. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom no es legible por PHP el mismo es altamente desalentado por razones de seguridad. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Su versión PHP ({version}) ya no es  <a href=\"{phpLink}\">respaldada por PHP</a>.  Recomendamos actualizar su versión de PHP para aprovechar las actualizaciones de rendimiento y seguridad proporcionadas por PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configuración de las cabeceras inversas del proxy son incorrectas, o está accediendo a ownCloud desde un proxy confiable. Si no está accediendo a ownCloud desde un proxy certificado y confiable, este es un problema de seguridad y puede permitirle a un hacker camuflar su dirección IP a ownCloud. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "La cabecera HTTP \"Strict-Transport-Security\" no está configurada en al menos \"{segundos}\" segundos. Para una mejor seguridad recomendamos que habilite HSTS como es descripta en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
-    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Esta ingresando a este sitio de internet vía HTTP. Sugerimos fuertemente que configure su servidor que utilice HTTPS como es descripto en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está ingresando a este sitio de internet vía HTTP. Le sugerimos enérgicamente que configure su servidor que utilice HTTPS como se describe en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
     "Shared" : "Compartido",
     "Shared with {recipients}" : "Compartido con {recipients}",
-    "Share" : "Compartir",
     "Error" : "Error",
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error al dejar de compartir",
@@ -90,7 +119,8 @@ OC.L10N.register(
     "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido contigo por {owner}",
     "Share with users or groups …" : "Compartir con usuarios o grupos ...",
-    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos ...",
+    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos...",
+    "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
     "Share link" : "Enlace compartido",
     "The public link will expire no later than {days} days after it is created" : "El vínculo público no expirará antes de {days} desde que se creó",
@@ -144,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "La actualización fue exitosa. Había advertencias.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "Couldn't reset password because the token is invalid" : "No se puede restablecer la contraseña porque el vale de identificación es inválido.",
+    "Couldn't reset password because the token is expired" : "No se puede restablecer la contraseña porque el vale de identificación ha caducado.",
     "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar el correo electrónico para el restablecimiento. Por favor, asegúrese de que su nombre de usuario es el correcto.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar el correo electrónico para el restablecimiento, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.",
     "%s password reset" : "%s restablecer contraseña",
@@ -208,7 +239,7 @@ OC.L10N.register(
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
     "Finish setup" : "Completar la instalación",
     "Finishing …" : "Finalizando...",
-    "Need help?" : "Necesita ayuda?",
+    "Need help?" : "¿Necesita ayuda?",
     "See the documentation" : "Vea la documentación",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicación requiere JavaScript para operar correctamente. Por favor, {linkstart}habilite JavaScript{linkend} y recargue la página.",
     "Log out" : "Salir",
@@ -217,9 +248,8 @@ OC.L10N.register(
     "Please contact your administrator." : "Por favor, contacte con el administrador.",
     "An internal error occured." : "Un error interno ocurrió.",
     "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.",
-    "Forgot your password? Reset it!" : "¿Olvidó su contraseña? ¡Restablézcala!",
+    "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?",
     "remember" : "recordar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Inicios de sesión alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola:<br><br>Te comentamos que %s compartió <strong>%s</strong> contigo.<br><a href=\"%s\">¡Échale un vistazo!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
@@ -230,8 +260,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacte con su administrador. Si usted es el administrador, configure \"trusted_domain\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependiendo de su configuración, como administrador, debería poder usar el botón de abajo para confiar en este dominio.",
     "Add \"%s\" as trusted domain" : "Agregar \"%s\" como dominio de confianza",
-    "%s will be updated to version %s." : "%s será actualizado a la versión %s.",
-    "The following apps will be disabled:" : "Las siguientes aplicaciones serán desactivadas:",
+    "App update required" : "Es necesaria una actualización en la aplicación",
+    "%s will be updated to version %s" : "%s será actualizada a la versión %s",
+    "These apps will be updated:" : "Estas aplicaciones serán actualizadas:",
+    "These incompatible apps will be disabled:" : "Estas aplicaciones incompatibles serán deshabilitadas:",
     "The theme %s has been disabled." : "El tema %s ha sido desactivado.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Antes de proceder, asegúrese de que se haya hecho un respaldo de la base de datos, la carpeta de configuración y la carpeta de datos.",
     "Start update" : "Iniciar actualización",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index bf73857e4e..6deffb731f 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "No se pudo enviar el mensaje a los siguientes usuarios: %s",
+    "Preparing update" : "Preparando la actualización",
     "Turned on maintenance mode" : "Modo mantenimiento activado",
     "Turned off maintenance mode" : "Modo mantenimiento desactivado",
     "Maintenance mode is kept active" : "El modo mantenimiento aún está activo.",
@@ -11,6 +12,7 @@
     "Repair error: " : "Error que reparar:",
     "Following incompatible apps have been disabled: %s" : "Las siguientes apps incompatibles se han deshabilitado: %s",
     "Following apps have been disabled: %s" : "Siguiendo aplicaciones ha sido deshabilitado: %s",
+    "Already up to date" : "Ya actualizado",
     "File is too big" : "El archivo es demasiado grande",
     "Invalid file provided" : "Archivo inválido",
     "No image or file provided" : "No se especificó ningún archivo o imagen",
@@ -27,6 +29,20 @@
     "Thursday" : "Jueves",
     "Friday" : "Viernes",
     "Saturday" : "Sábado",
+    "Sun." : "Dom.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mier.",
+    "Thu." : "Jue.",
+    "Fri." : "Vie.",
+    "Sat." : "Sab.",
+    "Su" : "Do",
+    "Mo" : "Lu",
+    "Tu" : "Ma",
+    "We" : "Mi",
+    "Th" : "Ju",
+    "Fr" : "Vi",
+    "Sa" : "Sa",
     "January" : "Enero",
     "February" : "Febrero",
     "March" : "Marzo",
@@ -39,6 +55,18 @@
     "October" : "Octubre",
     "November" : "Noviembre",
     "December" : "Diciembre",
+    "Jan." : "Ene.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "May.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ago.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dic.",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
     "Couldn't send reset email. Please contact your administrator." : "No pudo enviarse el correo para restablecer la contraseña. Por favor, contacte con su administrador.",
@@ -74,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Su directorio de datos y sus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos ya no sea accesible o que mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La memoria caché no ha sido configurada. Para aumentar su performance por favor configure memcache si está disponible. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom no es legible por PHP el mismo es altamente desalentado por razones de seguridad. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Su versión PHP ({version}) ya no es  <a href=\"{phpLink}\">respaldada por PHP</a>.  Recomendamos actualizar su versión de PHP para aprovechar las actualizaciones de rendimiento y seguridad proporcionadas por PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configuración de las cabeceras inversas del proxy son incorrectas, o está accediendo a ownCloud desde un proxy confiable. Si no está accediendo a ownCloud desde un proxy certificado y confiable, este es un problema de seguridad y puede permitirle a un hacker camuflar su dirección IP a ownCloud. Más información puede ser encontrada en nuestra <a href=\"{docLink}\">documentación</a>.",
     "Error occurred while checking server setup" : "Ha ocurrido un error al revisar la configuración del servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "La \"{header}\" cabecera HTTP no está configurado para ser igual a \"{expected}\". Esto puede suponer un riesgo para la seguridad o la privacidad, por lo que se recomienda ajustar esta opción.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "La cabecera HTTP \"Strict-Transport-Security\" no está configurada en al menos \"{segundos}\" segundos. Para una mejor seguridad recomendamos que habilite HSTS como es descripta en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
-    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Esta ingresando a este sitio de internet vía HTTP. Sugerimos fuertemente que configure su servidor que utilice HTTPS como es descripto en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está ingresando a este sitio de internet vía HTTP. Le sugerimos enérgicamente que configure su servidor que utilice HTTPS como se describe en nuestros <a href=\"{docUrl}\">consejos de seguridad</a>.",
     "Shared" : "Compartido",
     "Shared with {recipients}" : "Compartido con {recipients}",
-    "Share" : "Compartir",
     "Error" : "Error",
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error al dejar de compartir",
@@ -88,7 +117,8 @@
     "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido contigo por {owner}",
     "Share with users or groups …" : "Compartir con usuarios o grupos ...",
-    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos ...",
+    "Share with users, groups or remote users …" : "Comparte con usuarios, grupos o usuarios remotos...",
+    "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con personas en otros ownClouds utilizando la sintáxis username@example.com/owncloud",
     "Share link" : "Enlace compartido",
     "The public link will expire no later than {days} days after it is created" : "El vínculo público no expirará antes de {days} desde que se creó",
@@ -142,6 +172,7 @@
     "The update was successful. There were warnings." : "La actualización fue exitosa. Había advertencias.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "Couldn't reset password because the token is invalid" : "No se puede restablecer la contraseña porque el vale de identificación es inválido.",
+    "Couldn't reset password because the token is expired" : "No se puede restablecer la contraseña porque el vale de identificación ha caducado.",
     "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar el correo electrónico para el restablecimiento. Por favor, asegúrese de que su nombre de usuario es el correcto.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar el correo electrónico para el restablecimiento, porque no hay una dirección de correo electrónico asociada con este nombre de usuario. Por favor, contacte a su administrador.",
     "%s password reset" : "%s restablecer contraseña",
@@ -206,7 +237,7 @@
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite esta desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
     "Finish setup" : "Completar la instalación",
     "Finishing …" : "Finalizando...",
-    "Need help?" : "Necesita ayuda?",
+    "Need help?" : "¿Necesita ayuda?",
     "See the documentation" : "Vea la documentación",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicación requiere JavaScript para operar correctamente. Por favor, {linkstart}habilite JavaScript{linkend} y recargue la página.",
     "Log out" : "Salir",
@@ -215,9 +246,8 @@
     "Please contact your administrator." : "Por favor, contacte con el administrador.",
     "An internal error occured." : "Un error interno ocurrió.",
     "Please try again or contact your administrator." : "Por favor reintente nuevamente o contáctese con su administrador.",
-    "Forgot your password? Reset it!" : "¿Olvidó su contraseña? ¡Restablézcala!",
+    "Wrong password. Reset it?" : "Contraseña incorrecta. ¿Restablecerla?",
     "remember" : "recordar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Inicios de sesión alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola:<br><br>Te comentamos que %s compartió <strong>%s</strong> contigo.<br><a href=\"%s\">¡Échale un vistazo!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
@@ -228,8 +258,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacte con su administrador. Si usted es el administrador, configure \"trusted_domain\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependiendo de su configuración, como administrador, debería poder usar el botón de abajo para confiar en este dominio.",
     "Add \"%s\" as trusted domain" : "Agregar \"%s\" como dominio de confianza",
-    "%s will be updated to version %s." : "%s será actualizado a la versión %s.",
-    "The following apps will be disabled:" : "Las siguientes aplicaciones serán desactivadas:",
+    "App update required" : "Es necesaria una actualización en la aplicación",
+    "%s will be updated to version %s" : "%s será actualizada a la versión %s",
+    "These apps will be updated:" : "Estas aplicaciones serán actualizadas:",
+    "These incompatible apps will be disabled:" : "Estas aplicaciones incompatibles serán deshabilitadas:",
     "The theme %s has been disabled." : "El tema %s ha sido desactivado.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Antes de proceder, asegúrese de que se haya hecho un respaldo de la base de datos, la carpeta de configuración y la carpeta de datos.",
     "Start update" : "Iniciar actualización",
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
index 5ab12bd93f..bddadc44c1 100644
--- a/core/l10n/es_AR.js
+++ b/core/l10n/es_AR.js
@@ -17,6 +17,13 @@ OC.L10N.register(
     "Thursday" : "Jueves",
     "Friday" : "Viernes",
     "Saturday" : "Sábado",
+    "Sun." : "dom.",
+    "Mon." : "lun.",
+    "Tue." : "mar.",
+    "Wed." : "miér.",
+    "Thu." : "jue.",
+    "Fri." : "vie.",
+    "Sat." : "sáb.",
     "January" : "enero",
     "February" : "febrero",
     "March" : "marzo",
@@ -29,6 +36,18 @@ OC.L10N.register(
     "October" : "octubre",
     "November" : "noviembre",
     "December" : "diciembre",
+    "Jan." : "ene.",
+    "Feb." : "feb.",
+    "Mar." : "mar.",
+    "Apr." : "abr.",
+    "May." : "may.",
+    "Jun." : "jun.",
+    "Jul." : "jul.",
+    "Aug." : "ago.",
+    "Sep." : "sep.",
+    "Oct." : "oct.",
+    "Nov." : "nov.",
+    "Dec." : "dic.",
     "Settings" : "Configuración",
     "Saving..." : "Guardando...",
     "No" : "No",
@@ -53,13 +72,13 @@ OC.L10N.register(
     "Good password" : "Buena contraseña. ",
     "Strong password" : "Contraseña fuerte.",
     "Shared" : "Compartido",
-    "Share" : "Compartir",
     "Error" : "Error",
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error en al dejar de compartir",
     "Error while changing permissions" : "Error al cambiar permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido con vos por {owner}",
+    "Share" : "Compartir",
     "Share link" : "Compartir vínculo",
     "Password protect" : "Proteger con contraseña ",
     "Password" : "Contraseña",
@@ -130,8 +149,8 @@ OC.L10N.register(
     "Search" : "Buscar",
     "Server side authentication failed!" : "¡Falló la autenticación del servidor!",
     "Please contact your administrator." : "Por favor, contacte a su administrador.",
-    "remember" : "recordame",
     "Log in" : "Iniciar sesión",
+    "remember" : "recordame",
     "Alternative Logins" : "Nombre alternativos de usuarios",
     "This ownCloud instance is currently in single user mode." : "Esta instancia de ownCloud está en modo de usuario único.",
     "This means only administrators can use the instance." : "Esto significa que solo administradores pueden usar esta instancia.",
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
index 69c7732c43..93a5b81574 100644
--- a/core/l10n/es_AR.json
+++ b/core/l10n/es_AR.json
@@ -15,6 +15,13 @@
     "Thursday" : "Jueves",
     "Friday" : "Viernes",
     "Saturday" : "Sábado",
+    "Sun." : "dom.",
+    "Mon." : "lun.",
+    "Tue." : "mar.",
+    "Wed." : "miér.",
+    "Thu." : "jue.",
+    "Fri." : "vie.",
+    "Sat." : "sáb.",
     "January" : "enero",
     "February" : "febrero",
     "March" : "marzo",
@@ -27,6 +34,18 @@
     "October" : "octubre",
     "November" : "noviembre",
     "December" : "diciembre",
+    "Jan." : "ene.",
+    "Feb." : "feb.",
+    "Mar." : "mar.",
+    "Apr." : "abr.",
+    "May." : "may.",
+    "Jun." : "jun.",
+    "Jul." : "jul.",
+    "Aug." : "ago.",
+    "Sep." : "sep.",
+    "Oct." : "oct.",
+    "Nov." : "nov.",
+    "Dec." : "dic.",
     "Settings" : "Configuración",
     "Saving..." : "Guardando...",
     "No" : "No",
@@ -51,13 +70,13 @@
     "Good password" : "Buena contraseña. ",
     "Strong password" : "Contraseña fuerte.",
     "Shared" : "Compartido",
-    "Share" : "Compartir",
     "Error" : "Error",
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error en al dejar de compartir",
     "Error while changing permissions" : "Error al cambiar permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido con vos por {owner}",
+    "Share" : "Compartir",
     "Share link" : "Compartir vínculo",
     "Password protect" : "Proteger con contraseña ",
     "Password" : "Contraseña",
@@ -128,8 +147,8 @@
     "Search" : "Buscar",
     "Server side authentication failed!" : "¡Falló la autenticación del servidor!",
     "Please contact your administrator." : "Por favor, contacte a su administrador.",
-    "remember" : "recordame",
     "Log in" : "Iniciar sesión",
+    "remember" : "recordame",
     "Alternative Logins" : "Nombre alternativos de usuarios",
     "This ownCloud instance is currently in single user mode." : "Esta instancia de ownCloud está en modo de usuario único.",
     "This means only administrators can use the instance." : "Esto significa que solo administradores pueden usar esta instancia.",
diff --git a/core/l10n/es_BO.js b/core/l10n/es_BO.js
deleted file mode 100644
index 4cb36aaaaa..0000000000
--- a/core/l10n/es_BO.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_BO.json b/core/l10n/es_BO.json
deleted file mode 100644
index 43fce52c5c..0000000000
--- a/core/l10n/es_BO.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_CL.js b/core/l10n/es_CL.js
index e143b3cb08..3558448c96 100644
--- a/core/l10n/es_CL.js
+++ b/core/l10n/es_CL.js
@@ -29,11 +29,11 @@ OC.L10N.register(
     "Ok" : "Ok",
     "Cancel" : "Cancelar",
     "Shared" : "Compartido",
-    "Share" : "Compartir",
     "Error" : "Error",
     "Error while sharing" : "Ocurrió un error mientras compartía",
     "Error while unsharing" : "Ocurrió un error mientras dejaba de compartir",
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
+    "Share" : "Compartir",
     "Password" : "Clave",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Personal" : "Personal",
diff --git a/core/l10n/es_CL.json b/core/l10n/es_CL.json
index 996aeb75ac..d1fc84c7e3 100644
--- a/core/l10n/es_CL.json
+++ b/core/l10n/es_CL.json
@@ -27,11 +27,11 @@
     "Ok" : "Ok",
     "Cancel" : "Cancelar",
     "Shared" : "Compartido",
-    "Share" : "Compartir",
     "Error" : "Error",
     "Error while sharing" : "Ocurrió un error mientras compartía",
     "Error while unsharing" : "Ocurrió un error mientras dejaba de compartir",
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
+    "Share" : "Compartir",
     "Password" : "Clave",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "Personal" : "Personal",
diff --git a/core/l10n/es_CO.js b/core/l10n/es_CO.js
deleted file mode 100644
index 4cb36aaaaa..0000000000
--- a/core/l10n/es_CO.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CO.json b/core/l10n/es_CO.json
deleted file mode 100644
index 43fce52c5c..0000000000
--- a/core/l10n/es_CO.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_CR.js b/core/l10n/es_CR.js
deleted file mode 100644
index 4cb36aaaaa..0000000000
--- a/core/l10n/es_CR.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CR.json b/core/l10n/es_CR.json
deleted file mode 100644
index 43fce52c5c..0000000000
--- a/core/l10n/es_CR.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_EC.js b/core/l10n/es_EC.js
deleted file mode 100644
index 4cb36aaaaa..0000000000
--- a/core/l10n/es_EC.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_EC.json b/core/l10n/es_EC.json
deleted file mode 100644
index 43fce52c5c..0000000000
--- a/core/l10n/es_EC.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
index cc01b07c8c..7c4ca4a2d6 100644
--- a/core/l10n/es_MX.js
+++ b/core/l10n/es_MX.js
@@ -17,6 +17,13 @@ OC.L10N.register(
     "Thursday" : "Jueves",
     "Friday" : "Viernes",
     "Saturday" : "Sábado",
+    "Sun." : "Dom.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mier.",
+    "Thu." : "Jue.",
+    "Fri." : "Vie.",
+    "Sat." : "Sab.",
     "January" : "Enero",
     "February" : "Febrero",
     "March" : "Marzo",
@@ -29,6 +36,18 @@ OC.L10N.register(
     "October" : "Octubre",
     "November" : "Noviembre",
     "December" : "Diciembre",
+    "Jan." : "Ene.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "May.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ago.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dic.",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
     "No" : "No",
@@ -47,13 +66,13 @@ OC.L10N.register(
     "({count} selected)" : "({count} seleccionados)",
     "Error loading file exists template" : "Error cargando plantilla de archivo existente",
     "Shared" : "Compartido",
-    "Share" : "Compartir",
     "Error" : "Error",
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error al dejar de compartir",
     "Error while changing permissions" : "Error al cambiar permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido contigo por {owner}",
+    "Share" : "Compartir",
     "Share link" : "Enlace compartido",
     "Password protect" : "Protección con contraseña",
     "Password" : "Contraseña",
@@ -125,7 +144,6 @@ OC.L10N.register(
     "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
     "Please contact your administrator." : "Por favor, contacte con el administrador.",
     "remember" : "recordar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Accesos Alternativos",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
     "This means only administrators can use the instance." : "Esto quiere decir que solo un administrador puede usarla.",
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
index 265788ee9a..45b55e8f28 100644
--- a/core/l10n/es_MX.json
+++ b/core/l10n/es_MX.json
@@ -15,6 +15,13 @@
     "Thursday" : "Jueves",
     "Friday" : "Viernes",
     "Saturday" : "Sábado",
+    "Sun." : "Dom.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mier.",
+    "Thu." : "Jue.",
+    "Fri." : "Vie.",
+    "Sat." : "Sab.",
     "January" : "Enero",
     "February" : "Febrero",
     "March" : "Marzo",
@@ -27,6 +34,18 @@
     "October" : "Octubre",
     "November" : "Noviembre",
     "December" : "Diciembre",
+    "Jan." : "Ene.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "May.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ago.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dic.",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
     "No" : "No",
@@ -45,13 +64,13 @@
     "({count} selected)" : "({count} seleccionados)",
     "Error loading file exists template" : "Error cargando plantilla de archivo existente",
     "Shared" : "Compartido",
-    "Share" : "Compartir",
     "Error" : "Error",
     "Error while sharing" : "Error al compartir",
     "Error while unsharing" : "Error al dejar de compartir",
     "Error while changing permissions" : "Error al cambiar permisos",
     "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
     "Shared with you by {owner}" : "Compartido contigo por {owner}",
+    "Share" : "Compartir",
     "Share link" : "Enlace compartido",
     "Password protect" : "Protección con contraseña",
     "Password" : "Contraseña",
@@ -123,7 +142,6 @@
     "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
     "Please contact your administrator." : "Por favor, contacte con el administrador.",
     "remember" : "recordar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Accesos Alternativos",
     "This ownCloud instance is currently in single user mode." : "Esta instalación de ownCloud se encuentra en modo de usuario único.",
     "This means only administrators can use the instance." : "Esto quiere decir que solo un administrador puede usarla.",
diff --git a/core/l10n/es_PE.js b/core/l10n/es_PE.js
deleted file mode 100644
index 4cb36aaaaa..0000000000
--- a/core/l10n/es_PE.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_PE.json b/core/l10n/es_PE.json
deleted file mode 100644
index 43fce52c5c..0000000000
--- a/core/l10n/es_PE.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_PY.js b/core/l10n/es_PY.js
deleted file mode 100644
index 4cb36aaaaa..0000000000
--- a/core/l10n/es_PY.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_PY.json b/core/l10n/es_PY.json
deleted file mode 100644
index 43fce52c5c..0000000000
--- a/core/l10n/es_PY.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_US.js b/core/l10n/es_US.js
deleted file mode 100644
index 4cb36aaaaa..0000000000
--- a/core/l10n/es_US.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_US.json b/core/l10n/es_US.json
deleted file mode 100644
index 43fce52c5c..0000000000
--- a/core/l10n/es_US.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/es_UY.js b/core/l10n/es_UY.js
deleted file mode 100644
index 4cb36aaaaa..0000000000
--- a/core/l10n/es_UY.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_UY.json b/core/l10n/es_UY.json
deleted file mode 100644
index 43fce52c5c..0000000000
--- a/core/l10n/es_UY.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index b08139a1f3..7395970563 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
+    "Preparing update" : "Uuendamise ettevalmistamine",
     "Turned on maintenance mode" : "Haldusrežiimis sisse lülitatud",
     "Turned off maintenance mode" : "Haldusrežiimis välja lülitatud",
     "Updated database" : "Uuendatud andmebaas",
@@ -10,6 +11,10 @@ OC.L10N.register(
     "Updated \"%s\" to %s" : "Uuendatud \"%s\" -> %s",
     "Repair warning: " : "Paranda hoiatus:",
     "Repair error: " : "Paranda viga:",
+    "Following incompatible apps have been disabled: %s" : "Järgnevad mitteühilduvad rakendused on välja lülitatud: %s",
+    "Following apps have been disabled: %s" : "Järgnevad rakendused on välja lülitatud: %s",
+    "Already up to date" : "On juba ajakohane",
+    "File is too big" : "Fail on liiga suur",
     "Invalid file provided" : "Vigane fail",
     "No image or file provided" : "Ühtegi pilti või faili pole pakutud",
     "Unknown filetype" : "Tundmatu failitüüp",
@@ -24,6 +29,20 @@ OC.L10N.register(
     "Thursday" : "Neljapäev",
     "Friday" : "Reede",
     "Saturday" : "Laupäev",
+    "Sun." : "P",
+    "Mon." : "E",
+    "Tue." : "T",
+    "Wed." : "K",
+    "Thu." : "N",
+    "Fri." : "R",
+    "Sat." : "L",
+    "Su" : "P",
+    "Mo" : "E",
+    "Tu" : "T",
+    "We" : "K",
+    "Th" : "N",
+    "Fr" : "R",
+    "Sa" : "L",
     "January" : "Jaanuar",
     "February" : "Veebruar",
     "March" : "Märts",
@@ -36,6 +55,18 @@ OC.L10N.register(
     "October" : "Oktoober",
     "November" : "November",
     "December" : "Detsember",
+    "Jan." : "Jaan.",
+    "Feb." : "Veebr.",
+    "Mar." : "Mär.",
+    "Apr." : "Apr.",
+    "May." : "Mai",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sept.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dets.",
     "Settings" : "Seaded",
     "Saving..." : "Salvestamine...",
     "Couldn't send reset email. Please contact your administrator." : "Ei suutnud lähtestada e-maili. Palun kontakteeru süsteemihalduriga.",
@@ -66,10 +97,10 @@ OC.L10N.register(
     "So-so password" : "Enam-vähem sobiv parool",
     "Good password" : "Hea parool",
     "Strong password" : "Väga hea parool",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
     "Error occurred while checking server setup" : "Serveri seadete kontrolimisel tekkis viga",
     "Shared" : "Jagatud",
     "Shared with {recipients}" : "Jagatud {recipients}",
-    "Share" : "Jaga",
     "Error" : "Viga",
     "Error while sharing" : "Viga jagamisel",
     "Error while unsharing" : "Viga jagamise lõpetamisel",
@@ -78,6 +109,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Sinuga jagas {owner}",
     "Share with users or groups …" : "Jaga kasutajate või gruppidega ...",
     "Share with users, groups or remote users …" : "Jaga kasutajate, gruppide või eemal olevate kasutajatega ...",
+    "Share" : "Jaga",
     "Share link" : "Jaga linki",
     "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
     "Link" : "Link",
@@ -198,9 +230,8 @@ OC.L10N.register(
     "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.",
     "An internal error occured." : "Tekkis sisemine tõrge.",
     "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.",
-    "Forgot your password? Reset it!" : "Unustasid parooli? Taasta see!",
-    "remember" : "pea meeles",
     "Log in" : "Logi sisse",
+    "remember" : "pea meeles",
     "Alternative Logins" : "Alternatiivsed sisselogimisviisid",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "See ownCloud on momendil seadistatud ühe kasutaja jaoks.",
@@ -211,8 +242,9 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.",
     "Add \"%s\" as trusted domain" : "Lisa \"%s\" usaldusväärse domeenina",
-    "%s will be updated to version %s." : "%s uuendatakse versioonile %s.",
-    "The following apps will be disabled:" : "Järgnevad rakendid keelatakse:",
+    "App update required" : "Rakenduse uuendus on nõutud",
+    "These apps will be updated:" : "Neid rakendusi uuendatakse:",
+    "These incompatible apps will be disabled:" : "Need mitteühilduvad rakendused lülitatakse välja:",
     "The theme %s has been disabled." : "Teema %s on keelatud.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enne jätkamist veendu, et andmebaas, seadete ning andmete kataloog on varundatud.",
     "Start update" : "Käivita uuendus",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 35494783a6..43a04a5ddc 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
+    "Preparing update" : "Uuendamise ettevalmistamine",
     "Turned on maintenance mode" : "Haldusrežiimis sisse lülitatud",
     "Turned off maintenance mode" : "Haldusrežiimis välja lülitatud",
     "Updated database" : "Uuendatud andmebaas",
@@ -8,6 +9,10 @@
     "Updated \"%s\" to %s" : "Uuendatud \"%s\" -> %s",
     "Repair warning: " : "Paranda hoiatus:",
     "Repair error: " : "Paranda viga:",
+    "Following incompatible apps have been disabled: %s" : "Järgnevad mitteühilduvad rakendused on välja lülitatud: %s",
+    "Following apps have been disabled: %s" : "Järgnevad rakendused on välja lülitatud: %s",
+    "Already up to date" : "On juba ajakohane",
+    "File is too big" : "Fail on liiga suur",
     "Invalid file provided" : "Vigane fail",
     "No image or file provided" : "Ühtegi pilti või faili pole pakutud",
     "Unknown filetype" : "Tundmatu failitüüp",
@@ -22,6 +27,20 @@
     "Thursday" : "Neljapäev",
     "Friday" : "Reede",
     "Saturday" : "Laupäev",
+    "Sun." : "P",
+    "Mon." : "E",
+    "Tue." : "T",
+    "Wed." : "K",
+    "Thu." : "N",
+    "Fri." : "R",
+    "Sat." : "L",
+    "Su" : "P",
+    "Mo" : "E",
+    "Tu" : "T",
+    "We" : "K",
+    "Th" : "N",
+    "Fr" : "R",
+    "Sa" : "L",
     "January" : "Jaanuar",
     "February" : "Veebruar",
     "March" : "Märts",
@@ -34,6 +53,18 @@
     "October" : "Oktoober",
     "November" : "November",
     "December" : "Detsember",
+    "Jan." : "Jaan.",
+    "Feb." : "Veebr.",
+    "Mar." : "Mär.",
+    "Apr." : "Apr.",
+    "May." : "Mai",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sept.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dets.",
     "Settings" : "Seaded",
     "Saving..." : "Salvestamine...",
     "Couldn't send reset email. Please contact your administrator." : "Ei suutnud lähtestada e-maili. Palun kontakteeru süsteemihalduriga.",
@@ -64,10 +95,10 @@
     "So-so password" : "Enam-vähem sobiv parool",
     "Good password" : "Hea parool",
     "Strong password" : "Väga hea parool",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
     "Error occurred while checking server setup" : "Serveri seadete kontrolimisel tekkis viga",
     "Shared" : "Jagatud",
     "Shared with {recipients}" : "Jagatud {recipients}",
-    "Share" : "Jaga",
     "Error" : "Viga",
     "Error while sharing" : "Viga jagamisel",
     "Error while unsharing" : "Viga jagamise lõpetamisel",
@@ -76,6 +107,7 @@
     "Shared with you by {owner}" : "Sinuga jagas {owner}",
     "Share with users or groups …" : "Jaga kasutajate või gruppidega ...",
     "Share with users, groups or remote users …" : "Jaga kasutajate, gruppide või eemal olevate kasutajatega ...",
+    "Share" : "Jaga",
     "Share link" : "Jaga linki",
     "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
     "Link" : "Link",
@@ -196,9 +228,8 @@
     "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.",
     "An internal error occured." : "Tekkis sisemine tõrge.",
     "Please try again or contact your administrator." : "Palun proovi uuesti või võta ühendust oma administraatoriga.",
-    "Forgot your password? Reset it!" : "Unustasid parooli? Taasta see!",
-    "remember" : "pea meeles",
     "Log in" : "Logi sisse",
+    "remember" : "pea meeles",
     "Alternative Logins" : "Alternatiivsed sisselogimisviisid",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>annan teada, et %s jagas sinuga <strong>%s</strong>. <a href=\"%s\">Vaata seda!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "See ownCloud on momendil seadistatud ühe kasutaja jaoks.",
@@ -209,8 +240,9 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.",
     "Add \"%s\" as trusted domain" : "Lisa \"%s\" usaldusväärse domeenina",
-    "%s will be updated to version %s." : "%s uuendatakse versioonile %s.",
-    "The following apps will be disabled:" : "Järgnevad rakendid keelatakse:",
+    "App update required" : "Rakenduse uuendus on nõutud",
+    "These apps will be updated:" : "Neid rakendusi uuendatakse:",
+    "These incompatible apps will be disabled:" : "Need mitteühilduvad rakendused lülitatakse välja:",
     "The theme %s has been disabled." : "Teema %s on keelatud.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enne jätkamist veendu, et andmebaas, seadete ning andmete kataloog on varundatud.",
     "Start update" : "Käivita uuendus",
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index 9b96a760d4..88b7507235 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -20,6 +20,13 @@ OC.L10N.register(
     "Thursday" : "Osteguna",
     "Friday" : "Ostirala",
     "Saturday" : "Larunbata",
+    "Sun." : "ig.",
+    "Mon." : "al.",
+    "Tue." : "ar.",
+    "Wed." : "az.",
+    "Thu." : "og.",
+    "Fri." : "ol.",
+    "Sat." : "lr.",
     "January" : "Urtarrila",
     "February" : "Otsaila",
     "March" : "Martxoa",
@@ -32,6 +39,18 @@ OC.L10N.register(
     "October" : "Urria",
     "November" : "Azaroa",
     "December" : "Abendua",
+    "Jan." : "urt.",
+    "Feb." : "ots.",
+    "Mar." : "mar.",
+    "Apr." : "api.",
+    "May." : "mai.",
+    "Jun." : "eka.",
+    "Jul." : "uzt.",
+    "Aug." : "abu.",
+    "Sep." : "ira.",
+    "Oct." : "urr.",
+    "Nov." : "aza.",
+    "Dec." : "abe.",
     "Settings" : "Ezarpenak",
     "Saving..." : "Gordetzen...",
     "Couldn't send reset email. Please contact your administrator." : "Ezin da berrezartzeko eposta bidali. Mesedez jarri harremetan zure administradorearekin.",
@@ -65,13 +84,13 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Errore bat gertatu da zerbitzariaren konfigurazioa egiaztatzerakoan.",
     "Shared" : "Elkarbanatuta",
     "Shared with {recipients}" : "{recipients}-rekin partekatua.",
-    "Share" : "Elkarbanatu",
     "Error" : "Errorea",
     "Error while sharing" : "Errore bat egon da elkarbanatzean",
     "Error while unsharing" : "Errore bat egon da elkarbanaketa desegitean",
     "Error while changing permissions" : "Errore bat egon da baimenak aldatzean",
     "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
     "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
+    "Share" : "Elkarbanatu",
     "Share link" : "Elkarbanatu lotura",
     "The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
     "Link" : "Esteka",
@@ -180,9 +199,8 @@ OC.L10N.register(
     "Search" : "Bilatu",
     "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
     "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.",
-    "Forgot your password? Reset it!" : "Pasahitza ahaztu duzu? Berrezarri!",
-    "remember" : "gogoratu",
     "Log in" : "Hasi saioa",
+    "remember" : "gogoratu",
     "Alternative Logins" : "Beste erabiltzaile izenak",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s",
     "This ownCloud instance is currently in single user mode." : "ownCloud instantzia hau erabiltzaile bakar moduan dago.",
@@ -193,8 +211,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mesedez harremanetan jarri kudeatzailearekin. Zu kudeatzailea bazara, konfiguratu \"trusted_domain\" ezarpena config/config.php fitxategian. Adibidezko konfigurazko bat  config/config.sample.php fitxategian dago.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Zure ezarpenen gorabehera, administratzaile bezala posible duzu ere azpiko botoia erabiltzea fidatzeko domeinu horrekin.",
     "Add \"%s\" as trusted domain" : "Gehitu \"%s\" domeinu fidagarri gisa",
-    "%s will be updated to version %s." : "%s %s bertsiora eguneratuko da.",
-    "The following apps will be disabled:" : "Ondorengo aplikazioak desgaituko dira:",
     "The theme %s has been disabled." : "%s gaia desgaitu da.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ekin aurretik egiazta ezazu datu basearen, ezarpenen karpetaren eta datuen karpetaren babeskopia duzula.",
     "Start update" : "Hasi eguneraketa",
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index 35e252a7a7..51143f2476 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -18,6 +18,13 @@
     "Thursday" : "Osteguna",
     "Friday" : "Ostirala",
     "Saturday" : "Larunbata",
+    "Sun." : "ig.",
+    "Mon." : "al.",
+    "Tue." : "ar.",
+    "Wed." : "az.",
+    "Thu." : "og.",
+    "Fri." : "ol.",
+    "Sat." : "lr.",
     "January" : "Urtarrila",
     "February" : "Otsaila",
     "March" : "Martxoa",
@@ -30,6 +37,18 @@
     "October" : "Urria",
     "November" : "Azaroa",
     "December" : "Abendua",
+    "Jan." : "urt.",
+    "Feb." : "ots.",
+    "Mar." : "mar.",
+    "Apr." : "api.",
+    "May." : "mai.",
+    "Jun." : "eka.",
+    "Jul." : "uzt.",
+    "Aug." : "abu.",
+    "Sep." : "ira.",
+    "Oct." : "urr.",
+    "Nov." : "aza.",
+    "Dec." : "abe.",
     "Settings" : "Ezarpenak",
     "Saving..." : "Gordetzen...",
     "Couldn't send reset email. Please contact your administrator." : "Ezin da berrezartzeko eposta bidali. Mesedez jarri harremetan zure administradorearekin.",
@@ -63,13 +82,13 @@
     "Error occurred while checking server setup" : "Errore bat gertatu da zerbitzariaren konfigurazioa egiaztatzerakoan.",
     "Shared" : "Elkarbanatuta",
     "Shared with {recipients}" : "{recipients}-rekin partekatua.",
-    "Share" : "Elkarbanatu",
     "Error" : "Errorea",
     "Error while sharing" : "Errore bat egon da elkarbanatzean",
     "Error while unsharing" : "Errore bat egon da elkarbanaketa desegitean",
     "Error while changing permissions" : "Errore bat egon da baimenak aldatzean",
     "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
     "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
+    "Share" : "Elkarbanatu",
     "Share link" : "Elkarbanatu lotura",
     "The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
     "Link" : "Esteka",
@@ -178,9 +197,8 @@
     "Search" : "Bilatu",
     "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
     "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.",
-    "Forgot your password? Reset it!" : "Pasahitza ahaztu duzu? Berrezarri!",
-    "remember" : "gogoratu",
     "Log in" : "Hasi saioa",
+    "remember" : "gogoratu",
     "Alternative Logins" : "Beste erabiltzaile izenak",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s",
     "This ownCloud instance is currently in single user mode." : "ownCloud instantzia hau erabiltzaile bakar moduan dago.",
@@ -191,8 +209,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mesedez harremanetan jarri kudeatzailearekin. Zu kudeatzailea bazara, konfiguratu \"trusted_domain\" ezarpena config/config.php fitxategian. Adibidezko konfigurazko bat  config/config.sample.php fitxategian dago.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Zure ezarpenen gorabehera, administratzaile bezala posible duzu ere azpiko botoia erabiltzea fidatzeko domeinu horrekin.",
     "Add \"%s\" as trusted domain" : "Gehitu \"%s\" domeinu fidagarri gisa",
-    "%s will be updated to version %s." : "%s %s bertsiora eguneratuko da.",
-    "The following apps will be disabled:" : "Ondorengo aplikazioak desgaituko dira:",
     "The theme %s has been disabled." : "%s gaia desgaitu da.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ekin aurretik egiazta ezazu datu basearen, ezarpenen karpetaren eta datuen karpetaren babeskopia duzula.",
     "Start update" : "Hasi eguneraketa",
diff --git a/core/l10n/eu_ES.js b/core/l10n/eu_ES.js
deleted file mode 100644
index 847f4cc5da..0000000000
--- a/core/l10n/eu_ES.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "Cancel" : "Ezeztatu",
-    "Delete" : "Ezabatu",
-    "Personal" : "Pertsonala"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/eu_ES.json b/core/l10n/eu_ES.json
deleted file mode 100644
index 0f7c86a7b9..0000000000
--- a/core/l10n/eu_ES.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Cancel" : "Ezeztatu",
-    "Delete" : "Ezabatu",
-    "Personal" : "Pertsonala"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index 7263c05da8..12bdd37eab 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -16,6 +16,13 @@ OC.L10N.register(
     "Thursday" : "پنجشنبه",
     "Friday" : "جمعه",
     "Saturday" : "شنبه",
+    "Sun." : "یکشنبه",
+    "Mon." : "دوشنبه",
+    "Tue." : "سه شنبه",
+    "Wed." : "چهارشنبه",
+    "Thu." : "پنج شنبه",
+    "Fri." : "جمعه",
+    "Sat." : "شنبه",
     "January" : "ژانویه",
     "February" : "فبریه",
     "March" : "مارس",
@@ -28,6 +35,18 @@ OC.L10N.register(
     "October" : "اکتبر",
     "November" : "نوامبر",
     "December" : "دسامبر",
+    "Jan." : "ژانویه",
+    "Feb." : "فوریه",
+    "Mar." : "مارچ",
+    "Apr." : "آوریل",
+    "May." : "می",
+    "Jun." : "ژوئن",
+    "Jul." : "جولای",
+    "Aug." : "آگوست",
+    "Sep." : "سپتامبر",
+    "Oct." : "اکتبر",
+    "Nov." : "نوامبر",
+    "Dec." : "دسامبر",
     "Settings" : "تنظیمات",
     "Saving..." : "در حال ذخیره سازی...",
     "Couldn't send reset email. Please contact your administrator." : "ارسال ایمیل مجدد با مشکل مواجه شد . لطفا با مدیر سیستم تماس بگیرید .",
@@ -56,13 +75,13 @@ OC.L10N.register(
     "Strong password" : "رمز عبور قوی",
     "Shared" : "اشتراک گذاشته شده",
     "Shared with {recipients}" : "به اشتراک گذاشته شده با {recipients}",
-    "Share" : "اشتراک‌گذاری",
     "Error" : "خطا",
     "Error while sharing" : "خطا درحال به اشتراک گذاشتن",
     "Error while unsharing" : "خطا درحال لغو اشتراک",
     "Error while changing permissions" : "خطا در حال تغییر مجوز",
     "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
     "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
+    "Share" : "اشتراک‌گذاری",
     "Share link" : "اشتراک گذاشتن لینک",
     "Password protect" : "نگهداری کردن رمز عبور",
     "Password" : "گذرواژه",
@@ -127,7 +146,6 @@ OC.L10N.register(
     "Log out" : "خروج",
     "Search" : "جست‌و‌جو",
     "remember" : "بیاد آوری",
-    "Log in" : "ورود",
     "Alternative Logins" : "ورود متناوب",
     "Thank you for your patience." : "از صبر شما متشکریم",
     "Start update" : "اغاز به روز رسانی"
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index 804a8a66fa..22a8e2eb0f 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -14,6 +14,13 @@
     "Thursday" : "پنجشنبه",
     "Friday" : "جمعه",
     "Saturday" : "شنبه",
+    "Sun." : "یکشنبه",
+    "Mon." : "دوشنبه",
+    "Tue." : "سه شنبه",
+    "Wed." : "چهارشنبه",
+    "Thu." : "پنج شنبه",
+    "Fri." : "جمعه",
+    "Sat." : "شنبه",
     "January" : "ژانویه",
     "February" : "فبریه",
     "March" : "مارس",
@@ -26,6 +33,18 @@
     "October" : "اکتبر",
     "November" : "نوامبر",
     "December" : "دسامبر",
+    "Jan." : "ژانویه",
+    "Feb." : "فوریه",
+    "Mar." : "مارچ",
+    "Apr." : "آوریل",
+    "May." : "می",
+    "Jun." : "ژوئن",
+    "Jul." : "جولای",
+    "Aug." : "آگوست",
+    "Sep." : "سپتامبر",
+    "Oct." : "اکتبر",
+    "Nov." : "نوامبر",
+    "Dec." : "دسامبر",
     "Settings" : "تنظیمات",
     "Saving..." : "در حال ذخیره سازی...",
     "Couldn't send reset email. Please contact your administrator." : "ارسال ایمیل مجدد با مشکل مواجه شد . لطفا با مدیر سیستم تماس بگیرید .",
@@ -54,13 +73,13 @@
     "Strong password" : "رمز عبور قوی",
     "Shared" : "اشتراک گذاشته شده",
     "Shared with {recipients}" : "به اشتراک گذاشته شده با {recipients}",
-    "Share" : "اشتراک‌گذاری",
     "Error" : "خطا",
     "Error while sharing" : "خطا درحال به اشتراک گذاشتن",
     "Error while unsharing" : "خطا درحال لغو اشتراک",
     "Error while changing permissions" : "خطا در حال تغییر مجوز",
     "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
     "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
+    "Share" : "اشتراک‌گذاری",
     "Share link" : "اشتراک گذاشتن لینک",
     "Password protect" : "نگهداری کردن رمز عبور",
     "Password" : "گذرواژه",
@@ -125,7 +144,6 @@
     "Log out" : "خروج",
     "Search" : "جست‌و‌جو",
     "remember" : "بیاد آوری",
-    "Log in" : "ورود",
     "Alternative Logins" : "ورود متناوب",
     "Thank you for your patience." : "از صبر شما متشکریم",
     "Start update" : "اغاز به روز رسانی"
diff --git a/core/l10n/fi.js b/core/l10n/fi.js
deleted file mode 100644
index 84301350b9..0000000000
--- a/core/l10n/fi.js
+++ /dev/null
@@ -1,18 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "Settings" : "Asetukset",
-    "No" : "EI",
-    "Yes" : "KYLLÄ",
-    "Choose" : "Valitse",
-    "Cancel" : "Peruuta",
-    "Error" : "Virhe",
-    "Share link" : "Jaa linkki",
-    "Password" : "Salasana",
-    "Delete" : "Poista",
-    "Add" : "Lisää",
-    "Help" : "Apua",
-    "Username" : "Käyttäjätunnus",
-    "Log in" : "Kirjaudu sisään"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/fi.json b/core/l10n/fi.json
deleted file mode 100644
index d9a8d572f5..0000000000
--- a/core/l10n/fi.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{ "translations": {
-    "Settings" : "Asetukset",
-    "No" : "EI",
-    "Yes" : "KYLLÄ",
-    "Choose" : "Valitse",
-    "Cancel" : "Peruuta",
-    "Error" : "Virhe",
-    "Share link" : "Jaa linkki",
-    "Password" : "Salasana",
-    "Delete" : "Poista",
-    "Add" : "Lisää",
-    "Help" : "Apua",
-    "Username" : "Käyttäjätunnus",
-    "Log in" : "Kirjaudu sisään"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index fbb7098a9c..2c3c3c4961 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
+    "Preparing update" : "Valmistellaan päivitystä",
     "Turned on maintenance mode" : "Siirrytty huoltotilaan",
     "Turned off maintenance mode" : "Huoltotila asetettu pois päältä",
     "Maintenance mode is kept active" : "Huoltotila pidetään aktiivisena",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Korjausvirhe:",
     "Following incompatible apps have been disabled: %s" : "Seuraavat yhteensopimattomat sovellukset on poistettu käytöstä: %s",
     "Following apps have been disabled: %s" : "Seuraavat sovellukset on poistettu käytöstä: %s",
+    "Already up to date" : "Kaikki on jo ajan tasalla",
     "File is too big" : "Tiedosto on liian suuri",
     "Invalid file provided" : "Määritetty virheellinen tiedosto",
     "No image or file provided" : "Kuvaa tai tiedostoa ei määritelty",
@@ -29,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "torstai",
     "Friday" : "perjantai",
     "Saturday" : "lauantai",
+    "Sun." : "Su",
+    "Mon." : "Ma",
+    "Tue." : "Ti",
+    "Wed." : "Ke",
+    "Thu." : "To",
+    "Fri." : "Pe",
+    "Sat." : "La",
+    "Su" : "Su",
+    "Mo" : "Ma",
+    "Tu" : "Ti",
+    "We" : "Ke",
+    "Th" : "To",
+    "Fr" : "Pe",
+    "Sa" : "La",
     "January" : "tammikuu",
     "February" : "helmikuu",
     "March" : "maaliskuu",
@@ -41,6 +57,18 @@ OC.L10N.register(
     "October" : "lokakuu",
     "November" : "marraskuu",
     "December" : "joulukuu",
+    "Jan." : "Tammi",
+    "Feb." : "Helmi",
+    "Mar." : "Maalis",
+    "Apr." : "Huhti",
+    "May." : "Touko",
+    "Jun." : "Kesä",
+    "Jul." : "Heinä",
+    "Aug." : "Elo",
+    "Sep." : "Syys",
+    "Oct." : "Loka",
+    "Nov." : "Marras",
+    "Dec." : "Joulu",
     "Settings" : "Asetukset",
     "Saving..." : "Tallennetaan...",
     "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
@@ -76,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datahakemistosi ja tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi oikein. Suosittelemme määrittämään http-palvelimen asetukset siten, ettei datahakemisto ole suoraan käytettävissä internetistä, tai siirtämään datahakemiston http-palvelimen juurihakemiston ulkopuolelle.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Muistissa toimivaa cachea ei ole määritetty. Paranna suorituskykyä ottamalla memcache käyttöön. Lisätietoja on saatavilla <a href=\"{docLink}\">dokumentaatiosta</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ei ole luettavissa PHP:n toimesta. Turvallisuussyistä tämä ei ole suositeltava asetus. Lisätietoja on tarjolla <a href=\"{docLink}\">dokumentaatiossa</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Käytössäsi oleva PHP-versio ({version}) ei ole enää <a href=\"{phpLink}\">PHP:n tukema</a>. Päivitä PHP:n versio, jotta hyödyt suorituskykyyn ja tietoturvaan vaikuttavista päivityksistä.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Käänteisen välityspalvelimen otsakkaiden asetukset ovat väärin, tai vaihtoehtoisesti käytät ownCloudia luotetun välityspalvelimen kautta. Jos et käytä ownCloudia luotetun välityspalvelimen kautta, kyseessä on tietoturvaongelma, joka mahdollistaa hyökkääjän väärentää ownCloudille näkyvän IP-osoitteen. Lisätietoja on saatavilla <a href=\"{docLink}\">dokumentaatiosta</a>.",
     "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-otsaketta \"{header}\" ei ole määritetty vastaamaan arvoa \"{expected}\". Kyseessä on mahdollinen tietoturvaan tai -suojaan liittyvä riski, joten suosittelemme muuttamaan asetuksen arvoa.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP-otsaketta \"Strict-Transport-Security\" ei ole määritetty vähintään \"{seconds}\" sekuntiin. Suosittelemme HSTS:n käyttöä paremman tietoturvan vuoksi, kuten <a href=\"{docUrl}\">tietoturvavinkeissä</a> neuvotaan.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Käytät sivustoa HTTP-yhteydellä. Suosittelemme asettamaan palvelimen vaatimaan HTTPS-yhteyden, kuten <a href=\"{docUrl}\">tietoturvavinkeissä</a> neuvotaan.",
     "Shared" : "Jaettu",
     "Shared with {recipients}" : "Jaettu henkilöiden {recipients} kanssa",
-    "Share" : "Jaa",
     "Error" : "Virhe",
     "Error while sharing" : "Virhe jaettaessa",
     "Error while unsharing" : "Virhe jakoa peruttaessa",
@@ -91,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Jaettu kanssasi käyttäjän {owner} toimesta",
     "Share with users or groups …" : "Jaa käyttäjien tai ryhmien kanssa…",
     "Share with users, groups or remote users …" : "Jaa käyttäjien, ryhmien tai etäkäyttäjien kanssa…",
+    "Share" : "Jaa",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Jaa toisia ownCloud-järjestelmiä käyttävien kesken käyttäen syntaksia käyttäjätunnus@esimerkki.fi/owncloud",
     "Share link" : "Jaa linkki",
     "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
@@ -144,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Päivitys onnistui, tosin ilmeni varoituksia.",
     "The update was successful. Redirecting you to ownCloud now." : "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
     "Couldn't reset password because the token is invalid" : "Salasanaa ei voitu palauttaa koska valtuutus on virheellinen",
+    "Couldn't reset password because the token is expired" : "Salasanan nollaaminen ei onnistunut, koska valtuutus on vanhentunut",
     "Couldn't send reset email. Please make sure your username is correct." : "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
     "%s password reset" : "%s salasanan palautus",
@@ -217,9 +248,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
     "An internal error occured." : "Tapahtui sisäinen virhe.",
     "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.",
-    "Forgot your password? Reset it!" : "Unohditko salasanasi? Palauta se!",
-    "remember" : "muista",
     "Log in" : "Kirjaudu sisään",
+    "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?",
+    "remember" : "muista",
     "Alternative Logins" : "Vaihtoehtoiset kirjautumiset",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei!<br><br>%s jakoi kanssasi kohteen <strong>%s</strong>.<br><a href=\"%s\">Tutustu siihen!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Tämä ownCloud-asennus on parhaillaan single user -tilassa.",
@@ -230,8 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ota yhteys ylläpitäjään. Jos olet tämän ownCloudin ylläpitäjä, määritä \"trusted_domain\"-asetus tiedostossa config/config.php. Esimerkkimääritys on nähtävillä tiedostossa config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Riippuen määrityksistä, ylläpitäjänä saatat kyetä käyttämään alla olevaa painiketta luodaksesi luottamussuhteen tähän toimialueeseen.",
     "Add \"%s\" as trusted domain" : "Lisää \"%s\" luotetuksi toimialueeksi",
-    "%s will be updated to version %s." : "%s päivitetään versioon %s.",
-    "The following apps will be disabled:" : "Seuraavat sovellukset poistetaan käytöstä:",
+    "App update required" : "Sovelluksen päivittäminen vaaditaan",
+    "%s will be updated to version %s" : "%s päivitetään versioon %s",
+    "These apps will be updated:" : "Nämä sovellukset päivitetään:",
+    "These incompatible apps will be disabled:" : "Nämä yhteensopimattomat sovellukset poistetaan käytöstä:",
     "The theme %s has been disabled." : "Teema %s on poistettu käytöstä.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.",
     "Start update" : "Käynnistä päivitys",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 4dc72a9bef..e0ac241074 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
+    "Preparing update" : "Valmistellaan päivitystä",
     "Turned on maintenance mode" : "Siirrytty huoltotilaan",
     "Turned off maintenance mode" : "Huoltotila asetettu pois päältä",
     "Maintenance mode is kept active" : "Huoltotila pidetään aktiivisena",
@@ -11,6 +12,7 @@
     "Repair error: " : "Korjausvirhe:",
     "Following incompatible apps have been disabled: %s" : "Seuraavat yhteensopimattomat sovellukset on poistettu käytöstä: %s",
     "Following apps have been disabled: %s" : "Seuraavat sovellukset on poistettu käytöstä: %s",
+    "Already up to date" : "Kaikki on jo ajan tasalla",
     "File is too big" : "Tiedosto on liian suuri",
     "Invalid file provided" : "Määritetty virheellinen tiedosto",
     "No image or file provided" : "Kuvaa tai tiedostoa ei määritelty",
@@ -27,6 +29,20 @@
     "Thursday" : "torstai",
     "Friday" : "perjantai",
     "Saturday" : "lauantai",
+    "Sun." : "Su",
+    "Mon." : "Ma",
+    "Tue." : "Ti",
+    "Wed." : "Ke",
+    "Thu." : "To",
+    "Fri." : "Pe",
+    "Sat." : "La",
+    "Su" : "Su",
+    "Mo" : "Ma",
+    "Tu" : "Ti",
+    "We" : "Ke",
+    "Th" : "To",
+    "Fr" : "Pe",
+    "Sa" : "La",
     "January" : "tammikuu",
     "February" : "helmikuu",
     "March" : "maaliskuu",
@@ -39,6 +55,18 @@
     "October" : "lokakuu",
     "November" : "marraskuu",
     "December" : "joulukuu",
+    "Jan." : "Tammi",
+    "Feb." : "Helmi",
+    "Mar." : "Maalis",
+    "Apr." : "Huhti",
+    "May." : "Touko",
+    "Jun." : "Kesä",
+    "Jul." : "Heinä",
+    "Aug." : "Elo",
+    "Sep." : "Syys",
+    "Oct." : "Loka",
+    "Nov." : "Marras",
+    "Dec." : "Joulu",
     "Settings" : "Asetukset",
     "Saving..." : "Tallennetaan...",
     "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
@@ -74,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datahakemistosi ja tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi oikein. Suosittelemme määrittämään http-palvelimen asetukset siten, ettei datahakemisto ole suoraan käytettävissä internetistä, tai siirtämään datahakemiston http-palvelimen juurihakemiston ulkopuolelle.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Muistissa toimivaa cachea ei ole määritetty. Paranna suorituskykyä ottamalla memcache käyttöön. Lisätietoja on saatavilla <a href=\"{docLink}\">dokumentaatiosta</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ei ole luettavissa PHP:n toimesta. Turvallisuussyistä tämä ei ole suositeltava asetus. Lisätietoja on tarjolla <a href=\"{docLink}\">dokumentaatiossa</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Käytössäsi oleva PHP-versio ({version}) ei ole enää <a href=\"{phpLink}\">PHP:n tukema</a>. Päivitä PHP:n versio, jotta hyödyt suorituskykyyn ja tietoturvaan vaikuttavista päivityksistä.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Käänteisen välityspalvelimen otsakkaiden asetukset ovat väärin, tai vaihtoehtoisesti käytät ownCloudia luotetun välityspalvelimen kautta. Jos et käytä ownCloudia luotetun välityspalvelimen kautta, kyseessä on tietoturvaongelma, joka mahdollistaa hyökkääjän väärentää ownCloudille näkyvän IP-osoitteen. Lisätietoja on saatavilla <a href=\"{docLink}\">dokumentaatiosta</a>.",
     "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-otsaketta \"{header}\" ei ole määritetty vastaamaan arvoa \"{expected}\". Kyseessä on mahdollinen tietoturvaan tai -suojaan liittyvä riski, joten suosittelemme muuttamaan asetuksen arvoa.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP-otsaketta \"Strict-Transport-Security\" ei ole määritetty vähintään \"{seconds}\" sekuntiin. Suosittelemme HSTS:n käyttöä paremman tietoturvan vuoksi, kuten <a href=\"{docUrl}\">tietoturvavinkeissä</a> neuvotaan.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Käytät sivustoa HTTP-yhteydellä. Suosittelemme asettamaan palvelimen vaatimaan HTTPS-yhteyden, kuten <a href=\"{docUrl}\">tietoturvavinkeissä</a> neuvotaan.",
     "Shared" : "Jaettu",
     "Shared with {recipients}" : "Jaettu henkilöiden {recipients} kanssa",
-    "Share" : "Jaa",
     "Error" : "Virhe",
     "Error while sharing" : "Virhe jaettaessa",
     "Error while unsharing" : "Virhe jakoa peruttaessa",
@@ -89,6 +118,7 @@
     "Shared with you by {owner}" : "Jaettu kanssasi käyttäjän {owner} toimesta",
     "Share with users or groups …" : "Jaa käyttäjien tai ryhmien kanssa…",
     "Share with users, groups or remote users …" : "Jaa käyttäjien, ryhmien tai etäkäyttäjien kanssa…",
+    "Share" : "Jaa",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Jaa toisia ownCloud-järjestelmiä käyttävien kesken käyttäen syntaksia käyttäjätunnus@esimerkki.fi/owncloud",
     "Share link" : "Jaa linkki",
     "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
@@ -142,6 +172,7 @@
     "The update was successful. There were warnings." : "Päivitys onnistui, tosin ilmeni varoituksia.",
     "The update was successful. Redirecting you to ownCloud now." : "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
     "Couldn't reset password because the token is invalid" : "Salasanaa ei voitu palauttaa koska valtuutus on virheellinen",
+    "Couldn't reset password because the token is expired" : "Salasanan nollaaminen ei onnistunut, koska valtuutus on vanhentunut",
     "Couldn't send reset email. Please make sure your username is correct." : "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
     "%s password reset" : "%s salasanan palautus",
@@ -215,9 +246,9 @@
     "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
     "An internal error occured." : "Tapahtui sisäinen virhe.",
     "Please try again or contact your administrator." : "Yritä uudestaan tai ota yhteys ylläpitäjään.",
-    "Forgot your password? Reset it!" : "Unohditko salasanasi? Palauta se!",
-    "remember" : "muista",
     "Log in" : "Kirjaudu sisään",
+    "Wrong password. Reset it?" : "Väärä salasana. Haluatko palauttaa salasanan?",
+    "remember" : "muista",
     "Alternative Logins" : "Vaihtoehtoiset kirjautumiset",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei!<br><br>%s jakoi kanssasi kohteen <strong>%s</strong>.<br><a href=\"%s\">Tutustu siihen!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Tämä ownCloud-asennus on parhaillaan single user -tilassa.",
@@ -228,8 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ota yhteys ylläpitäjään. Jos olet tämän ownCloudin ylläpitäjä, määritä \"trusted_domain\"-asetus tiedostossa config/config.php. Esimerkkimääritys on nähtävillä tiedostossa config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Riippuen määrityksistä, ylläpitäjänä saatat kyetä käyttämään alla olevaa painiketta luodaksesi luottamussuhteen tähän toimialueeseen.",
     "Add \"%s\" as trusted domain" : "Lisää \"%s\" luotetuksi toimialueeksi",
-    "%s will be updated to version %s." : "%s päivitetään versioon %s.",
-    "The following apps will be disabled:" : "Seuraavat sovellukset poistetaan käytöstä:",
+    "App update required" : "Sovelluksen päivittäminen vaaditaan",
+    "%s will be updated to version %s" : "%s päivitetään versioon %s",
+    "These apps will be updated:" : "Nämä sovellukset päivitetään:",
+    "These incompatible apps will be disabled:" : "Nämä yhteensopimattomat sovellukset poistetaan käytöstä:",
     "The theme %s has been disabled." : "Teema %s on poistettu käytöstä.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.",
     "Start update" : "Käynnistä päivitys",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 12dcee2569..27bea200a6 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
+    "Preparing update" : "Préparation de la mise à jour",
     "Turned on maintenance mode" : "Mode de maintenance activé",
     "Turned off maintenance mode" : "Mode de maintenance désactivé",
     "Maintenance mode is kept active" : "Le mode de maintenance est laissé actif",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "Erreur de réparation :",
     "Following incompatible apps have been disabled: %s" : "Les applications incompatibles suivantes ont été désactivées : %s",
     "Following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
+    "Already up to date" : "Déjà à jour",
+    "File is too big" : "Fichier trop volumineux",
     "Invalid file provided" : "Fichier non valide",
     "No image or file provided" : "Aucun fichier fourni",
     "Unknown filetype" : "Type de fichier inconnu",
@@ -28,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Jeudi",
     "Friday" : "Vendredi",
     "Saturday" : "Samedi",
+    "Sun." : "Dim.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mer.",
+    "Thu." : "Jeu.",
+    "Fri." : "Ven.",
+    "Sat." : "Sam.",
+    "Su" : "Di",
+    "Mo" : "Lu",
+    "Tu" : "Ma",
+    "We" : "Me",
+    "Th" : "Je",
+    "Fr" : "Ve",
+    "Sa" : "Sa",
     "January" : "janvier",
     "February" : "février",
     "March" : "mars",
@@ -40,6 +57,18 @@ OC.L10N.register(
     "October" : "octobre",
     "November" : "novembre",
     "December" : "décembre",
+    "Jan." : "Jan.",
+    "Feb." : "Fév.",
+    "Mar." : "Mars",
+    "Apr." : "Avr.",
+    "May." : "Mai",
+    "Jun." : "Juin",
+    "Jul." : "Juil.",
+    "Aug." : "Août",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Déc.",
     "Settings" : "Paramètres",
     "Saving..." : "Enregistrement…",
     "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.",
@@ -75,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou de le déplacer hors de la racine du serveur web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Aucun cache de la mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a href=\"{docLink}\">documentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom n'est pas lisible par PHP, ce qui est fortement déconseillé pour des raisons de sécurité. Plus d'informations peuvent être trouvées dans notre <a href=\"{docLink}\">documentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La version de PHP utilisée ({version}) <a href=\"{phpLink}\">n'est plus prise en charge par les créateurs de PHP</a>. Nous vous recommandons de mettre à niveau votre installation de PHP pour bénéficier de meilleures performances et des mises à jour de sécurité fournies par PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "L'entête du fichier de configuration du reverse proxy est incorrect, ou vous accédez ownCloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accédé ownCloud depuis un proxy de confiance, ceci est un problème de sécurité and peut permettre à un attaquant de parodier son adresse IP visible par ownCloud. Plus d'information est accessible dans notre <a href=\"{docLink}\">documentation</a>.",
     "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est donc recommandé d'ajuster ce paramètre.",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans notre <a href=\"{docUrl}\">aide à la sécurité</a>.",
-    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Vous accédez à ce site via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS, comme expliqué dans notre <a href=\"{docUrl}\">aide à la sécurité</a>.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans notre <a href=\"{docUrl}\">Guide pour le renforcement et la sécurité</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Vous accédez à ce site via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS, comme expliqué dans notre <a href=\"{docUrl}\">Guide pour le renforcement et la sécurité</a>.",
     "Shared" : "Partagé",
     "Shared with {recipients}" : "Partagé avec {recipients}",
-    "Share" : "Partager",
     "Error" : "Erreur",
     "Error while sharing" : "Erreur lors de la mise en partage",
     "Error while unsharing" : "Erreur lors de l'annulation du partage",
@@ -90,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Partagé avec vous par {owner}",
     "Share with users or groups …" : "Partager avec des utilisateurs ou groupes...",
     "Share with users, groups or remote users …" : "Partager avec des utilisateurs, groupes, ou utilisateurs distants",
+    "Share" : "Partager",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partagez avec des personnes sur d'autres ownClouds en utilisant la syntaxe utilisateur@exemple.com/owncloud",
     "Share link" : "Partager par lien public",
     "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera au plus tard {days} jours après sa création.",
@@ -136,13 +167,14 @@ OC.L10N.register(
     "Hello {name}, the weather is {weather}" : "Bonjour {name}, le temps est {weather}",
     "Hello {name}" : "Hello {name}",
     "_download %n file_::_download %n files_" : ["Télécharger %n fichier","Télécharger %n fichiers"],
-    "{version} is available. Get more information on how to update." : "La version {version} est disponible. Obtenez plus d'informations à propos de cette mise à jour.",
+    "{version} is available. Get more information on how to update." : "La version {version} est disponible. Cliquez ici pour plus d'informations à propos de cette mise à jour.",
     "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
     "Please reload the page." : "Veuillez recharger la page.",
     "The update was unsuccessful. " : "La mise à jour a échoué.",
     "The update was successful. There were warnings." : "La mise à jour a réussi, mais il y a eu des avertissements",
     "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé vers ownCloud.",
     "Couldn't reset password because the token is invalid" : "Impossible de réinitialiser le mot de passe car le jeton n'est pas valable.",
+    "Couldn't reset password because the token is expired" : "Impossible de réinitialiser le mot de passe car le jeton a expiré.",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.",
     "%s password reset" : "Réinitialisation de votre mot de passe %s",
@@ -216,9 +248,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Veuillez contacter votre administrateur.",
     "An internal error occured." : "Une erreur interne est survenue.",
     "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.",
-    "Forgot your password? Reset it!" : "Mot de passe oublié ? Réinitialisez-le !",
+    "Log in" : "Se connecter",
+    "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?",
     "remember" : "se souvenir de moi",
-    "Log in" : "Connexion",
     "Alternative Logins" : "Identifiants alternatifs",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjour,<br><br>Nous vous informons que %s a partagé <strong>%s</strong> avec vous.<br><a href=\"%s\">Cliquez ici pour y accéder !</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Cette instance de ownCloud est actuellement en mode utilisateur unique.",
@@ -229,8 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Veuillez contacter votre administrateur. Si vous êtes administrateur de cette instance, configurez le paramètre « trusted_domain » dans le fichier config/config.php. Un exemple de configuration est fourni dans le fichier config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En fonction de votre configuration, en tant qu'administrateur vous pouvez également utiliser le bouton ci-dessous pour approuver ce domaine.",
     "Add \"%s\" as trusted domain" : "Ajouter \"%s\" à la liste des domaines approuvés",
-    "%s will be updated to version %s." : "%s sera mis à jour vers la version %s.",
-    "The following apps will be disabled:" : "Les applications suivantes seront désactivées :",
+    "App update required" : "Mise à jour de l'application nécessaire",
+    "%s will be updated to version %s" : "%s sera mis à jour vers la version %s.",
+    "These apps will be updated:" : "Les applications suivantes seront mises à jour:",
+    "These incompatible apps will be disabled:" : "Ces applications incompatibles ont été désactivés:",
     "The theme %s has been disabled." : "Le thème %s a été désactivé.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Veuillez vous assurer qu'une copie de sauvegarde de la base de données, du dossier de configuration (config) et du dossier de données (data) a été réalisée avant de commencer.",
     "Start update" : "Démarrer la mise à jour",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index dc45f141b1..ac12a4673d 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
+    "Preparing update" : "Préparation de la mise à jour",
     "Turned on maintenance mode" : "Mode de maintenance activé",
     "Turned off maintenance mode" : "Mode de maintenance désactivé",
     "Maintenance mode is kept active" : "Le mode de maintenance est laissé actif",
@@ -11,6 +12,8 @@
     "Repair error: " : "Erreur de réparation :",
     "Following incompatible apps have been disabled: %s" : "Les applications incompatibles suivantes ont été désactivées : %s",
     "Following apps have been disabled: %s" : "Les applications suivantes ont été désactivées : %s",
+    "Already up to date" : "Déjà à jour",
+    "File is too big" : "Fichier trop volumineux",
     "Invalid file provided" : "Fichier non valide",
     "No image or file provided" : "Aucun fichier fourni",
     "Unknown filetype" : "Type de fichier inconnu",
@@ -26,6 +29,20 @@
     "Thursday" : "Jeudi",
     "Friday" : "Vendredi",
     "Saturday" : "Samedi",
+    "Sun." : "Dim.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mer.",
+    "Thu." : "Jeu.",
+    "Fri." : "Ven.",
+    "Sat." : "Sam.",
+    "Su" : "Di",
+    "Mo" : "Lu",
+    "Tu" : "Ma",
+    "We" : "Me",
+    "Th" : "Je",
+    "Fr" : "Ve",
+    "Sa" : "Sa",
     "January" : "janvier",
     "February" : "février",
     "March" : "mars",
@@ -38,6 +55,18 @@
     "October" : "octobre",
     "November" : "novembre",
     "December" : "décembre",
+    "Jan." : "Jan.",
+    "Feb." : "Fév.",
+    "Mar." : "Mars",
+    "Apr." : "Avr.",
+    "May." : "Mai",
+    "Jun." : "Juin",
+    "Jul." : "Juil.",
+    "Aug." : "Août",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Déc.",
     "Settings" : "Paramètres",
     "Saving..." : "Enregistrement…",
     "Couldn't send reset email. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez contacter votre administrateur.",
@@ -73,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou de le déplacer hors de la racine du serveur web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Aucun cache de la mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a href=\"{docLink}\">documentation</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom n'est pas lisible par PHP, ce qui est fortement déconseillé pour des raisons de sécurité. Plus d'informations peuvent être trouvées dans notre <a href=\"{docLink}\">documentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La version de PHP utilisée ({version}) <a href=\"{phpLink}\">n'est plus prise en charge par les créateurs de PHP</a>. Nous vous recommandons de mettre à niveau votre installation de PHP pour bénéficier de meilleures performances et des mises à jour de sécurité fournies par PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "L'entête du fichier de configuration du reverse proxy est incorrect, ou vous accédez ownCloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accédé ownCloud depuis un proxy de confiance, ceci est un problème de sécurité and peut permettre à un attaquant de parodier son adresse IP visible par ownCloud. Plus d'information est accessible dans notre <a href=\"{docLink}\">documentation</a>.",
     "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'en-tête HTTP \"{header}\" n'est pas configurée pour être égale à \"{expected}\" créant potentiellement un risque relié à la sécurité et à la vie privée. Il est donc recommandé d'ajuster ce paramètre.",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans notre <a href=\"{docUrl}\">aide à la sécurité</a>.",
-    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Vous accédez à ce site via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS, comme expliqué dans notre <a href=\"{docUrl}\">aide à la sécurité</a>.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans notre <a href=\"{docUrl}\">Guide pour le renforcement et la sécurité</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Vous accédez à ce site via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS, comme expliqué dans notre <a href=\"{docUrl}\">Guide pour le renforcement et la sécurité</a>.",
     "Shared" : "Partagé",
     "Shared with {recipients}" : "Partagé avec {recipients}",
-    "Share" : "Partager",
     "Error" : "Erreur",
     "Error while sharing" : "Erreur lors de la mise en partage",
     "Error while unsharing" : "Erreur lors de l'annulation du partage",
@@ -88,6 +118,7 @@
     "Shared with you by {owner}" : "Partagé avec vous par {owner}",
     "Share with users or groups …" : "Partager avec des utilisateurs ou groupes...",
     "Share with users, groups or remote users …" : "Partager avec des utilisateurs, groupes, ou utilisateurs distants",
+    "Share" : "Partager",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partagez avec des personnes sur d'autres ownClouds en utilisant la syntaxe utilisateur@exemple.com/owncloud",
     "Share link" : "Partager par lien public",
     "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera au plus tard {days} jours après sa création.",
@@ -134,13 +165,14 @@
     "Hello {name}, the weather is {weather}" : "Bonjour {name}, le temps est {weather}",
     "Hello {name}" : "Hello {name}",
     "_download %n file_::_download %n files_" : ["Télécharger %n fichier","Télécharger %n fichiers"],
-    "{version} is available. Get more information on how to update." : "La version {version} est disponible. Obtenez plus d'informations à propos de cette mise à jour.",
+    "{version} is available. Get more information on how to update." : "La version {version} est disponible. Cliquez ici pour plus d'informations à propos de cette mise à jour.",
     "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
     "Please reload the page." : "Veuillez recharger la page.",
     "The update was unsuccessful. " : "La mise à jour a échoué.",
     "The update was successful. There were warnings." : "La mise à jour a réussi, mais il y a eu des avertissements",
     "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé vers ownCloud.",
     "Couldn't reset password because the token is invalid" : "Impossible de réinitialiser le mot de passe car le jeton n'est pas valable.",
+    "Couldn't reset password because the token is expired" : "Impossible de réinitialiser le mot de passe car le jeton a expiré.",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossible d'envoyer le courriel de réinitialisation. Veuillez vérifier que votre nom d'utilisateur est correct.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossible d'envoyer le courriel de réinitialisation car il n'y a aucune adresse de courriel pour cet utilisateur. Veuillez contacter votre administrateur.",
     "%s password reset" : "Réinitialisation de votre mot de passe %s",
@@ -214,9 +246,9 @@
     "Please contact your administrator." : "Veuillez contacter votre administrateur.",
     "An internal error occured." : "Une erreur interne est survenue.",
     "Please try again or contact your administrator." : "Veuillez réessayer ou contacter votre administrateur.",
-    "Forgot your password? Reset it!" : "Mot de passe oublié ? Réinitialisez-le !",
+    "Log in" : "Se connecter",
+    "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?",
     "remember" : "se souvenir de moi",
-    "Log in" : "Connexion",
     "Alternative Logins" : "Identifiants alternatifs",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjour,<br><br>Nous vous informons que %s a partagé <strong>%s</strong> avec vous.<br><a href=\"%s\">Cliquez ici pour y accéder !</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Cette instance de ownCloud est actuellement en mode utilisateur unique.",
@@ -227,8 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Veuillez contacter votre administrateur. Si vous êtes administrateur de cette instance, configurez le paramètre « trusted_domain » dans le fichier config/config.php. Un exemple de configuration est fourni dans le fichier config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En fonction de votre configuration, en tant qu'administrateur vous pouvez également utiliser le bouton ci-dessous pour approuver ce domaine.",
     "Add \"%s\" as trusted domain" : "Ajouter \"%s\" à la liste des domaines approuvés",
-    "%s will be updated to version %s." : "%s sera mis à jour vers la version %s.",
-    "The following apps will be disabled:" : "Les applications suivantes seront désactivées :",
+    "App update required" : "Mise à jour de l'application nécessaire",
+    "%s will be updated to version %s" : "%s sera mis à jour vers la version %s.",
+    "These apps will be updated:" : "Les applications suivantes seront mises à jour:",
+    "These incompatible apps will be disabled:" : "Ces applications incompatibles ont été désactivés:",
     "The theme %s has been disabled." : "Le thème %s a été désactivé.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Veuillez vous assurer qu'une copie de sauvegarde de la base de données, du dossier de configuration (config) et du dossier de données (data) a été réalisée avant de commencer.",
     "Start update" : "Démarrer la mise à jour",
diff --git a/core/l10n/fr_CA.js b/core/l10n/fr_CA.js
deleted file mode 100644
index 572404948e..0000000000
--- a/core/l10n/fr_CA.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/fr_CA.json b/core/l10n/fr_CA.json
deleted file mode 100644
index b43ffe08ed..0000000000
--- a/core/l10n/fr_CA.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "_download %n file_::_download %n files_" : ["",""],
-    "_{count} search result in other places_::_{count} search results in other places_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index 5bf08ff861..583931d506 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -29,6 +29,20 @@ OC.L10N.register(
     "Thursday" : "xoves",
     "Friday" : "venres",
     "Saturday" : "sábado",
+    "Sun." : "dom.",
+    "Mon." : "lun.",
+    "Tue." : "mar.",
+    "Wed." : "mér.",
+    "Thu." : "xov.",
+    "Fri." : "ven.",
+    "Sat." : "sáb.",
+    "Su" : "do",
+    "Mo" : "lu",
+    "Tu" : "ma",
+    "We" : "mé",
+    "Th" : "xo",
+    "Fr" : "ve",
+    "Sa" : "sá",
     "January" : "xaneiro",
     "February" : "febreiro",
     "March" : "marzo",
@@ -41,6 +55,18 @@ OC.L10N.register(
     "October" : "outubro",
     "November" : "novembro",
     "December" : "decembro",
+    "Jan." : "xan.",
+    "Feb." : "feb.",
+    "Mar." : "mar.",
+    "Apr." : "abr.",
+    "May." : "mai.",
+    "Jun." : "xuñ.",
+    "Jul." : "xul.",
+    "Aug." : "ago.",
+    "Sep." : "set.",
+    "Oct." : "out.",
+    "Nov." : "nov.",
+    "Dec." : "dec.",
     "Settings" : "Axustes",
     "Saving..." : "Gardando...",
     "Couldn't send reset email. Please contact your administrator." : "Non foi posíbel enviar o correo do restabelecemento. Póñase en contacto co administrador.",
@@ -82,7 +108,6 @@ OC.L10N.register(
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está accedendo a este sitio a través de HTTP. Suxerímoslle que configure o seu servidor para requirir, no seu canto, o uso de HTTPS, tal e como se descrine nos<a href=\"{docUrl}\">consellos de seguridade</a>.",
     "Shared" : "Compartido",
     "Shared with {recipients}" : "Compartido con {recipients}",
-    "Share" : "Compartir",
     "Error" : "Erro",
     "Error while sharing" : "Produciuse un erro ao compartir",
     "Error while unsharing" : "Produciuse un erro ao deixar de compartir",
@@ -91,6 +116,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Compartido con vostede por {owner}",
     "Share with users or groups …" : "Compartir con usuarios ou grupos ...",
     "Share with users, groups or remote users …" : "Compartir con usuarios, grupos ou usuarios remotos ...",
+    "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»",
     "Share link" : "Ligazón para compartir",
     "The public link will expire no later than {days} days after it is created" : "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
@@ -217,9 +243,8 @@ OC.L10N.register(
     "Please contact your administrator." : "Contacte co administrador.",
     "An internal error occured." : "Produciuse un erro interno.",
     "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.",
-    "Forgot your password? Reset it!" : "Esqueceu o contrasinal? Restabelézao!",
+    "Log in" : "Acceder",
     "remember" : "lembrar",
-    "Log in" : "Conectar",
     "Alternative Logins" : "Accesos alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instancia do ownCloud está actualmente en modo de usuario único.",
@@ -230,8 +255,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da súa configuración, como administrador vostede podería utilizar o botón de embaixo para confiar neste dominio.",
     "Add \"%s\" as trusted domain" : "Engadir «%s» como dominio de confianza",
-    "%s will be updated to version %s." : "%s actualizarase á versión %s.",
-    "The following apps will be disabled:" : "Van desactivarse as seguintes aplicacións:",
+    "App update required" : "É necesario actualizar a aplicación",
+    "%s will be updated to version %s" : "%s actualizarase á versión %s",
+    "These apps will be updated:" : "Actualizaranse estas aplicacións:",
+    "These incompatible apps will be disabled:" : "Desactivaranse estas aplicacións incompatíbeis:",
     "The theme %s has been disabled." : "O tema %s foi desactivado.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.",
     "Start update" : "Iniciar a actualización",
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index fc30376190..7d33ed6cc7 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -27,6 +27,20 @@
     "Thursday" : "xoves",
     "Friday" : "venres",
     "Saturday" : "sábado",
+    "Sun." : "dom.",
+    "Mon." : "lun.",
+    "Tue." : "mar.",
+    "Wed." : "mér.",
+    "Thu." : "xov.",
+    "Fri." : "ven.",
+    "Sat." : "sáb.",
+    "Su" : "do",
+    "Mo" : "lu",
+    "Tu" : "ma",
+    "We" : "mé",
+    "Th" : "xo",
+    "Fr" : "ve",
+    "Sa" : "sá",
     "January" : "xaneiro",
     "February" : "febreiro",
     "March" : "marzo",
@@ -39,6 +53,18 @@
     "October" : "outubro",
     "November" : "novembro",
     "December" : "decembro",
+    "Jan." : "xan.",
+    "Feb." : "feb.",
+    "Mar." : "mar.",
+    "Apr." : "abr.",
+    "May." : "mai.",
+    "Jun." : "xuñ.",
+    "Jul." : "xul.",
+    "Aug." : "ago.",
+    "Sep." : "set.",
+    "Oct." : "out.",
+    "Nov." : "nov.",
+    "Dec." : "dec.",
     "Settings" : "Axustes",
     "Saving..." : "Gardando...",
     "Couldn't send reset email. Please contact your administrator." : "Non foi posíbel enviar o correo do restabelecemento. Póñase en contacto co administrador.",
@@ -80,7 +106,6 @@
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Está accedendo a este sitio a través de HTTP. Suxerímoslle que configure o seu servidor para requirir, no seu canto, o uso de HTTPS, tal e como se descrine nos<a href=\"{docUrl}\">consellos de seguridade</a>.",
     "Shared" : "Compartido",
     "Shared with {recipients}" : "Compartido con {recipients}",
-    "Share" : "Compartir",
     "Error" : "Erro",
     "Error while sharing" : "Produciuse un erro ao compartir",
     "Error while unsharing" : "Produciuse un erro ao deixar de compartir",
@@ -89,6 +114,7 @@
     "Shared with you by {owner}" : "Compartido con vostede por {owner}",
     "Share with users or groups …" : "Compartir con usuarios ou grupos ...",
     "Share with users, groups or remote users …" : "Compartir con usuarios, grupos ou usuarios remotos ...",
+    "Share" : "Compartir",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Comparta con outra xente ou con outros ownClouds empregando a sintaxe «nomeusuario@exemplo.com/ouwncloud»",
     "Share link" : "Ligazón para compartir",
     "The public link will expire no later than {days} days after it is created" : "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
@@ -215,9 +241,8 @@
     "Please contact your administrator." : "Contacte co administrador.",
     "An internal error occured." : "Produciuse un erro interno.",
     "Please try again or contact your administrator." : "Ténteo de novo ou póñase en contacto co administrador.",
-    "Forgot your password? Reset it!" : "Esqueceu o contrasinal? Restabelézao!",
+    "Log in" : "Acceder",
     "remember" : "lembrar",
-    "Log in" : "Conectar",
     "Alternative Logins" : "Accesos alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instancia do ownCloud está actualmente en modo de usuario único.",
@@ -228,8 +253,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da súa configuración, como administrador vostede podería utilizar o botón de embaixo para confiar neste dominio.",
     "Add \"%s\" as trusted domain" : "Engadir «%s» como dominio de confianza",
-    "%s will be updated to version %s." : "%s actualizarase á versión %s.",
-    "The following apps will be disabled:" : "Van desactivarse as seguintes aplicacións:",
+    "App update required" : "É necesario actualizar a aplicación",
+    "%s will be updated to version %s" : "%s actualizarase á versión %s",
+    "These apps will be updated:" : "Actualizaranse estas aplicacións:",
+    "These incompatible apps will be disabled:" : "Desactivaranse estas aplicacións incompatíbeis:",
     "The theme %s has been disabled." : "O tema %s foi desactivado.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.",
     "Start update" : "Iniciar a actualización",
diff --git a/core/l10n/he.js b/core/l10n/he.js
index e53e3f37b2..3285a569d3 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -8,6 +8,13 @@ OC.L10N.register(
     "Thursday" : "יום חמישי",
     "Friday" : "יום שישי",
     "Saturday" : "שבת",
+    "Sun." : "ראשון",
+    "Mon." : "שני",
+    "Tue." : "שלישי",
+    "Wed." : "רביעי",
+    "Thu." : "חמישי",
+    "Fri." : "שישי",
+    "Sat." : "שבת",
     "January" : "ינואר",
     "February" : "פברואר",
     "March" : "מרץ",
@@ -20,6 +27,18 @@ OC.L10N.register(
     "October" : "אוקטובר",
     "November" : "נובמבר",
     "December" : "דצמבר",
+    "Jan." : "ינו׳",
+    "Feb." : "פבר׳",
+    "Mar." : "מרץ",
+    "Apr." : "אפר׳",
+    "May." : "מאי",
+    "Jun." : "יונ׳",
+    "Jul." : "יול׳",
+    "Aug." : "אוג׳",
+    "Sep." : "ספט׳",
+    "Oct." : "אוק׳",
+    "Nov." : "נוב׳",
+    "Dec." : "דצמ׳",
     "Settings" : "הגדרות",
     "Saving..." : "שמירה…",
     "No" : "לא",
@@ -29,13 +48,13 @@ OC.L10N.register(
     "New Files" : "קבצים חדשים",
     "Cancel" : "ביטול",
     "Shared" : "שותף",
-    "Share" : "שתף",
     "Error" : "שגיאה",
     "Error while sharing" : "שגיאה במהלך השיתוף",
     "Error while unsharing" : "שגיאה במהלך ביטול השיתוף",
     "Error while changing permissions" : "שגיאה במהלך שינוי ההגדרות",
     "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
     "Shared with you by {owner}" : "שותף אתך על ידי {owner}",
+    "Share" : "שתף",
     "Share link" : "קישור לשיתוף",
     "Password protect" : "הגנה בססמה",
     "Password" : "סיסמא",
@@ -84,8 +103,8 @@ OC.L10N.register(
     "Finish setup" : "סיום התקנה",
     "Log out" : "התנתקות",
     "Search" : "חיפוש",
-    "remember" : "שמירת הססמה",
     "Log in" : "כניסה",
+    "remember" : "שמירת הססמה",
     "Alternative Logins" : "כניסות אלטרנטיביות"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/he.json b/core/l10n/he.json
index 6f6686240e..5db9f156d0 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -6,6 +6,13 @@
     "Thursday" : "יום חמישי",
     "Friday" : "יום שישי",
     "Saturday" : "שבת",
+    "Sun." : "ראשון",
+    "Mon." : "שני",
+    "Tue." : "שלישי",
+    "Wed." : "רביעי",
+    "Thu." : "חמישי",
+    "Fri." : "שישי",
+    "Sat." : "שבת",
     "January" : "ינואר",
     "February" : "פברואר",
     "March" : "מרץ",
@@ -18,6 +25,18 @@
     "October" : "אוקטובר",
     "November" : "נובמבר",
     "December" : "דצמבר",
+    "Jan." : "ינו׳",
+    "Feb." : "פבר׳",
+    "Mar." : "מרץ",
+    "Apr." : "אפר׳",
+    "May." : "מאי",
+    "Jun." : "יונ׳",
+    "Jul." : "יול׳",
+    "Aug." : "אוג׳",
+    "Sep." : "ספט׳",
+    "Oct." : "אוק׳",
+    "Nov." : "נוב׳",
+    "Dec." : "דצמ׳",
     "Settings" : "הגדרות",
     "Saving..." : "שמירה…",
     "No" : "לא",
@@ -27,13 +46,13 @@
     "New Files" : "קבצים חדשים",
     "Cancel" : "ביטול",
     "Shared" : "שותף",
-    "Share" : "שתף",
     "Error" : "שגיאה",
     "Error while sharing" : "שגיאה במהלך השיתוף",
     "Error while unsharing" : "שגיאה במהלך ביטול השיתוף",
     "Error while changing permissions" : "שגיאה במהלך שינוי ההגדרות",
     "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
     "Shared with you by {owner}" : "שותף אתך על ידי {owner}",
+    "Share" : "שתף",
     "Share link" : "קישור לשיתוף",
     "Password protect" : "הגנה בססמה",
     "Password" : "סיסמא",
@@ -82,8 +101,8 @@
     "Finish setup" : "סיום התקנה",
     "Log out" : "התנתקות",
     "Search" : "חיפוש",
-    "remember" : "שמירת הססמה",
     "Log in" : "כניסה",
+    "remember" : "שמירת הססמה",
     "Alternative Logins" : "כניסות אלטרנטיביות"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/hi.js b/core/l10n/hi.js
index 4edc0dbeb3..48b726945a 100644
--- a/core/l10n/hi.js
+++ b/core/l10n/hi.js
@@ -23,8 +23,8 @@ OC.L10N.register(
     "Settings" : "सेटिंग्स",
     "Saving..." : "सहेज रहे हैं...",
     "Cancel" : "रद्द करें ",
-    "Share" : "साझा करें",
     "Error" : "त्रुटि",
+    "Share" : "साझा करें",
     "Password" : "पासवर्ड",
     "Send" : "भेजें",
     "Sending ..." : "भेजा जा रहा है",
diff --git a/core/l10n/hi.json b/core/l10n/hi.json
index cf6b6bb477..68a5ec96d2 100644
--- a/core/l10n/hi.json
+++ b/core/l10n/hi.json
@@ -21,8 +21,8 @@
     "Settings" : "सेटिंग्स",
     "Saving..." : "सहेज रहे हैं...",
     "Cancel" : "रद्द करें ",
-    "Share" : "साझा करें",
     "Error" : "त्रुटि",
+    "Share" : "साझा करें",
     "Password" : "पासवर्ड",
     "Send" : "भेजें",
     "Sending ..." : "भेजा जा रहा है",
diff --git a/core/l10n/hi_IN.js b/core/l10n/hi_IN.js
deleted file mode 100644
index c483b4ab65..0000000000
--- a/core/l10n/hi_IN.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hi_IN.json b/core/l10n/hi_IN.json
deleted file mode 100644
index 52ecaf565a..0000000000
--- a/core/l10n/hi_IN.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
index 487a85ae1d..44d9fab774 100644
--- a/core/l10n/hr.js
+++ b/core/l10n/hr.js
@@ -20,6 +20,13 @@ OC.L10N.register(
     "Thursday" : "Četvrtak",
     "Friday" : "Petak",
     "Saturday" : "Subota",
+    "Sun." : "ned.",
+    "Mon." : "pon.",
+    "Tue." : "ut.",
+    "Wed." : "sri.",
+    "Thu." : "čet.",
+    "Fri." : "pet.",
+    "Sat." : "sub.",
     "January" : "Siječanj",
     "February" : "Veljača",
     "March" : "Ožujak",
@@ -32,6 +39,18 @@ OC.L10N.register(
     "October" : "Listopad",
     "November" : "Studeni",
     "December" : "Prosinac",
+    "Jan." : "sij.",
+    "Feb." : "velj.",
+    "Mar." : "ož.",
+    "Apr." : "trav.",
+    "May." : "svib.",
+    "Jun." : "lip.",
+    "Jul." : "srp.",
+    "Aug." : "kol.",
+    "Sep." : "ruj.",
+    "Oct." : "list.",
+    "Nov." : "stud.",
+    "Dec." : "pros.",
     "Settings" : "Postavke",
     "Saving..." : "Spremanje...",
     "Couldn't send reset email. Please contact your administrator." : "Nije mogće poslati resetiranu poštu. MOlimo kontaktirajte svog administratora.",
@@ -65,13 +84,13 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Greška prilikom provjeri postavki servera",
     "Shared" : "Resurs podijeljen",
     "Shared with {recipients}" : "Resurs podijeljen s {recipients}",
-    "Share" : "Podijelite",
     "Error" : "Pogreška",
     "Error while sharing" : "Pogreška pri dijeljenju",
     "Error while unsharing" : "Pogreška pri prestanku dijeljenja",
     "Error while changing permissions" : "POgreška pri mijenjanju dozvola",
     "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
     "Shared with you by {owner}" : "S vama podijelio {owner}",
+    "Share" : "Podijelite",
     "Share link" : "Podijelite vezu",
     "The public link will expire no later than {days} days after it is created" : " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
     "Link" : "Poveznica",
@@ -180,9 +199,8 @@ OC.L10N.register(
     "Search" : "pretraži",
     "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!",
     "Please contact your administrator." : "Molimo kontaktirajte svog administratora.",
-    "Forgot your password? Reset it!" : "Zaboravili ste svoju lozinku? Resetirajte ju!",
-    "remember" : "Sjetite se",
     "Log in" : "Prijavite se",
+    "remember" : "Sjetite se",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> vam upravo javlja da je %s podijelio <strong>%s</strong>s vama.<br><a href=\"%s\">POgledajte!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u načinu rada za jednog korisnika.",
@@ -193,8 +211,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molimo kontaktirajte svog administratora. Ako ste vi administrator ove instance,konfigurirajte postavku \"trusted_domain\" config/config.php.Primjer konfiguracije ponuđen je u config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristitigumb dolje za pristup toj domeni.",
     "Add \"%s\" as trusted domain" : "Dodajte \"%s\" kao pouzdanu domenu.",
-    "%s will be updated to version %s." : "%s će biti ažuriran u verziju %s",
-    "The following apps will be disabled:" : "Sljedeće aplikacije bit će onemogućene",
     "The theme %s has been disabled." : "Tema %s je onemogućena",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Prije nego li nastavite, molimo osigurajte da su baza podataka, mapa konfiguracije i mapaza podatke sigurnosno kopirani.",
     "Start update" : "Započnite ažuriranje",
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
index 2f9877df2c..7a6ce98346 100644
--- a/core/l10n/hr.json
+++ b/core/l10n/hr.json
@@ -18,6 +18,13 @@
     "Thursday" : "Četvrtak",
     "Friday" : "Petak",
     "Saturday" : "Subota",
+    "Sun." : "ned.",
+    "Mon." : "pon.",
+    "Tue." : "ut.",
+    "Wed." : "sri.",
+    "Thu." : "čet.",
+    "Fri." : "pet.",
+    "Sat." : "sub.",
     "January" : "Siječanj",
     "February" : "Veljača",
     "March" : "Ožujak",
@@ -30,6 +37,18 @@
     "October" : "Listopad",
     "November" : "Studeni",
     "December" : "Prosinac",
+    "Jan." : "sij.",
+    "Feb." : "velj.",
+    "Mar." : "ož.",
+    "Apr." : "trav.",
+    "May." : "svib.",
+    "Jun." : "lip.",
+    "Jul." : "srp.",
+    "Aug." : "kol.",
+    "Sep." : "ruj.",
+    "Oct." : "list.",
+    "Nov." : "stud.",
+    "Dec." : "pros.",
     "Settings" : "Postavke",
     "Saving..." : "Spremanje...",
     "Couldn't send reset email. Please contact your administrator." : "Nije mogće poslati resetiranu poštu. MOlimo kontaktirajte svog administratora.",
@@ -63,13 +82,13 @@
     "Error occurred while checking server setup" : "Greška prilikom provjeri postavki servera",
     "Shared" : "Resurs podijeljen",
     "Shared with {recipients}" : "Resurs podijeljen s {recipients}",
-    "Share" : "Podijelite",
     "Error" : "Pogreška",
     "Error while sharing" : "Pogreška pri dijeljenju",
     "Error while unsharing" : "Pogreška pri prestanku dijeljenja",
     "Error while changing permissions" : "POgreška pri mijenjanju dozvola",
     "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
     "Shared with you by {owner}" : "S vama podijelio {owner}",
+    "Share" : "Podijelite",
     "Share link" : "Podijelite vezu",
     "The public link will expire no later than {days} days after it is created" : " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
     "Link" : "Poveznica",
@@ -178,9 +197,8 @@
     "Search" : "pretraži",
     "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!",
     "Please contact your administrator." : "Molimo kontaktirajte svog administratora.",
-    "Forgot your password? Reset it!" : "Zaboravili ste svoju lozinku? Resetirajte ju!",
-    "remember" : "Sjetite se",
     "Log in" : "Prijavite se",
+    "remember" : "Sjetite se",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej, <br><br> vam upravo javlja da je %s podijelio <strong>%s</strong>s vama.<br><a href=\"%s\">POgledajte!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova ownCloud instanca je trenutno u načinu rada za jednog korisnika.",
@@ -191,8 +209,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molimo kontaktirajte svog administratora. Ako ste vi administrator ove instance,konfigurirajte postavku \"trusted_domain\" config/config.php.Primjer konfiguracije ponuđen je u config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristitigumb dolje za pristup toj domeni.",
     "Add \"%s\" as trusted domain" : "Dodajte \"%s\" kao pouzdanu domenu.",
-    "%s will be updated to version %s." : "%s će biti ažuriran u verziju %s",
-    "The following apps will be disabled:" : "Sljedeće aplikacije bit će onemogućene",
     "The theme %s has been disabled." : "Tema %s je onemogućena",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Prije nego li nastavite, molimo osigurajte da su baza podataka, mapa konfiguracije i mapaza podatke sigurnosno kopirani.",
     "Start update" : "Započnite ažuriranje",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 54a327fe04..7be9e243e8 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
+    "Preparing update" : "Felkészülés a frissítésre",
     "Turned on maintenance mode" : "A karbantartási mód bekapcsolva",
     "Turned off maintenance mode" : "A karbantartási mód kikapcsolva",
     "Maintenance mode is kept active" : "Karbantartási mód aktiválva marad",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "Javítás hiba:",
     "Following incompatible apps have been disabled: %s" : "A következő nem kompatibilis applikációk lettek tiltva: %s",
     "Following apps have been disabled: %s" : "A következő applikációk lettek tiltva: %s",
+    "Already up to date" : "Már a legfrissebb változat",
+    "File is too big" : "A fájl túl nagy",
     "Invalid file provided" : "Érvénytelen fájl van megadva",
     "No image or file provided" : "Nincs kép vagy fájl megadva",
     "Unknown filetype" : "Ismeretlen fájltípus",
@@ -28,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "csütörtök",
     "Friday" : "péntek",
     "Saturday" : "szombat",
+    "Sun." : "V.",
+    "Mon." : "H.",
+    "Tue." : "K.",
+    "Wed." : "Sze.",
+    "Thu." : "Cs.",
+    "Fri." : "P.",
+    "Sat." : "Szo.",
+    "Su" : "Va",
+    "Mo" : "Hé",
+    "Tu" : "Ke",
+    "We" : "Sze",
+    "Th" : "Cs",
+    "Fr" : "Pé",
+    "Sa" : "Szo",
     "January" : "január",
     "February" : "február",
     "March" : "március",
@@ -40,6 +57,18 @@ OC.L10N.register(
     "October" : "október",
     "November" : "november",
     "December" : "december",
+    "Jan." : "jan.",
+    "Feb." : "feb.",
+    "Mar." : "márc.",
+    "Apr." : "ápr.",
+    "May." : "máj.",
+    "Jun." : "jún.",
+    "Jul." : "júl.",
+    "Aug." : "aug.",
+    "Sep." : "szept.",
+    "Oct." : "okt.",
+    "Nov." : "nov.",
+    "Dec." : "dec.",
     "Settings" : "Beállítások",
     "Saving..." : "Mentés...",
     "Couldn't send reset email. Please contact your administrator." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
@@ -75,13 +104,13 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Az adat könyvtára és a fáljai valószínűleg elérhetőek az internetről. A .htaccess fájl nem működik. Erősen ajánlott, hogy úgy állítsa be a webszerverét, hogy az adatkönyvtár ne legyen elérhető az internetről, vagy mogassa ki az adatokat a webszerver gyökérkönyvtárából.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nem lett gyorsítótár memória beállítva. A teljesítmény növeléséhez kérem állítson be gyorsítótárat, ha lehetséges. További információ található az alábbi <a href=\"{docLink}\">dokumentációban</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "a /dev/urandom eszköz nem elérhető PHP-ből, ami nagyon nagy biztonsági problémát jelent. További információ található az alábbi <a href=\"{docLink}\">dokumentációban</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A PHP verziód ({version}) már nem <a href=\"{phpLink}\">támogatott a PHP által</a>. Javasoljuk, hogy frissítsd a PHP verziót, hogy kihasználd a teljesítménybeli és biztonsági javításokat.",
     "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "A \"{header}\" HTTP fejléc nincs beállítva, hogy megegyezzen az elvárttal \"{expected}\". Ez egy potenciális biztonsági kockázat és kérjük, hogy változtassa meg a beállításokat.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "A \"Strict-Transport-Security\" HTTP fejléc nincs beállítva hogy \"{seconds}\" másodpercig tartson. Biztonsági okokból ajánljuk, hogy engedélyezze a HSTS, ahogyan ezt részletezzük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Jelenleg HTTP-vel éri el a weboldalt. Nagyon ajánlott a HTTPS konfiguráció használata ehelyett, ahogyan ezt részleteztük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban",
     "Shared" : "Megosztott",
     "Shared with {recipients}" : "Megosztva ővelük: {recipients}",
-    "Share" : "Megosztás",
     "Error" : "Hiba",
     "Error while sharing" : "Nem sikerült létrehozni a megosztást",
     "Error while unsharing" : "Nem sikerült visszavonni a megosztást",
@@ -90,6 +119,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Megosztotta Önnel: {owner}",
     "Share with users or groups …" : "Megosztás felhasználókkal vagy csoportokkal ...",
     "Share with users, groups or remote users …" : "Megosztás felhasználókkal, csoportokkal vagy távoli felhasználókkal ...",
+    "Share" : "Megosztás",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Megosztás más ownCloud szerverekkel, a következő formátum használatával felhasznalo@példa.com/owncloud",
     "Share link" : "Megosztás hivatkozással",
     "The public link will expire no later than {days} days after it is created" : "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
@@ -143,6 +173,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "A frissítés sikerült. Figyelmeztetések találhatók.",
     "The update was successful. Redirecting you to ownCloud now." : "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
     "Couldn't reset password because the token is invalid" : "Nem lehet a jelszót törölni, mert a token érvénytelen.",
+    "Couldn't reset password because the token is expired" : "Nem lehet a jelszót törölni, mert a token lejárt.",
     "Couldn't send reset email. Please make sure your username is correct." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "%s password reset" : "%s jelszó visszaállítás",
@@ -216,9 +247,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "An internal error occured." : "Belső hiba történt.",
     "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.",
-    "Forgot your password? Reset it!" : "Elfelejtette a jelszavát? Állítsa vissza!",
-    "remember" : "emlékezzen",
     "Log in" : "Bejelentkezés",
+    "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?",
+    "remember" : "emlékezzen",
     "Alternative Logins" : "Alternatív bejelentkezés",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Üdvözöljük!<br><br>\n\nÉrtesítjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.",
@@ -229,8 +260,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kérjük keresse fel a rendszergazdát! Ha ennek a telepítésnek Ön a rendszergazdája, akkor állítsa be a config/config.php állományban a \"trusted_domain\" paramétert! A config/config.sample.php állományban talál példát a beállításra.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "A beállításoktól függően, rendszergazdaként lehetséges, hogy az alábbi gombot is használhatja a tartomány megbízhatóvá tételéhez.",
     "Add \"%s\" as trusted domain" : "Adjuk hozzá \"%s\"-t a megbízható tartományokhoz!",
-    "%s will be updated to version %s." : "%s frissítődni fog erre a verzióra: %s.",
-    "The following apps will be disabled:" : "A következő alkalmazások lesznek letiltva:",
+    "App update required" : "Alkalmazás frissítés szükséges",
+    "%s will be updated to version %s" : "%s frissítve lesz erre a verzióra: %s",
+    "These apps will be updated:" : "Ezek az alkalmazások lesznek frissítve:",
+    "These incompatible apps will be disabled:" : "Ezek az inkompatibilis alkalmazásik tiltva lesznek:",
     "The theme %s has been disabled." : "Ez a smink: %s letiltásra került.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Kérjük gondoskodjon róla, hogy elmentse az adatbázist, a konfigurációs mappa és az adatamappa tartalmát, mielőtt folytatja.",
     "Start update" : "A frissítés megkezdése",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 15e476cf28..63447a4038 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
+    "Preparing update" : "Felkészülés a frissítésre",
     "Turned on maintenance mode" : "A karbantartási mód bekapcsolva",
     "Turned off maintenance mode" : "A karbantartási mód kikapcsolva",
     "Maintenance mode is kept active" : "Karbantartási mód aktiválva marad",
@@ -11,6 +12,8 @@
     "Repair error: " : "Javítás hiba:",
     "Following incompatible apps have been disabled: %s" : "A következő nem kompatibilis applikációk lettek tiltva: %s",
     "Following apps have been disabled: %s" : "A következő applikációk lettek tiltva: %s",
+    "Already up to date" : "Már a legfrissebb változat",
+    "File is too big" : "A fájl túl nagy",
     "Invalid file provided" : "Érvénytelen fájl van megadva",
     "No image or file provided" : "Nincs kép vagy fájl megadva",
     "Unknown filetype" : "Ismeretlen fájltípus",
@@ -26,6 +29,20 @@
     "Thursday" : "csütörtök",
     "Friday" : "péntek",
     "Saturday" : "szombat",
+    "Sun." : "V.",
+    "Mon." : "H.",
+    "Tue." : "K.",
+    "Wed." : "Sze.",
+    "Thu." : "Cs.",
+    "Fri." : "P.",
+    "Sat." : "Szo.",
+    "Su" : "Va",
+    "Mo" : "Hé",
+    "Tu" : "Ke",
+    "We" : "Sze",
+    "Th" : "Cs",
+    "Fr" : "Pé",
+    "Sa" : "Szo",
     "January" : "január",
     "February" : "február",
     "March" : "március",
@@ -38,6 +55,18 @@
     "October" : "október",
     "November" : "november",
     "December" : "december",
+    "Jan." : "jan.",
+    "Feb." : "feb.",
+    "Mar." : "márc.",
+    "Apr." : "ápr.",
+    "May." : "máj.",
+    "Jun." : "jún.",
+    "Jul." : "júl.",
+    "Aug." : "aug.",
+    "Sep." : "szept.",
+    "Oct." : "okt.",
+    "Nov." : "nov.",
+    "Dec." : "dec.",
     "Settings" : "Beállítások",
     "Saving..." : "Mentés...",
     "Couldn't send reset email. Please contact your administrator." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
@@ -73,13 +102,13 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Az adat könyvtára és a fáljai valószínűleg elérhetőek az internetről. A .htaccess fájl nem működik. Erősen ajánlott, hogy úgy állítsa be a webszerverét, hogy az adatkönyvtár ne legyen elérhető az internetről, vagy mogassa ki az adatokat a webszerver gyökérkönyvtárából.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nem lett gyorsítótár memória beállítva. A teljesítmény növeléséhez kérem állítson be gyorsítótárat, ha lehetséges. További információ található az alábbi <a href=\"{docLink}\">dokumentációban</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "a /dev/urandom eszköz nem elérhető PHP-ből, ami nagyon nagy biztonsági problémát jelent. További információ található az alábbi <a href=\"{docLink}\">dokumentációban</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A PHP verziód ({version}) már nem <a href=\"{phpLink}\">támogatott a PHP által</a>. Javasoljuk, hogy frissítsd a PHP verziót, hogy kihasználd a teljesítménybeli és biztonsági javításokat.",
     "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "A \"{header}\" HTTP fejléc nincs beállítva, hogy megegyezzen az elvárttal \"{expected}\". Ez egy potenciális biztonsági kockázat és kérjük, hogy változtassa meg a beállításokat.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "A \"Strict-Transport-Security\" HTTP fejléc nincs beállítva hogy \"{seconds}\" másodpercig tartson. Biztonsági okokból ajánljuk, hogy engedélyezze a HSTS, ahogyan ezt részletezzük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Jelenleg HTTP-vel éri el a weboldalt. Nagyon ajánlott a HTTPS konfiguráció használata ehelyett, ahogyan ezt részleteztük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban",
     "Shared" : "Megosztott",
     "Shared with {recipients}" : "Megosztva ővelük: {recipients}",
-    "Share" : "Megosztás",
     "Error" : "Hiba",
     "Error while sharing" : "Nem sikerült létrehozni a megosztást",
     "Error while unsharing" : "Nem sikerült visszavonni a megosztást",
@@ -88,6 +117,7 @@
     "Shared with you by {owner}" : "Megosztotta Önnel: {owner}",
     "Share with users or groups …" : "Megosztás felhasználókkal vagy csoportokkal ...",
     "Share with users, groups or remote users …" : "Megosztás felhasználókkal, csoportokkal vagy távoli felhasználókkal ...",
+    "Share" : "Megosztás",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Megosztás más ownCloud szerverekkel, a következő formátum használatával felhasznalo@példa.com/owncloud",
     "Share link" : "Megosztás hivatkozással",
     "The public link will expire no later than {days} days after it is created" : "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
@@ -141,6 +171,7 @@
     "The update was successful. There were warnings." : "A frissítés sikerült. Figyelmeztetések találhatók.",
     "The update was successful. Redirecting you to ownCloud now." : "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
     "Couldn't reset password because the token is invalid" : "Nem lehet a jelszót törölni, mert a token érvénytelen.",
+    "Couldn't reset password because the token is expired" : "Nem lehet a jelszót törölni, mert a token lejárt.",
     "Couldn't send reset email. Please make sure your username is correct." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "%s password reset" : "%s jelszó visszaállítás",
@@ -214,9 +245,9 @@
     "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "An internal error occured." : "Belső hiba történt.",
     "Please try again or contact your administrator." : "Kérem próbálja újra, vagy vegye fel a kapcsolatot a rendszergazdával.",
-    "Forgot your password? Reset it!" : "Elfelejtette a jelszavát? Állítsa vissza!",
-    "remember" : "emlékezzen",
     "Log in" : "Bejelentkezés",
+    "Wrong password. Reset it?" : "Hibás jelszó. Visszaállítja?",
+    "remember" : "emlékezzen",
     "Alternative Logins" : "Alternatív bejelentkezés",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Üdvözöljük!<br><br>\n\nÉrtesítjük, hogy %s megosztotta Önnel ezt az állományt: <strong>%s</strong><br>\n<a href=\"%s\">Itt lehet megnézni!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ez az ownCloud szolgáltatás jelenleg egyfelhasználós üzemmódban működik.",
@@ -227,8 +258,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kérjük keresse fel a rendszergazdát! Ha ennek a telepítésnek Ön a rendszergazdája, akkor állítsa be a config/config.php állományban a \"trusted_domain\" paramétert! A config/config.sample.php állományban talál példát a beállításra.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "A beállításoktól függően, rendszergazdaként lehetséges, hogy az alábbi gombot is használhatja a tartomány megbízhatóvá tételéhez.",
     "Add \"%s\" as trusted domain" : "Adjuk hozzá \"%s\"-t a megbízható tartományokhoz!",
-    "%s will be updated to version %s." : "%s frissítődni fog erre a verzióra: %s.",
-    "The following apps will be disabled:" : "A következő alkalmazások lesznek letiltva:",
+    "App update required" : "Alkalmazás frissítés szükséges",
+    "%s will be updated to version %s" : "%s frissítve lesz erre a verzióra: %s",
+    "These apps will be updated:" : "Ezek az alkalmazások lesznek frissítve:",
+    "These incompatible apps will be disabled:" : "Ezek az inkompatibilis alkalmazásik tiltva lesznek:",
     "The theme %s has been disabled." : "Ez a smink: %s letiltásra került.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Kérjük gondoskodjon róla, hogy elmentse az adatbázist, a konfigurációs mappa és az adatamappa tartalmát, mielőtt folytatja.",
     "Start update" : "A frissítés megkezdése",
diff --git a/core/l10n/hy.js b/core/l10n/hy.js
index 26250b0c55..e0a9e3060f 100644
--- a/core/l10n/hy.js
+++ b/core/l10n/hy.js
@@ -8,6 +8,13 @@ OC.L10N.register(
     "Thursday" : "Հինգշաբթի",
     "Friday" : "Ուրբաթ",
     "Saturday" : "Շաբաթ",
+    "Sun." : "Կիր.",
+    "Mon." : "Երկ.",
+    "Tue." : "Երք.",
+    "Wed." : "Չոր.",
+    "Thu." : "Հնգ.",
+    "Fri." : "Ուրբ.",
+    "Sat." : "Շաբ.",
     "January" : "Հունվար",
     "February" : "Փետրվար",
     "March" : "Մարտ",
diff --git a/core/l10n/hy.json b/core/l10n/hy.json
index 76a0da8ccd..89a76b1626 100644
--- a/core/l10n/hy.json
+++ b/core/l10n/hy.json
@@ -6,6 +6,13 @@
     "Thursday" : "Հինգշաբթի",
     "Friday" : "Ուրբաթ",
     "Saturday" : "Շաբաթ",
+    "Sun." : "Կիր.",
+    "Mon." : "Երկ.",
+    "Tue." : "Երք.",
+    "Wed." : "Չոր.",
+    "Thu." : "Հնգ.",
+    "Fri." : "Ուրբ.",
+    "Sat." : "Շաբ.",
     "January" : "Հունվար",
     "February" : "Փետրվար",
     "March" : "Մարտ",
diff --git a/core/l10n/ia.js b/core/l10n/ia.js
index fdadf0c984..15842447aa 100644
--- a/core/l10n/ia.js
+++ b/core/l10n/ia.js
@@ -19,6 +19,13 @@ OC.L10N.register(
     "Thursday" : "Jovedi",
     "Friday" : "Venerdi",
     "Saturday" : "Sabbato",
+    "Sun." : "Dom.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mer.",
+    "Thu." : "Jov.",
+    "Fri." : "Ven.",
+    "Sat." : "Sab.",
     "January" : "januario",
     "February" : "Februario",
     "March" : "Martio",
@@ -31,6 +38,18 @@ OC.L10N.register(
     "October" : "Octobre",
     "November" : "Novembre",
     "December" : "Decembre",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Configurationes",
     "Saving..." : "Salveguardante...",
     "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
@@ -56,13 +75,13 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Un error occurreva quando on verificava le configuration de le servitor.",
     "Shared" : "Compartite",
     "Shared with {recipients}" : "Compatite con {recipients}",
-    "Share" : "Compartir",
     "Error" : "Error",
     "Error while sharing" : "Error quando on compartiva",
     "Error while unsharing" : "Error quando on levava le compartir",
     "Error while changing permissions" : "Error quando on modificava permissiones",
     "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
     "Shared with you by {owner}" : "Compartite con te per {owner} ",
+    "Share" : "Compartir",
     "Share link" : "Compartir ligamine",
     "Password protect" : "Protegite per contrasigno",
     "Password" : "Contrasigno",
@@ -137,9 +156,7 @@ OC.L10N.register(
     "Search" : "Cercar",
     "Server side authentication failed!" : "Il falleva authentication de latere servitor!",
     "Please contact your administrator." : "Pro favor continge tu administrator.",
-    "Forgot your password? Reset it!" : "Tu oblidava tu contrasigno? Re-configura lo!",
     "remember" : "memora",
-    "Log in" : "Aperir session",
     "Alternative Logins" : "Accessos de autorisation alternative",
     "Thank you for your patience." : "Gratias pro tu patientia.",
     "Start update" : "Initia actualisation"
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
index f00f484482..649e667bdc 100644
--- a/core/l10n/ia.json
+++ b/core/l10n/ia.json
@@ -17,6 +17,13 @@
     "Thursday" : "Jovedi",
     "Friday" : "Venerdi",
     "Saturday" : "Sabbato",
+    "Sun." : "Dom.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mer.",
+    "Thu." : "Jov.",
+    "Fri." : "Ven.",
+    "Sat." : "Sab.",
     "January" : "januario",
     "February" : "Februario",
     "March" : "Martio",
@@ -29,6 +36,18 @@
     "October" : "Octobre",
     "November" : "Novembre",
     "December" : "Decembre",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Configurationes",
     "Saving..." : "Salveguardante...",
     "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
@@ -54,13 +73,13 @@
     "Error occurred while checking server setup" : "Un error occurreva quando on verificava le configuration de le servitor.",
     "Shared" : "Compartite",
     "Shared with {recipients}" : "Compatite con {recipients}",
-    "Share" : "Compartir",
     "Error" : "Error",
     "Error while sharing" : "Error quando on compartiva",
     "Error while unsharing" : "Error quando on levava le compartir",
     "Error while changing permissions" : "Error quando on modificava permissiones",
     "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
     "Shared with you by {owner}" : "Compartite con te per {owner} ",
+    "Share" : "Compartir",
     "Share link" : "Compartir ligamine",
     "Password protect" : "Protegite per contrasigno",
     "Password" : "Contrasigno",
@@ -135,9 +154,7 @@
     "Search" : "Cercar",
     "Server side authentication failed!" : "Il falleva authentication de latere servitor!",
     "Please contact your administrator." : "Pro favor continge tu administrator.",
-    "Forgot your password? Reset it!" : "Tu oblidava tu contrasigno? Re-configura lo!",
     "remember" : "memora",
-    "Log in" : "Aperir session",
     "Alternative Logins" : "Accessos de autorisation alternative",
     "Thank you for your patience." : "Gratias pro tu patientia.",
     "Start update" : "Initia actualisation"
diff --git a/core/l10n/id.js b/core/l10n/id.js
index b9ea68320a..0540b9ae0b 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Tidak dapat mengirim Email ke pengguna berikut: %s",
+    "Preparing update" : "Mempersiapkan pembaruan",
     "Turned on maintenance mode" : "Hidupkan mode perawatan",
     "Turned off maintenance mode" : "Matikan mode perawatan",
     "Maintenance mode is kept active" : "Mode Pemeliharaan masih aktif",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "Kesalahan perbaikan:",
     "Following incompatible apps have been disabled: %s" : "Aplikasi tidak kompatibel berikut telah dinonaktifkan: %s",
     "Following apps have been disabled: %s" : "Aplikasi berikut telah dinonaktifkan: %s",
+    "Already up to date" : "Sudah yang terbaru",
+    "File is too big" : "Berkas terlalu besar",
     "Invalid file provided" : "Berkas yang diberikan tidak sah",
     "No image or file provided" : "Tidak ada gambar atau berkas yang disediakan",
     "Unknown filetype" : "Tipe berkas tidak dikenal",
@@ -28,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Kamis",
     "Friday" : "Jumat",
     "Saturday" : "Sabtu",
+    "Sun." : "Min.",
+    "Mon." : "Sen.",
+    "Tue." : "Sel.",
+    "Wed." : "Rab.",
+    "Thu." : "Kam.",
+    "Fri." : "Jum.",
+    "Sat." : "Sab.",
+    "Su" : "Min",
+    "Mo" : "Sen",
+    "Tu" : "Sel",
+    "We" : "Rab",
+    "Th" : "Kam",
+    "Fr" : "Jum",
+    "Sa" : "Sab",
     "January" : "Januari",
     "February" : "Februari",
     "March" : "Maret",
@@ -40,6 +57,18 @@ OC.L10N.register(
     "October" : "Oktober",
     "November" : "November",
     "December" : "Desember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mei",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Agu.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Des.",
     "Settings" : "Pengaturan",
     "Saving..." : "Menyimpan...",
     "Couldn't send reset email. Please contact your administrator." : "Tidak dapat mengirim email setel ulang. Silakan hubungi administrator Anda.",
@@ -75,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Direktori data dan berkas Anda kemungkinan dapat diakses dari Internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan Anda untuk mengkonfigurasi server web agar direktori data tidak lagi dapat diakses atau pindahkan direktori data Anda di luar root dokumen server web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Tembolok memori tidak dikonfigurasi. Untuk meningkatkan kinerja, mohon konfigurasi memcache jika tersedia. Informasi lebih lanjut dapat ditemukan di <a href=\"{docLink}\">dokumentasi</a> kami.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom tidak terbaca oleh PHP sangat disarankan untuk alasan keamanan. Informasi lebih lanjut dapat ditemukan di <a href=\"{docLink}\">dokumentasi</a> kami.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Versi PHP Anda ({version}) tidak lagi <a href=\"{phpLink}\">didukung oleh PHP</a>. Kami menyarankan Anda untuk meningkatkan versi PHP Anda agar mendapatkan keuntungan pembaruan kinerja dan keamanan yang disediakan oleh PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Konfigurasi header reverse proxy tidak benar atau Anda mengakses ownCloud dari proxy yang tidak terpercaya. Jika Anda tidak mengakses ownCloud dari proxy yang terpercaya, ini merupakan masalah keamanan dan memungkinkan peretas dapat memalsukan alamat IP mereka yang terlihat pada ownCloud. Informasi lebih lanjut dapat ditemukan pada <a href=\"{docLink}\">dokumentasi</a> kami.",
     "Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Header HTTP \"{header}\" tidak dikonfigurasi sama dengan \"{expected}\". Hal ini berpotensi pada resiko keamanan dan privasi. Kami sarankan untuk menyesuaikan pengaturan ini.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" tidak diatur kurang dari \"{seconds}\" detik. Untuk peningkatan keamanan, kami menyarankan untuk mengaktifkan HSTS seperti yang dijelaskan di <a href=\"{docUrl}\">tips keamanan</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Anda mengakses situs ini via HTTP. Kami sangat menyarankan Anda untuk mengatur server Anda menggunakan HTTPS yang dibahas di <a href=\"{docUrl}\">tips keamanan</a> kami.",
     "Shared" : "Dibagikan",
     "Shared with {recipients}" : "Dibagikan dengan {recipients}",
-    "Share" : "Bagikan",
     "Error" : "Kesalahan",
     "Error while sharing" : "Kesalahan saat membagikan",
     "Error while unsharing" : "Kesalahan saat membatalkan pembagian",
@@ -90,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
     "Share with users or groups …" : "Bagikan dengan pengguna atau grup ...",
     "Share with users, groups or remote users …" : "Bagikan dengan pengguna, grup atau pengguna remote ...",
+    "Share" : "Bagikan",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud",
     "Share link" : "Bagikan tautan",
     "The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
@@ -143,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Pembaruan telah berhasil. Terdapat peringatan.",
     "The update was successful. Redirecting you to ownCloud now." : "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
     "Couldn't reset password because the token is invalid" : "Tidak dapat menyetel ulang sandi karena token tidak sah",
+    "Couldn't reset password because the token is expired" : "Tidak dapat menyetel ulang sandi karena token telah kadaluarsa",
     "Couldn't send reset email. Please make sure your username is correct." : "Tidak dapat menyetel ulang email. Mohon pastikan nama pengguna Anda benar.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Tidak dapat menyetel ulang email karena tidak ada alamat email untuk nama pengguna ini. Silakan hubungi Administrator Anda.",
     "%s password reset" : "%s sandi disetel ulang",
@@ -216,9 +248,8 @@ OC.L10N.register(
     "Please contact your administrator." : "Silahkan hubungi administrator anda.",
     "An internal error occured." : "Terjadi kesalahan internal.",
     "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.",
-    "Forgot your password? Reset it!" : "Lupa sandi Anda? Setel ulang!",
+    "Wrong password. Reset it?" : "Sandi salah. Atur ulang?",
     "remember" : "selalu masuk",
-    "Log in" : "Masuk",
     "Alternative Logins" : "Cara Alternatif untuk Masuk",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hai,<br><br>hanya memberi tahu jika %s membagikan <strong>%s</strong> dengan Anda.<br><a href=\"%s\">Lihat!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ownCloud ini sedang dalam mode pengguna tunggal.",
@@ -229,8 +260,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mohon hubungi administrator Anda. Jika Anda seorang administrator dari instansi ini, konfigurasikan pengaturan \"trusted_domain\" didalam config/config.php. Contoh konfigurasi talah disediakan didalam config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Tergantung pada konfigurasi Anda, sebagai seorang administrator Anda kemungkinan dapat menggunakan tombol bawah untuk mempercayai domain ini.",
     "Add \"%s\" as trusted domain" : "tambahkan \"%s\" sebagai domain terpercaya",
-    "%s will be updated to version %s." : "%s akan diperbarui ke versi %s.",
-    "The following apps will be disabled:" : "Aplikasi berikut akan dinonaktifkan:",
+    "App update required" : "Diperlukan perbarui aplikasi",
+    "%s will be updated to version %s" : "%s akan diperbaarui ke versi %s",
+    "These apps will be updated:" : "Aplikasi berikut akan diperbarui:",
+    "These incompatible apps will be disabled:" : "Aplikasi yang tidak kompatibel berikut akan dinonaktifkan:",
     "The theme %s has been disabled." : "Tema %s telah dinonaktfkan.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
     "Start update" : "Jalankan pembaruan",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index 0fa7b8134a..d03ae4ae4e 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Tidak dapat mengirim Email ke pengguna berikut: %s",
+    "Preparing update" : "Mempersiapkan pembaruan",
     "Turned on maintenance mode" : "Hidupkan mode perawatan",
     "Turned off maintenance mode" : "Matikan mode perawatan",
     "Maintenance mode is kept active" : "Mode Pemeliharaan masih aktif",
@@ -11,6 +12,8 @@
     "Repair error: " : "Kesalahan perbaikan:",
     "Following incompatible apps have been disabled: %s" : "Aplikasi tidak kompatibel berikut telah dinonaktifkan: %s",
     "Following apps have been disabled: %s" : "Aplikasi berikut telah dinonaktifkan: %s",
+    "Already up to date" : "Sudah yang terbaru",
+    "File is too big" : "Berkas terlalu besar",
     "Invalid file provided" : "Berkas yang diberikan tidak sah",
     "No image or file provided" : "Tidak ada gambar atau berkas yang disediakan",
     "Unknown filetype" : "Tipe berkas tidak dikenal",
@@ -26,6 +29,20 @@
     "Thursday" : "Kamis",
     "Friday" : "Jumat",
     "Saturday" : "Sabtu",
+    "Sun." : "Min.",
+    "Mon." : "Sen.",
+    "Tue." : "Sel.",
+    "Wed." : "Rab.",
+    "Thu." : "Kam.",
+    "Fri." : "Jum.",
+    "Sat." : "Sab.",
+    "Su" : "Min",
+    "Mo" : "Sen",
+    "Tu" : "Sel",
+    "We" : "Rab",
+    "Th" : "Kam",
+    "Fr" : "Jum",
+    "Sa" : "Sab",
     "January" : "Januari",
     "February" : "Februari",
     "March" : "Maret",
@@ -38,6 +55,18 @@
     "October" : "Oktober",
     "November" : "November",
     "December" : "Desember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mei",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Agu.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Des.",
     "Settings" : "Pengaturan",
     "Saving..." : "Menyimpan...",
     "Couldn't send reset email. Please contact your administrator." : "Tidak dapat mengirim email setel ulang. Silakan hubungi administrator Anda.",
@@ -73,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Direktori data dan berkas Anda kemungkinan dapat diakses dari Internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan Anda untuk mengkonfigurasi server web agar direktori data tidak lagi dapat diakses atau pindahkan direktori data Anda di luar root dokumen server web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Tembolok memori tidak dikonfigurasi. Untuk meningkatkan kinerja, mohon konfigurasi memcache jika tersedia. Informasi lebih lanjut dapat ditemukan di <a href=\"{docLink}\">dokumentasi</a> kami.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom tidak terbaca oleh PHP sangat disarankan untuk alasan keamanan. Informasi lebih lanjut dapat ditemukan di <a href=\"{docLink}\">dokumentasi</a> kami.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Versi PHP Anda ({version}) tidak lagi <a href=\"{phpLink}\">didukung oleh PHP</a>. Kami menyarankan Anda untuk meningkatkan versi PHP Anda agar mendapatkan keuntungan pembaruan kinerja dan keamanan yang disediakan oleh PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Konfigurasi header reverse proxy tidak benar atau Anda mengakses ownCloud dari proxy yang tidak terpercaya. Jika Anda tidak mengakses ownCloud dari proxy yang terpercaya, ini merupakan masalah keamanan dan memungkinkan peretas dapat memalsukan alamat IP mereka yang terlihat pada ownCloud. Informasi lebih lanjut dapat ditemukan pada <a href=\"{docLink}\">dokumentasi</a> kami.",
     "Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Header HTTP \"{header}\" tidak dikonfigurasi sama dengan \"{expected}\". Hal ini berpotensi pada resiko keamanan dan privasi. Kami sarankan untuk menyesuaikan pengaturan ini.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" tidak diatur kurang dari \"{seconds}\" detik. Untuk peningkatan keamanan, kami menyarankan untuk mengaktifkan HSTS seperti yang dijelaskan di <a href=\"{docUrl}\">tips keamanan</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Anda mengakses situs ini via HTTP. Kami sangat menyarankan Anda untuk mengatur server Anda menggunakan HTTPS yang dibahas di <a href=\"{docUrl}\">tips keamanan</a> kami.",
     "Shared" : "Dibagikan",
     "Shared with {recipients}" : "Dibagikan dengan {recipients}",
-    "Share" : "Bagikan",
     "Error" : "Kesalahan",
     "Error while sharing" : "Kesalahan saat membagikan",
     "Error while unsharing" : "Kesalahan saat membatalkan pembagian",
@@ -88,6 +118,7 @@
     "Shared with you by {owner}" : "Dibagikan dengan anda oleh {owner}",
     "Share with users or groups …" : "Bagikan dengan pengguna atau grup ...",
     "Share with users, groups or remote users …" : "Bagikan dengan pengguna, grup atau pengguna remote ...",
+    "Share" : "Bagikan",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Bagikan dengan orang lain di ownCloud menggunakan sintaks username@example.com/owncloud",
     "Share link" : "Bagikan tautan",
     "The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
@@ -141,6 +172,7 @@
     "The update was successful. There were warnings." : "Pembaruan telah berhasil. Terdapat peringatan.",
     "The update was successful. Redirecting you to ownCloud now." : "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
     "Couldn't reset password because the token is invalid" : "Tidak dapat menyetel ulang sandi karena token tidak sah",
+    "Couldn't reset password because the token is expired" : "Tidak dapat menyetel ulang sandi karena token telah kadaluarsa",
     "Couldn't send reset email. Please make sure your username is correct." : "Tidak dapat menyetel ulang email. Mohon pastikan nama pengguna Anda benar.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Tidak dapat menyetel ulang email karena tidak ada alamat email untuk nama pengguna ini. Silakan hubungi Administrator Anda.",
     "%s password reset" : "%s sandi disetel ulang",
@@ -214,9 +246,8 @@
     "Please contact your administrator." : "Silahkan hubungi administrator anda.",
     "An internal error occured." : "Terjadi kesalahan internal.",
     "Please try again or contact your administrator." : "Mohon coba lagi atau hubungi administrator Anda.",
-    "Forgot your password? Reset it!" : "Lupa sandi Anda? Setel ulang!",
+    "Wrong password. Reset it?" : "Sandi salah. Atur ulang?",
     "remember" : "selalu masuk",
-    "Log in" : "Masuk",
     "Alternative Logins" : "Cara Alternatif untuk Masuk",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hai,<br><br>hanya memberi tahu jika %s membagikan <strong>%s</strong> dengan Anda.<br><a href=\"%s\">Lihat!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ownCloud ini sedang dalam mode pengguna tunggal.",
@@ -227,8 +258,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mohon hubungi administrator Anda. Jika Anda seorang administrator dari instansi ini, konfigurasikan pengaturan \"trusted_domain\" didalam config/config.php. Contoh konfigurasi talah disediakan didalam config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Tergantung pada konfigurasi Anda, sebagai seorang administrator Anda kemungkinan dapat menggunakan tombol bawah untuk mempercayai domain ini.",
     "Add \"%s\" as trusted domain" : "tambahkan \"%s\" sebagai domain terpercaya",
-    "%s will be updated to version %s." : "%s akan diperbarui ke versi %s.",
-    "The following apps will be disabled:" : "Aplikasi berikut akan dinonaktifkan:",
+    "App update required" : "Diperlukan perbarui aplikasi",
+    "%s will be updated to version %s" : "%s akan diperbaarui ke versi %s",
+    "These apps will be updated:" : "Aplikasi berikut akan diperbarui:",
+    "These incompatible apps will be disabled:" : "Aplikasi yang tidak kompatibel berikut akan dinonaktifkan:",
     "The theme %s has been disabled." : "Tema %s telah dinonaktfkan.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
     "Start update" : "Jalankan pembaruan",
diff --git a/core/l10n/ignorelist b/core/l10n/ignorelist
deleted file mode 100644
index a2b225cbe4..0000000000
--- a/core/l10n/ignorelist
+++ /dev/null
@@ -1 +0,0 @@
-js/jquery-ui-1.8.16.custom.min.js
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 6b99bff9c0..64cc78ea04 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -1,6 +1,29 @@
 OC.L10N.register(
     "core",
     {
+    "Couldn't send mail to following users: %s " : "Gat ekki sent póst á eftirfarandi notanda: %s",
+    "Preparing update" : "Undirbúa uppfærslu",
+    "Turned on maintenance mode" : "Kveikt á viðhaldsham",
+    "Turned off maintenance mode" : "Slökkt á viðhaldsham",
+    "Maintenance mode is kept active" : "viðhaldshami er haldið virkur",
+    "Updated database" : "Uppfært gagnagrunn",
+    "Checked database schema update" : "Athugað gagnagrunns skema uppfærslu.",
+    "Checked database schema update for apps" : "Athugað gagnagrunns skema uppfærslur fyrir öpp",
+    "Updated \"%s\" to %s" : "Uppfært \\\"%s\\\" to %s",
+    "Repair warning: " : "Viðgerðar viðvörun:",
+    "Repair error: " : "Viðgerðar villa:",
+    "Following incompatible apps have been disabled: %s" : "Eftirfarandi forrit eru ósamhæfð hafa verið gerð óvirk: %s",
+    "Following apps have been disabled: %s" : "Eftirfarandi forrit hafa verið gerð óvirk: %s",
+    "Already up to date" : "Allt uppfært nú þegar",
+    "File is too big" : "Skrá er of stór",
+    "Invalid file provided" : "Ógild skrá veitt",
+    "No image or file provided" : "Engin mynd eða skrá veitt",
+    "Unknown filetype" : "Óþekkt skráartegund",
+    "Invalid image" : "Ógild mynd",
+    "No temporary profile picture available, try again" : "Engin tímabundin prófíl mynd í boði, reyndu aftur",
+    "No crop data provided" : "Enginn klippi gögn veit",
+    "No valid crop data provided" : "Ógild klippi gögn veit",
+    "Crop is not square" : "Skurður er ekki ferhyrntur",
     "Sunday" : "Sunnudagur",
     "Monday" : "Mánudagur",
     "Tuesday" : "Þriðjudagur",
@@ -8,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Fimmtudagur",
     "Friday" : "Föstudagur",
     "Saturday" : "Laugardagur",
+    "Sun." : "Sun.",
+    "Mon." : "Mán.",
+    "Tue." : "Þri.",
+    "Wed." : "Mið.",
+    "Thu." : "Fim.",
+    "Fri." : "Fös.",
+    "Sat." : "Lau.",
+    "Su" : "Su",
+    "Mo" : "Má",
+    "Tu" : "Þr",
+    "We" : "Mi",
+    "Th" : "Fi",
+    "Fr" : "Fö",
+    "Sa" : "La",
     "January" : "Janúar",
     "February" : "Febrúar",
     "March" : "Mars",
@@ -20,33 +57,96 @@ OC.L10N.register(
     "October" : "Október",
     "November" : "Nóvember",
     "December" : "Desember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Maí.",
+    "Jun." : "Jún.",
+    "Jul." : "Júl.",
+    "Aug." : "Ágú.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nóv.",
+    "Dec." : "Des.",
     "Settings" : "Stillingar",
     "Saving..." : "Er að vista ...",
+    "Couldn't send reset email. Please contact your administrator." : "Gat ekki sent endursetningar tölvupóst. Vinsamlegast hafðu samband við kerfisstjóra.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Hlekkurinn til að endurstilla lykilorðið þitt hefur verið sent á netfangið þitt. Ef þú færð ekki póstinn innan hæfilegs tíma, athugaðu þá í ruslpóst möppu.<br>Ef það er ekki þar spurðu þá kerfisstjórann þinn.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Skrárnar þínar eru dulkóðaðar. Ef þú hefur ekki kveikt á vara lykill, það verður engin leið til að fá þinn gögn til baka eftir lykilorðið þitt er endurstillt.<br />Ef þú ert ekki viss hvað á að gera, skaltu hafa samband við kerfisstjórann áður en þú heldur áfram. <br />Viltu halda áfram?",
+    "I know what I'm doing" : "Ég veit hvað ég er að gera",
+    "Password can not be changed. Please contact your administrator." : "Ekki hægt að breyta lykilorði. Vinsamlegast hafðu samband við kerfisstjóra.",
     "No" : "Nei",
     "Yes" : "Já",
     "Choose" : "Veldu",
+    "Error loading file picker template: {error}" : "Villa við að hlaða skrá Picker sniðmát: {error}",
     "Ok" : "Í lagi",
+    "Error loading message template: {error}" : "Villa við að hlaða skilaboða sniðmáti: {error}",
+    "read-only" : "lesa-eingöngu",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} skrá stangast á","{count} skrár stangast á"],
+    "One file conflict" : "Einn skrá stangast á",
+    "New Files" : "Nýjar Skrár",
+    "Already existing files" : "Skrá er nú þegar til",
+    "Which files do you want to keep?" : "Hvaða skrár vilt þú vilt halda?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ef þú velur báðar útgáfur, þá mun afritaða skráin fá tölustaf bætt við nafn sitt.",
     "Cancel" : "Hætta við",
+    "Continue" : "Halda áfram",
+    "(all selected)" : "(allt valið)",
+    "({count} selected)" : "({count} valið)",
+    "Error loading file exists template" : "Villa við að hlaða skrá núverandi sniðmáts",
+    "Very weak password" : "Mjög veikt lykilorð",
+    "Weak password" : "Veikt lykilorð",
+    "So-so password" : "Svo-svo lykilorð",
+    "Good password" : "Gott lykilorð",
+    "Strong password" : "Sterkt lykilorð",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Vefþjónninn er ekki enn sett upp á réttan hátt til að leyfa skráar samstillingu því WebDAV viðmótið virðist vera brotinn.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Þessi miðlari hefur ekki virka nettengingu. Þetta þýðir að sumir eginleikar eins og virkja ytri gagnageymslu, tilkynningar um uppfærslur eða uppsetningu á foritum þriðja aðila mun ekki virka. Fjar aðgangur af skrám og senda tilkynningar í tölvupósti vika líklega ekki heldur. Við leggjum til að virkja internet tengingu fyrir þennan vefþjóni ef þú vilt hafa alla eiginleika.",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Gagnamappa og skrá eru líklega aðgengilegar af internetinu vegna þess að .htaccess skrá er ekki virk. Við mælum eindregið með að þú stillir vefþjón þinn á þann hátt að gagnamappa er ekki lengur aðgengileg eða þú færir gagnamöppu út fyrir rót vefþjóns.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Ekkert skyndiminni hefur verið stillt. Til að auka afköst skaltu stilla skyndiminni ef í boði. Nánari upplýsingar má finna á <a href=\\\"{docLink}\\\">documentation</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom er ekki læsileg af PHP, Sterklega er mælt með því að leyfa PHP að lesa /dev/urandom af öryggisástæðum. Nánari upplýsingar má finna á <a href=\\\"{docLink}\\\">documentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "PHP útgáfan þín ({version}) er ekki lengur <a href=\\\"{phpLink}\\\">supported by PHP</a>. Við hvetjum þig til að uppfæra PHP útgáfuna til að nýta afkasta og öryggis nýjungar hjá PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Gagnstæður proxy haus stilling er röng, eða þú ert að tengjast ownCloud frá traustum proxy. Ef þú ert ekki að tengjast ownCloud frá traustum proxy, þetta er öryggismál og getur leyft árásir að skopstæling IP tölu þeirra sem sýnilega ownCloud. Nánari upplýsingar má finna á <a href=\\\"{docLink}\\\">documentation</a>.",
+    "Error occurred while checking server setup" : "Villa kom upp við athugun á uppsetingu miðlara",
+    "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\\\"{header}\\\" HTTP haus er ekki stilltur til jafns við \\\"{expected}\\\". Þetta er mögulegur öryggis eða næðis áhætta, við mælum með því að aðlaga þessa stillingu.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\\\"Strangt-Transport-Security\\\" HTTP haus er ekki stilltur á minst \\\"{seconds}\\\" sekúndur. Fyrir aukið öryggi mælum við með því að virkja HSTS eins og lýst er í <a href=\\\"{docUrl}\\\">security tips</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : " Þú ert að tengjast með HTTP. Við mælum eindregið með að þú stillir miðlara á HTTPS í staðin eins og lýst er í okkar <a href=\\\"{docUrl}\\\">security tips</a>.",
     "Shared" : "Deilt",
-    "Share" : "Deila",
+    "Shared with {recipients}" : "Deilt með {recipients}",
     "Error" : "Villa",
     "Error while sharing" : "Villa við deilingu",
     "Error while unsharing" : "Villa við að hætta deilingu",
     "Error while changing permissions" : "Villa við að breyta aðgangsheimildum",
     "Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
     "Shared with you by {owner}" : "Deilt með þér af {owner}",
+    "Share with users or groups …" : "Deila með notendum eða hópum ...",
+    "Share with users, groups or remote users …" : "Deila með notendum, hópa eða ytri notendum ...",
+    "Share" : "Deila",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Deila með fólk í öðrum ownClouds með skipuninni username@example.com/owncloud",
+    "Share link" : "Deila hlekk",
+    "The public link will expire no later than {days} days after it is created" : "Almennings hlekkur rennur út eigi síðar en {days} daga eftir að hann er búinn til",
+    "Link" : "Hlekkur",
     "Password protect" : "Verja með lykilorði",
     "Password" : "Lykilorð",
+    "Choose a password for the public link" : "Veldu þér lykilorð fyrir almennings hlekk",
+    "Allow editing" : "Leyfa breytingar",
     "Email link to person" : "Senda vefhlekk í tölvupóstu til notenda",
     "Send" : "Senda",
     "Set expiration date" : "Setja gildistíma",
+    "Expiration" : "Rennurút",
     "Expiration date" : "Gildir til",
+    "An error occured. Please try again" : "Villa kom upp. Vinsamlegast reyndu aftur",
+    "Adding user..." : "Bæta við notanda...",
+    "group" : "hópur",
+    "remote" : "fjarlægur",
     "Resharing is not allowed" : "Endurdeiling er ekki leyfð",
     "Shared in {item} with {user}" : "Deilt með {item} ásamt {user}",
     "Unshare" : "Hætta deilingu",
+    "notify by email" : "tilkynna með tölvupósti",
+    "can share" : "getur deilt",
     "can edit" : "getur breytt",
     "access control" : "aðgangsstýring",
     "create" : "mynda",
+    "change" : "breyta",
     "delete" : "eyða",
     "Password protected" : "Verja með lykilorði",
     "Error unsetting expiration date" : "Villa við að aftengja gildistíma",
@@ -55,30 +155,121 @@ OC.L10N.register(
     "Email sent" : "Tölvupóstur sendur",
     "Warning" : "Aðvörun",
     "The object type is not specified." : "Tegund ekki tilgreind",
+    "Enter new" : "Sláðu inn nýtt",
     "Delete" : "Eyða",
     "Add" : "Bæta við",
+    "Edit tags" : "Breyta tögum",
+    "Error loading dialog template: {error}" : "Villa við að hlaða valmynd sniðmátið: {error}",
+    "No tags selected for deletion." : "Engin tögg valin til að eyða.",
+    "unknown text" : "óþekktur texti",
+    "Hello world!" : "Halló heimur!",
+    "sunny" : "sólríkur",
+    "Hello {name}, the weather is {weather}" : "Halló {name},veðrið er {weather}",
+    "Hello {name}" : "Halló {name}",
+    "_download %n file_::_download %n files_" : ["sækja %n skrá","sækja %n skrár"],
+    "{version} is available. Get more information on how to update." : "{version} er í boði. Fá frekari upplýsingar um hvernig á að uppfæra.",
+    "Updating {productName} to version {version}, this may take a while." : "Uppfæri {productName} í útgáfu {version}, þetta getur tekið smá stund.",
+    "Please reload the page." : "Vinsamlega endurhlaðið síðunni.",
+    "The update was unsuccessful. " : "Uppfærslan tókst ekki.",
+    "The update was successful. There were warnings." : "Uppfærslan tókst. Það voru viðvaranir.",
     "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
+    "Couldn't reset password because the token is invalid" : "Gat ekki endurstillt lykilorðið vegna þess að tóki ógilt",
+    "Couldn't reset password because the token is expired" : "Gat ekki endurstillt lykilorðið vegna þess að tóki er útrunnið",
+    "Couldn't send reset email. Please make sure your username is correct." : "Gat ekki sent endurstillingu í tölvupóst. Vinsamlegast gakktu úr skugga um að notandanafn þitt sé rétt.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Gat ekki sent endurstillingu í tölvupóst vegna þess að það er ekkert netfang fyrir þetta notandanafn. Vinsamlegast hafðu samband við kerfisstjóra.",
+    "%s password reset" : "%s lykilorð endurstillt",
     "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
     "New password" : "Nýtt lykilorð",
+    "New Password" : "Nýtt Lykilorð",
     "Reset password" : "Endursetja lykilorð",
+    "Searching other places" : "Leitað á öðrum stöðum",
+    "No search results in other places" : "Engar leitarniðurstöður á öðrum stöðum",
+    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} Leitarniðurstaða á öðrum stöðum","{count} Leitarniðurstöður á öðrum stöðum"],
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Apps" : "Forrit",
     "Admin" : "Stjórnun",
     "Help" : "Hjálp",
+    "Error loading tags" : "Villa við að hlaða tagg",
+    "Tag already exists" : "Tagg er þegar til",
+    "Error deleting tag(s)" : "Villa við að eyða töggum",
+    "Error tagging" : "Villa við töggun",
+    "Error untagging" : "Villa við af töggun",
+    "Error favoriting" : "Villa við bókmerkingu ",
+    "Error unfavoriting" : "Villa við afmá bókmerkingu",
     "Access forbidden" : "Aðgangur bannaður",
+    "File not found" : "Skrá finnst ekki",
+    "The specified document has not been found on the server." : "Tilgreint skjal hefur ekki fundist á þjóninum.",
+    "You can click here to return to %s." : "Þú getur smellt hér til að fara aftur á %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Sælir,\n\nbara láta þig vita að %s deildi %s með þér.\\n\nSkoða það: %s\n\n",
+    "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
+    "Cheers!" : "Skál!",
+    "Internal Server Error" : "Innri villa",
+    "The server encountered an internal error and was unable to complete your request." : "Innri villa kom upp og ekki náðist að afgreiða beiðnina.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Vinsamlegast hafið samband við kerfisstjóra ef þessi villa birtist aftur mörgum sinnum, vinsamlegast látu tæknilegar upplýsingar hér að neðan filgja með.",
+    "More details can be found in the server log." : "Nánari upplýsingar er að finna í atburðaskrá miðlara.",
+    "Technical details" : "Tæknilegar upplýsingar",
+    "Remote Address: %s" : "fjar vistfang: %s",
+    "Request ID: %s" : "Beiðni auðkenni: %s",
+    "Type: %s" : "Tegund: %s",
+    "Code: %s" : "Kóði: %s",
+    "Message: %s" : "Skilaboð: %s",
+    "File: %s" : "Skrá: %s",
+    "Line: %s" : "Lína: %s",
+    "Trace" : "Rekja",
+    "Security warning" : "Öryggi viðvörun",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Gagnamappa og skrá eru líklega aðgengilegar af internetinu vegna þess að .htaccess skrá er ekki virk.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Til að fá upplýsingar hvernig á að stilla miðlara almennilega, skaltu skoða <a href=\\\"%s\\\" target=\\\"_blank\\\">handbók</a>.",
     "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
     "Username" : "Notendanafn",
+    "Storage & database" : "Geymsla & gagnagrunnur",
     "Data folder" : "Gagnamappa",
     "Configure the database" : "Stilla gagnagrunn",
+    "Only %s is available." : "Aðeins %s eru laus.",
+    "Install and activate additional PHP modules to choose other database types." : "Setja upp og virkja viðbótar PHP einingar til að velja aðrar tegundir gagnagrunna.",
+    "For more details check out the documentation." : "Frekari upplýsingar í handbók.",
     "Database user" : "Gagnagrunns notandi",
     "Database password" : "Gagnagrunns lykilorð",
     "Database name" : "Nafn gagnagrunns",
     "Database tablespace" : "Töflusvæði gagnagrunns",
     "Database host" : "Netþjónn gagnagrunns",
+    "Performance warning" : "Afkastar viðvörun",
+    "SQLite will be used as database." : "SQLite verður notað fyrir gagnagrunn.",
+    "For larger installations we recommend to choose a different database backend." : "Fyrir stærri uppsetingar mælum við með að velja annan gagnagrunns bakenda.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Sérstaklega þegar tölvu forrit er notað til samræmingar þá er ekki mælt með notkunn SQLite.",
     "Finish setup" : "Virkja uppsetningu",
+    "Finishing …" : "Að klára ...",
+    "Need help?" : "Þarftu hjálp?",
+    "See the documentation" : "Sjá handbók",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Þetta forrit krefst JavaScript fyrir rétta virkni. Vinsamlegast {linkstart} virkjaðu JavaScript {linkend} og endurhladdu síðunni.",
     "Log out" : "Útskrá",
+    "Search" : "Leita",
+    "Server side authentication failed!" : "Netþjóns hlið auðkenningar tókst ekki!",
+    "Please contact your administrator." : "Vinsamlegast hafðu samband við kerfisstjóra.",
+    "An internal error occured." : "Innri villa kom upp.",
+    "Please try again or contact your administrator." : "Vinsamlegast reyndu aftur eða hafðu samband við kerfisstjóra.",
+    "Log in" : "Skrá inn",
+    "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?",
     "remember" : "muna eftir mér",
-    "Log in" : "<strong>Skrá inn</strong>"
+    "Alternative Logins" : "Aðrar Innskráningar",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Sælir ,<br><br>bara láta þig vita að %s deildi <strong>%s</strong> með þér.<br><a href=\"%s\">Skoða það!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Þetta ownCloud eintak er nú í einnar notandaham.",
+    "This means only administrators can use the instance." : "Þetta þýðir aðeins stjórnendur geta notað eintak.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hafðu samband við kerfisstjóra ef þessi skilaboð eru viðvarandi eða birtist óvænt.",
+    "Thank you for your patience." : "Þakka þér fyrir biðlundina.",
+    "You are accessing the server from an untrusted domain." : "Þú ert að tengjast þjóninum frá ótraustu umdæmi.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vinsamlegast hafðu samband við kerfisstjóra. Ef þú ert stjórnandi á þessu eintaki, stiltu þá  \"trusted_domain\" stillingu í config/config.php. Dæmigerðar stillingar er að finna í config/config.sample.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Það fer eftir stillingum þínum, sem stjórnandi þá gætir þú einnig notað hnappinn hér fyrir neðan til að treysta þessu léni.",
+    "Add \"%s\" as trusted domain" : "Bæta við \"%s\" sem treyst lén",
+    "App update required" : "App þarfnast uppfærslu ",
+    "%s will be updated to version %s" : "%s verður uppfærð í útgáfu %s.",
+    "These apps will be updated:" : "Eftirfarandi öpp verða uppfærð:",
+    "These incompatible apps will be disabled:" : "Eftirfarandi forrit eru ósamhæfð og verið gerð óvirk: %s",
+    "The theme %s has been disabled." : "Þema %s hefur verið gerð óvirk.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Vinsamlegast gakktu úr skugga um að gagnagrunnurinn, config mappan og gagna mappan hafi verið afritaðar áður en lengra er haldið.",
+    "Start update" : "Hefja uppfærslu",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Til að forðast að vinnslufrestur með stærri uppsetningum renni út, getur þú í staðinn að keyra eftirfarandi skipun frá uppsetingar möppu:",
+    "This %s instance is currently in maintenance mode, which may take a while." : "Þessi %s er nú í viðhald ham, sem getur tekið smá stund.",
+    "This page will refresh itself when the %s instance is available again." : "Þessi síða mun uppfæra sig þegar %s er í boði á ný."
 },
-"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);");
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/core/l10n/is.json b/core/l10n/is.json
index 75958bafa5..b6255b1764 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -1,4 +1,27 @@
 { "translations": {
+    "Couldn't send mail to following users: %s " : "Gat ekki sent póst á eftirfarandi notanda: %s",
+    "Preparing update" : "Undirbúa uppfærslu",
+    "Turned on maintenance mode" : "Kveikt á viðhaldsham",
+    "Turned off maintenance mode" : "Slökkt á viðhaldsham",
+    "Maintenance mode is kept active" : "viðhaldshami er haldið virkur",
+    "Updated database" : "Uppfært gagnagrunn",
+    "Checked database schema update" : "Athugað gagnagrunns skema uppfærslu.",
+    "Checked database schema update for apps" : "Athugað gagnagrunns skema uppfærslur fyrir öpp",
+    "Updated \"%s\" to %s" : "Uppfært \\\"%s\\\" to %s",
+    "Repair warning: " : "Viðgerðar viðvörun:",
+    "Repair error: " : "Viðgerðar villa:",
+    "Following incompatible apps have been disabled: %s" : "Eftirfarandi forrit eru ósamhæfð hafa verið gerð óvirk: %s",
+    "Following apps have been disabled: %s" : "Eftirfarandi forrit hafa verið gerð óvirk: %s",
+    "Already up to date" : "Allt uppfært nú þegar",
+    "File is too big" : "Skrá er of stór",
+    "Invalid file provided" : "Ógild skrá veitt",
+    "No image or file provided" : "Engin mynd eða skrá veitt",
+    "Unknown filetype" : "Óþekkt skráartegund",
+    "Invalid image" : "Ógild mynd",
+    "No temporary profile picture available, try again" : "Engin tímabundin prófíl mynd í boði, reyndu aftur",
+    "No crop data provided" : "Enginn klippi gögn veit",
+    "No valid crop data provided" : "Ógild klippi gögn veit",
+    "Crop is not square" : "Skurður er ekki ferhyrntur",
     "Sunday" : "Sunnudagur",
     "Monday" : "Mánudagur",
     "Tuesday" : "Þriðjudagur",
@@ -6,6 +29,20 @@
     "Thursday" : "Fimmtudagur",
     "Friday" : "Föstudagur",
     "Saturday" : "Laugardagur",
+    "Sun." : "Sun.",
+    "Mon." : "Mán.",
+    "Tue." : "Þri.",
+    "Wed." : "Mið.",
+    "Thu." : "Fim.",
+    "Fri." : "Fös.",
+    "Sat." : "Lau.",
+    "Su" : "Su",
+    "Mo" : "Má",
+    "Tu" : "Þr",
+    "We" : "Mi",
+    "Th" : "Fi",
+    "Fr" : "Fö",
+    "Sa" : "La",
     "January" : "Janúar",
     "February" : "Febrúar",
     "March" : "Mars",
@@ -18,33 +55,96 @@
     "October" : "Október",
     "November" : "Nóvember",
     "December" : "Desember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Maí.",
+    "Jun." : "Jún.",
+    "Jul." : "Júl.",
+    "Aug." : "Ágú.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nóv.",
+    "Dec." : "Des.",
     "Settings" : "Stillingar",
     "Saving..." : "Er að vista ...",
+    "Couldn't send reset email. Please contact your administrator." : "Gat ekki sent endursetningar tölvupóst. Vinsamlegast hafðu samband við kerfisstjóra.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Hlekkurinn til að endurstilla lykilorðið þitt hefur verið sent á netfangið þitt. Ef þú færð ekki póstinn innan hæfilegs tíma, athugaðu þá í ruslpóst möppu.<br>Ef það er ekki þar spurðu þá kerfisstjórann þinn.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Skrárnar þínar eru dulkóðaðar. Ef þú hefur ekki kveikt á vara lykill, það verður engin leið til að fá þinn gögn til baka eftir lykilorðið þitt er endurstillt.<br />Ef þú ert ekki viss hvað á að gera, skaltu hafa samband við kerfisstjórann áður en þú heldur áfram. <br />Viltu halda áfram?",
+    "I know what I'm doing" : "Ég veit hvað ég er að gera",
+    "Password can not be changed. Please contact your administrator." : "Ekki hægt að breyta lykilorði. Vinsamlegast hafðu samband við kerfisstjóra.",
     "No" : "Nei",
     "Yes" : "Já",
     "Choose" : "Veldu",
+    "Error loading file picker template: {error}" : "Villa við að hlaða skrá Picker sniðmát: {error}",
     "Ok" : "Í lagi",
+    "Error loading message template: {error}" : "Villa við að hlaða skilaboða sniðmáti: {error}",
+    "read-only" : "lesa-eingöngu",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} skrá stangast á","{count} skrár stangast á"],
+    "One file conflict" : "Einn skrá stangast á",
+    "New Files" : "Nýjar Skrár",
+    "Already existing files" : "Skrá er nú þegar til",
+    "Which files do you want to keep?" : "Hvaða skrár vilt þú vilt halda?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ef þú velur báðar útgáfur, þá mun afritaða skráin fá tölustaf bætt við nafn sitt.",
     "Cancel" : "Hætta við",
+    "Continue" : "Halda áfram",
+    "(all selected)" : "(allt valið)",
+    "({count} selected)" : "({count} valið)",
+    "Error loading file exists template" : "Villa við að hlaða skrá núverandi sniðmáts",
+    "Very weak password" : "Mjög veikt lykilorð",
+    "Weak password" : "Veikt lykilorð",
+    "So-so password" : "Svo-svo lykilorð",
+    "Good password" : "Gott lykilorð",
+    "Strong password" : "Sterkt lykilorð",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Vefþjónninn er ekki enn sett upp á réttan hátt til að leyfa skráar samstillingu því WebDAV viðmótið virðist vera brotinn.",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Þessi miðlari hefur ekki virka nettengingu. Þetta þýðir að sumir eginleikar eins og virkja ytri gagnageymslu, tilkynningar um uppfærslur eða uppsetningu á foritum þriðja aðila mun ekki virka. Fjar aðgangur af skrám og senda tilkynningar í tölvupósti vika líklega ekki heldur. Við leggjum til að virkja internet tengingu fyrir þennan vefþjóni ef þú vilt hafa alla eiginleika.",
+    "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Gagnamappa og skrá eru líklega aðgengilegar af internetinu vegna þess að .htaccess skrá er ekki virk. Við mælum eindregið með að þú stillir vefþjón þinn á þann hátt að gagnamappa er ekki lengur aðgengileg eða þú færir gagnamöppu út fyrir rót vefþjóns.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Ekkert skyndiminni hefur verið stillt. Til að auka afköst skaltu stilla skyndiminni ef í boði. Nánari upplýsingar má finna á <a href=\\\"{docLink}\\\">documentation</a>.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom er ekki læsileg af PHP, Sterklega er mælt með því að leyfa PHP að lesa /dev/urandom af öryggisástæðum. Nánari upplýsingar má finna á <a href=\\\"{docLink}\\\">documentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "PHP útgáfan þín ({version}) er ekki lengur <a href=\\\"{phpLink}\\\">supported by PHP</a>. Við hvetjum þig til að uppfæra PHP útgáfuna til að nýta afkasta og öryggis nýjungar hjá PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Gagnstæður proxy haus stilling er röng, eða þú ert að tengjast ownCloud frá traustum proxy. Ef þú ert ekki að tengjast ownCloud frá traustum proxy, þetta er öryggismál og getur leyft árásir að skopstæling IP tölu þeirra sem sýnilega ownCloud. Nánari upplýsingar má finna á <a href=\\\"{docLink}\\\">documentation</a>.",
+    "Error occurred while checking server setup" : "Villa kom upp við athugun á uppsetingu miðlara",
+    "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\\\"{header}\\\" HTTP haus er ekki stilltur til jafns við \\\"{expected}\\\". Þetta er mögulegur öryggis eða næðis áhætta, við mælum með því að aðlaga þessa stillingu.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\\\"Strangt-Transport-Security\\\" HTTP haus er ekki stilltur á minst \\\"{seconds}\\\" sekúndur. Fyrir aukið öryggi mælum við með því að virkja HSTS eins og lýst er í <a href=\\\"{docUrl}\\\">security tips</a>.",
+    "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : " Þú ert að tengjast með HTTP. Við mælum eindregið með að þú stillir miðlara á HTTPS í staðin eins og lýst er í okkar <a href=\\\"{docUrl}\\\">security tips</a>.",
     "Shared" : "Deilt",
-    "Share" : "Deila",
+    "Shared with {recipients}" : "Deilt með {recipients}",
     "Error" : "Villa",
     "Error while sharing" : "Villa við deilingu",
     "Error while unsharing" : "Villa við að hætta deilingu",
     "Error while changing permissions" : "Villa við að breyta aðgangsheimildum",
     "Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
     "Shared with you by {owner}" : "Deilt með þér af {owner}",
+    "Share with users or groups …" : "Deila með notendum eða hópum ...",
+    "Share with users, groups or remote users …" : "Deila með notendum, hópa eða ytri notendum ...",
+    "Share" : "Deila",
+    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Deila með fólk í öðrum ownClouds með skipuninni username@example.com/owncloud",
+    "Share link" : "Deila hlekk",
+    "The public link will expire no later than {days} days after it is created" : "Almennings hlekkur rennur út eigi síðar en {days} daga eftir að hann er búinn til",
+    "Link" : "Hlekkur",
     "Password protect" : "Verja með lykilorði",
     "Password" : "Lykilorð",
+    "Choose a password for the public link" : "Veldu þér lykilorð fyrir almennings hlekk",
+    "Allow editing" : "Leyfa breytingar",
     "Email link to person" : "Senda vefhlekk í tölvupóstu til notenda",
     "Send" : "Senda",
     "Set expiration date" : "Setja gildistíma",
+    "Expiration" : "Rennurút",
     "Expiration date" : "Gildir til",
+    "An error occured. Please try again" : "Villa kom upp. Vinsamlegast reyndu aftur",
+    "Adding user..." : "Bæta við notanda...",
+    "group" : "hópur",
+    "remote" : "fjarlægur",
     "Resharing is not allowed" : "Endurdeiling er ekki leyfð",
     "Shared in {item} with {user}" : "Deilt með {item} ásamt {user}",
     "Unshare" : "Hætta deilingu",
+    "notify by email" : "tilkynna með tölvupósti",
+    "can share" : "getur deilt",
     "can edit" : "getur breytt",
     "access control" : "aðgangsstýring",
     "create" : "mynda",
+    "change" : "breyta",
     "delete" : "eyða",
     "Password protected" : "Verja með lykilorði",
     "Error unsetting expiration date" : "Villa við að aftengja gildistíma",
@@ -53,30 +153,121 @@
     "Email sent" : "Tölvupóstur sendur",
     "Warning" : "Aðvörun",
     "The object type is not specified." : "Tegund ekki tilgreind",
+    "Enter new" : "Sláðu inn nýtt",
     "Delete" : "Eyða",
     "Add" : "Bæta við",
+    "Edit tags" : "Breyta tögum",
+    "Error loading dialog template: {error}" : "Villa við að hlaða valmynd sniðmátið: {error}",
+    "No tags selected for deletion." : "Engin tögg valin til að eyða.",
+    "unknown text" : "óþekktur texti",
+    "Hello world!" : "Halló heimur!",
+    "sunny" : "sólríkur",
+    "Hello {name}, the weather is {weather}" : "Halló {name},veðrið er {weather}",
+    "Hello {name}" : "Halló {name}",
+    "_download %n file_::_download %n files_" : ["sækja %n skrá","sækja %n skrár"],
+    "{version} is available. Get more information on how to update." : "{version} er í boði. Fá frekari upplýsingar um hvernig á að uppfæra.",
+    "Updating {productName} to version {version}, this may take a while." : "Uppfæri {productName} í útgáfu {version}, þetta getur tekið smá stund.",
+    "Please reload the page." : "Vinsamlega endurhlaðið síðunni.",
+    "The update was unsuccessful. " : "Uppfærslan tókst ekki.",
+    "The update was successful. There were warnings." : "Uppfærslan tókst. Það voru viðvaranir.",
     "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
+    "Couldn't reset password because the token is invalid" : "Gat ekki endurstillt lykilorðið vegna þess að tóki ógilt",
+    "Couldn't reset password because the token is expired" : "Gat ekki endurstillt lykilorðið vegna þess að tóki er útrunnið",
+    "Couldn't send reset email. Please make sure your username is correct." : "Gat ekki sent endurstillingu í tölvupóst. Vinsamlegast gakktu úr skugga um að notandanafn þitt sé rétt.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Gat ekki sent endurstillingu í tölvupóst vegna þess að það er ekkert netfang fyrir þetta notandanafn. Vinsamlegast hafðu samband við kerfisstjóra.",
+    "%s password reset" : "%s lykilorð endurstillt",
     "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
     "New password" : "Nýtt lykilorð",
+    "New Password" : "Nýtt Lykilorð",
     "Reset password" : "Endursetja lykilorð",
+    "Searching other places" : "Leitað á öðrum stöðum",
+    "No search results in other places" : "Engar leitarniðurstöður á öðrum stöðum",
+    "_{count} search result in other places_::_{count} search results in other places_" : ["{count} Leitarniðurstaða á öðrum stöðum","{count} Leitarniðurstöður á öðrum stöðum"],
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Apps" : "Forrit",
     "Admin" : "Stjórnun",
     "Help" : "Hjálp",
+    "Error loading tags" : "Villa við að hlaða tagg",
+    "Tag already exists" : "Tagg er þegar til",
+    "Error deleting tag(s)" : "Villa við að eyða töggum",
+    "Error tagging" : "Villa við töggun",
+    "Error untagging" : "Villa við af töggun",
+    "Error favoriting" : "Villa við bókmerkingu ",
+    "Error unfavoriting" : "Villa við afmá bókmerkingu",
     "Access forbidden" : "Aðgangur bannaður",
+    "File not found" : "Skrá finnst ekki",
+    "The specified document has not been found on the server." : "Tilgreint skjal hefur ekki fundist á þjóninum.",
+    "You can click here to return to %s." : "Þú getur smellt hér til að fara aftur á %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Sælir,\n\nbara láta þig vita að %s deildi %s með þér.\\n\nSkoða það: %s\n\n",
+    "The share will expire on %s." : "Gildistími deilingar rennur út %s.",
+    "Cheers!" : "Skál!",
+    "Internal Server Error" : "Innri villa",
+    "The server encountered an internal error and was unable to complete your request." : "Innri villa kom upp og ekki náðist að afgreiða beiðnina.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Vinsamlegast hafið samband við kerfisstjóra ef þessi villa birtist aftur mörgum sinnum, vinsamlegast látu tæknilegar upplýsingar hér að neðan filgja með.",
+    "More details can be found in the server log." : "Nánari upplýsingar er að finna í atburðaskrá miðlara.",
+    "Technical details" : "Tæknilegar upplýsingar",
+    "Remote Address: %s" : "fjar vistfang: %s",
+    "Request ID: %s" : "Beiðni auðkenni: %s",
+    "Type: %s" : "Tegund: %s",
+    "Code: %s" : "Kóði: %s",
+    "Message: %s" : "Skilaboð: %s",
+    "File: %s" : "Skrá: %s",
+    "Line: %s" : "Lína: %s",
+    "Trace" : "Rekja",
+    "Security warning" : "Öryggi viðvörun",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Gagnamappa og skrá eru líklega aðgengilegar af internetinu vegna þess að .htaccess skrá er ekki virk.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Til að fá upplýsingar hvernig á að stilla miðlara almennilega, skaltu skoða <a href=\\\"%s\\\" target=\\\"_blank\\\">handbók</a>.",
     "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
     "Username" : "Notendanafn",
+    "Storage & database" : "Geymsla & gagnagrunnur",
     "Data folder" : "Gagnamappa",
     "Configure the database" : "Stilla gagnagrunn",
+    "Only %s is available." : "Aðeins %s eru laus.",
+    "Install and activate additional PHP modules to choose other database types." : "Setja upp og virkja viðbótar PHP einingar til að velja aðrar tegundir gagnagrunna.",
+    "For more details check out the documentation." : "Frekari upplýsingar í handbók.",
     "Database user" : "Gagnagrunns notandi",
     "Database password" : "Gagnagrunns lykilorð",
     "Database name" : "Nafn gagnagrunns",
     "Database tablespace" : "Töflusvæði gagnagrunns",
     "Database host" : "Netþjónn gagnagrunns",
+    "Performance warning" : "Afkastar viðvörun",
+    "SQLite will be used as database." : "SQLite verður notað fyrir gagnagrunn.",
+    "For larger installations we recommend to choose a different database backend." : "Fyrir stærri uppsetingar mælum við með að velja annan gagnagrunns bakenda.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Sérstaklega þegar tölvu forrit er notað til samræmingar þá er ekki mælt með notkunn SQLite.",
     "Finish setup" : "Virkja uppsetningu",
+    "Finishing …" : "Að klára ...",
+    "Need help?" : "Þarftu hjálp?",
+    "See the documentation" : "Sjá handbók",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Þetta forrit krefst JavaScript fyrir rétta virkni. Vinsamlegast {linkstart} virkjaðu JavaScript {linkend} og endurhladdu síðunni.",
     "Log out" : "Útskrá",
+    "Search" : "Leita",
+    "Server side authentication failed!" : "Netþjóns hlið auðkenningar tókst ekki!",
+    "Please contact your administrator." : "Vinsamlegast hafðu samband við kerfisstjóra.",
+    "An internal error occured." : "Innri villa kom upp.",
+    "Please try again or contact your administrator." : "Vinsamlegast reyndu aftur eða hafðu samband við kerfisstjóra.",
+    "Log in" : "Skrá inn",
+    "Wrong password. Reset it?" : "Rangt lykilorð. Endursetja?",
     "remember" : "muna eftir mér",
-    "Log in" : "<strong>Skrá inn</strong>"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"
+    "Alternative Logins" : "Aðrar Innskráningar",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Sælir ,<br><br>bara láta þig vita að %s deildi <strong>%s</strong> með þér.<br><a href=\"%s\">Skoða það!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Þetta ownCloud eintak er nú í einnar notandaham.",
+    "This means only administrators can use the instance." : "Þetta þýðir aðeins stjórnendur geta notað eintak.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hafðu samband við kerfisstjóra ef þessi skilaboð eru viðvarandi eða birtist óvænt.",
+    "Thank you for your patience." : "Þakka þér fyrir biðlundina.",
+    "You are accessing the server from an untrusted domain." : "Þú ert að tengjast þjóninum frá ótraustu umdæmi.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vinsamlegast hafðu samband við kerfisstjóra. Ef þú ert stjórnandi á þessu eintaki, stiltu þá  \"trusted_domain\" stillingu í config/config.php. Dæmigerðar stillingar er að finna í config/config.sample.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Það fer eftir stillingum þínum, sem stjórnandi þá gætir þú einnig notað hnappinn hér fyrir neðan til að treysta þessu léni.",
+    "Add \"%s\" as trusted domain" : "Bæta við \"%s\" sem treyst lén",
+    "App update required" : "App þarfnast uppfærslu ",
+    "%s will be updated to version %s" : "%s verður uppfærð í útgáfu %s.",
+    "These apps will be updated:" : "Eftirfarandi öpp verða uppfærð:",
+    "These incompatible apps will be disabled:" : "Eftirfarandi forrit eru ósamhæfð og verið gerð óvirk: %s",
+    "The theme %s has been disabled." : "Þema %s hefur verið gerð óvirk.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Vinsamlegast gakktu úr skugga um að gagnagrunnurinn, config mappan og gagna mappan hafi verið afritaðar áður en lengra er haldið.",
+    "Start update" : "Hefja uppfærslu",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Til að forðast að vinnslufrestur með stærri uppsetningum renni út, getur þú í staðinn að keyra eftirfarandi skipun frá uppsetingar möppu:",
+    "This %s instance is currently in maintenance mode, which may take a while." : "Þessi %s er nú í viðhald ham, sem getur tekið smá stund.",
+    "This page will refresh itself when the %s instance is available again." : "Þessi síða mun uppfæra sig þegar %s er í boði á ný."
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/core/l10n/it.js b/core/l10n/it.js
index 67438dc4c9..3b54001465 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s",
+    "Preparing update" : "Preparazione aggiornamento",
     "Turned on maintenance mode" : "Modalità di manutenzione attivata",
     "Turned off maintenance mode" : "Modalità di manutenzione disattivata",
     "Maintenance mode is kept active" : "La modalità di manutenzione è lasciata attiva",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Errore di riparazione:",
     "Following incompatible apps have been disabled: %s" : "Le seguenti applicazioni incompatibili sono state disabilitate: %s",
     "Following apps have been disabled: %s" : "Le seguenti applicazioni sono state disabilitate: %s",
+    "Already up to date" : "Già aggiornato",
     "File is too big" : "Il file è troppo grande",
     "Invalid file provided" : "File non valido fornito",
     "No image or file provided" : "Non è stata fornita alcun immagine o file",
@@ -29,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Giovedì",
     "Friday" : "Venerdì",
     "Saturday" : "Sabato",
+    "Sun." : "Dom.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mer.",
+    "Thu." : "Gio.",
+    "Fri." : "Ven.",
+    "Sat." : "Sab.",
+    "Su" : "Do",
+    "Mo" : "Lu",
+    "Tu" : "Ma",
+    "We" : "Me",
+    "Th" : "Gi",
+    "Fr" : "Ve",
+    "Sa" : "Sa",
     "January" : "Gennaio",
     "February" : "Febbraio",
     "March" : "Marzo",
@@ -41,6 +57,18 @@ OC.L10N.register(
     "October" : "Ottobre",
     "November" : "Novembre",
     "December" : "Dicembre",
+    "Jan." : "Gen.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mag.",
+    "Jun." : "Giu.",
+    "Jul." : "Lug.",
+    "Aug." : "Ago.",
+    "Sep." : "Set.",
+    "Oct." : "Ott.",
+    "Nov." : "Nov.",
+    "Dec." : "Dic.",
     "Settings" : "Impostazioni",
     "Saving..." : "Salvataggio in corso...",
     "Couldn't send reset email. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione. Contatta il tuo amministratore.",
@@ -76,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o di spostare la cartella fuori dalla radice del server web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Non è stata configurata alcuna cache di memoria. Per migliorare le prestazioni configura memcache, se disponibile. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom non è leggibile da PHP e ciò è vivamente sconsigliato per motivi di sicurezza. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La tua versione ({version}) di PHP non è più <a href=\"{phpLink}\">supportata da PHP</a>. Ti esortiamo ad aggiornare la versione di PHP per trarre vantaggio dagli aggiornamenti in termini di prestazioni e sicurezza forniti da PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configurazione delle intestazioni del proxy inverso non è corretta, o stai effettuando l'accesso a ownCloud da un proxy affidabile. Se non stai effettuando l'accesso da un proxy affidabile, questo è un problema di sicurezza e può consentire a un attaccante di falsificare il suo indirizzo IP, rendendo visibile a ownCloud. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
     "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'intestazione HTTP \"{header}\" non è configurata come \"{expected}\". \nQuesto è un potenziale rischio di sicurezza o di riservatezza dei dati e noi consigliamo di modificare questa impostazione.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'intestazione HTTP \"Strict-Transport-Security\" non è configurata con un valore almeno di \"{seconds}\" secondi. Per migliorare la sicurezza, consigliamo di abilitare HSTS come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Sei connesso a questo sito tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere invece l'utilizzo del protocollo HTTPS, come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.",
     "Shared" : "Condiviso",
     "Shared with {recipients}" : "Condiviso con {recipients}",
-    "Share" : "Condividi",
     "Error" : "Errore",
     "Error while sharing" : "Errore durante la condivisione",
     "Error while unsharing" : "Errore durante la rimozione della condivisione",
@@ -91,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Condiviso con te da {owner}",
     "Share with users or groups …" : "Condividi con utenti o gruppi...",
     "Share with users, groups or remote users …" : "Condividi con utenti, gruppi o utenti remoti...",
+    "Share" : "Condividi",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone su altri ownCloud utilizzando la sintassi nomeutente@esempio.com/owncloud",
     "Share link" : "Condividi collegamento",
     "The public link will expire no later than {days} days after it is created" : "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
@@ -144,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "L'aggiornamento è stato effettuato correttamente. Ci sono degli avvisi.",
     "The update was successful. Redirecting you to ownCloud now." : "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
     "Couldn't reset password because the token is invalid" : "Impossibile reimpostare la password poiché il token non è valido",
+    "Couldn't reset password because the token is expired" : "Impossibile reimpostare la password poiché il token è scaduto",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
     "%s password reset" : "Ripristino password di %s",
@@ -217,9 +248,8 @@ OC.L10N.register(
     "Please contact your administrator." : "Contatta il tuo amministratore di sistema.",
     "An internal error occured." : "Si è verificato un errore interno.",
     "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.",
-    "Forgot your password? Reset it!" : "Hai dimenticato la password? Reimpostala!",
+    "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?",
     "remember" : "ricorda",
-    "Log in" : "Accedi",
     "Alternative Logins" : "Accessi alternativi",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ciao,<br><br>volevo informarti che %s ha condiviso <strong>%s</strong> con te.<br><a href=\"%s\">Guarda!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Questa istanza di ownCloud è in modalità utente singolo.",
@@ -230,8 +260,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contatta il tuo amministratore di sistema. Se sei un amministratore di questa istanza, configura l'impostazione \"trusted_domain\" in config/config.php. Un esempio di configurazione è disponibile in config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "In base alla tua configurazione, come amministratore potrai utilizzare anche il pulsante in basso per rendere attendibile questo dominio.",
     "Add \"%s\" as trusted domain" : "Aggiungi \"%s\" come dominio attendibile",
-    "%s will be updated to version %s." : "%s sarà aggiornato alla versione %s.",
-    "The following apps will be disabled:" : "Le seguenti applicazioni saranno disabilitate:",
+    "App update required" : "Aggiornamento dell'applicazione richiesto",
+    "%s will be updated to version %s" : "%s sarà aggiornato alla versione %s",
+    "These apps will be updated:" : "Queste applicazioni saranno aggiornate:",
+    "These incompatible apps will be disabled:" : "Queste applicazioni incompatibili saranno disabilitate:",
     "The theme %s has been disabled." : "Il tema %s è stato disabilitato.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. ",
     "Start update" : "Avvia l'aggiornamento",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 05f260041d..30543ce8a6 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s",
+    "Preparing update" : "Preparazione aggiornamento",
     "Turned on maintenance mode" : "Modalità di manutenzione attivata",
     "Turned off maintenance mode" : "Modalità di manutenzione disattivata",
     "Maintenance mode is kept active" : "La modalità di manutenzione è lasciata attiva",
@@ -11,6 +12,7 @@
     "Repair error: " : "Errore di riparazione:",
     "Following incompatible apps have been disabled: %s" : "Le seguenti applicazioni incompatibili sono state disabilitate: %s",
     "Following apps have been disabled: %s" : "Le seguenti applicazioni sono state disabilitate: %s",
+    "Already up to date" : "Già aggiornato",
     "File is too big" : "Il file è troppo grande",
     "Invalid file provided" : "File non valido fornito",
     "No image or file provided" : "Non è stata fornita alcun immagine o file",
@@ -27,6 +29,20 @@
     "Thursday" : "Giovedì",
     "Friday" : "Venerdì",
     "Saturday" : "Sabato",
+    "Sun." : "Dom.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mer.",
+    "Thu." : "Gio.",
+    "Fri." : "Ven.",
+    "Sat." : "Sab.",
+    "Su" : "Do",
+    "Mo" : "Lu",
+    "Tu" : "Ma",
+    "We" : "Me",
+    "Th" : "Gi",
+    "Fr" : "Ve",
+    "Sa" : "Sa",
     "January" : "Gennaio",
     "February" : "Febbraio",
     "March" : "Marzo",
@@ -39,6 +55,18 @@
     "October" : "Ottobre",
     "November" : "Novembre",
     "December" : "Dicembre",
+    "Jan." : "Gen.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mag.",
+    "Jun." : "Giu.",
+    "Jul." : "Lug.",
+    "Aug." : "Ago.",
+    "Sep." : "Set.",
+    "Oct." : "Ott.",
+    "Nov." : "Nov.",
+    "Dec." : "Dic.",
     "Settings" : "Impostazioni",
     "Saving..." : "Salvataggio in corso...",
     "Couldn't send reset email. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione. Contatta il tuo amministratore.",
@@ -74,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o di spostare la cartella fuori dalla radice del server web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Non è stata configurata alcuna cache di memoria. Per migliorare le prestazioni configura memcache, se disponibile. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom non è leggibile da PHP e ciò è vivamente sconsigliato per motivi di sicurezza. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "La tua versione ({version}) di PHP non è più <a href=\"{phpLink}\">supportata da PHP</a>. Ti esortiamo ad aggiornare la versione di PHP per trarre vantaggio dagli aggiornamenti in termini di prestazioni e sicurezza forniti da PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "La configurazione delle intestazioni del proxy inverso non è corretta, o stai effettuando l'accesso a ownCloud da un proxy affidabile. Se non stai effettuando l'accesso da un proxy affidabile, questo è un problema di sicurezza e può consentire a un attaccante di falsificare il suo indirizzo IP, rendendo visibile a ownCloud. Ulteriori informazioni sono disponibili nella nostra <a href=\"{docLink}\">documentazione</a>.",
     "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'intestazione HTTP \"{header}\" non è configurata come \"{expected}\". \nQuesto è un potenziale rischio di sicurezza o di riservatezza dei dati e noi consigliamo di modificare questa impostazione.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'intestazione HTTP \"Strict-Transport-Security\" non è configurata con un valore almeno di \"{seconds}\" secondi. Per migliorare la sicurezza, consigliamo di abilitare HSTS come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Sei connesso a questo sito tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere invece l'utilizzo del protocollo HTTPS, come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.",
     "Shared" : "Condiviso",
     "Shared with {recipients}" : "Condiviso con {recipients}",
-    "Share" : "Condividi",
     "Error" : "Errore",
     "Error while sharing" : "Errore durante la condivisione",
     "Error while unsharing" : "Errore durante la rimozione della condivisione",
@@ -89,6 +118,7 @@
     "Shared with you by {owner}" : "Condiviso con te da {owner}",
     "Share with users or groups …" : "Condividi con utenti o gruppi...",
     "Share with users, groups or remote users …" : "Condividi con utenti, gruppi o utenti remoti...",
+    "Share" : "Condividi",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone su altri ownCloud utilizzando la sintassi nomeutente@esempio.com/owncloud",
     "Share link" : "Condividi collegamento",
     "The public link will expire no later than {days} days after it is created" : "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
@@ -142,6 +172,7 @@
     "The update was successful. There were warnings." : "L'aggiornamento è stato effettuato correttamente. Ci sono degli avvisi.",
     "The update was successful. Redirecting you to ownCloud now." : "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
     "Couldn't reset password because the token is invalid" : "Impossibile reimpostare la password poiché il token non è valido",
+    "Couldn't reset password because the token is expired" : "Impossibile reimpostare la password poiché il token è scaduto",
     "Couldn't send reset email. Please make sure your username is correct." : "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
     "%s password reset" : "Ripristino password di %s",
@@ -215,9 +246,8 @@
     "Please contact your administrator." : "Contatta il tuo amministratore di sistema.",
     "An internal error occured." : "Si è verificato un errore interno.",
     "Please try again or contact your administrator." : "Prova ancora o contatta il tuo amministratore.",
-    "Forgot your password? Reset it!" : "Hai dimenticato la password? Reimpostala!",
+    "Wrong password. Reset it?" : "Password errata. Vuoi reimpostarla?",
     "remember" : "ricorda",
-    "Log in" : "Accedi",
     "Alternative Logins" : "Accessi alternativi",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Ciao,<br><br>volevo informarti che %s ha condiviso <strong>%s</strong> con te.<br><a href=\"%s\">Guarda!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Questa istanza di ownCloud è in modalità utente singolo.",
@@ -228,8 +258,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contatta il tuo amministratore di sistema. Se sei un amministratore di questa istanza, configura l'impostazione \"trusted_domain\" in config/config.php. Un esempio di configurazione è disponibile in config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "In base alla tua configurazione, come amministratore potrai utilizzare anche il pulsante in basso per rendere attendibile questo dominio.",
     "Add \"%s\" as trusted domain" : "Aggiungi \"%s\" come dominio attendibile",
-    "%s will be updated to version %s." : "%s sarà aggiornato alla versione %s.",
-    "The following apps will be disabled:" : "Le seguenti applicazioni saranno disabilitate:",
+    "App update required" : "Aggiornamento dell'applicazione richiesto",
+    "%s will be updated to version %s" : "%s sarà aggiornato alla versione %s",
+    "These apps will be updated:" : "Queste applicazioni saranno aggiornate:",
+    "These incompatible apps will be disabled:" : "Queste applicazioni incompatibili saranno disabilitate:",
     "The theme %s has been disabled." : "Il tema %s è stato disabilitato.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. ",
     "Start update" : "Avvia l'aggiornamento",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 8d059e4b65..9c8d681f37 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Repair error: " : "修復エラー:",
     "Following incompatible apps have been disabled: %s" : "次の互換性のないアプリは無効にされています: %s",
     "Following apps have been disabled: %s" : "以下のアプリが無効にされています: %s",
+    "File is too big" : "ファイルが大きすぎます",
     "Invalid file provided" : "無効なファイルが提供されました",
     "No image or file provided" : "画像もしくはファイルが提供されていません",
     "Unknown filetype" : "不明なファイルタイプ",
@@ -28,6 +29,20 @@ OC.L10N.register(
     "Thursday" : "木",
     "Friday" : "金",
     "Saturday" : "土",
+    "Sun." : "日",
+    "Mon." : "月",
+    "Tue." : "火",
+    "Wed." : "水",
+    "Thu." : "木",
+    "Fri." : "金",
+    "Sat." : "土",
+    "Su" : "日",
+    "Mo" : "月",
+    "Tu" : "火",
+    "We" : "水",
+    "Th" : "木",
+    "Fr" : "金",
+    "Sa" : "土",
     "January" : "1月",
     "February" : "2月",
     "March" : "3月",
@@ -40,6 +55,18 @@ OC.L10N.register(
     "October" : "10月",
     "November" : "11月",
     "December" : "12月",
+    "Jan." : "1月",
+    "Feb." : "2月",
+    "Mar." : "3月",
+    "Apr." : "4月",
+    "May." : "5月",
+    "Jun." : "6月",
+    "Jul." : "7月",
+    "Aug." : "8月",
+    "Sep." : "9月",
+    "Oct." : "10月",
+    "Nov." : "11月",
+    "Dec." : "12月",
     "Settings" : "設定",
     "Saving..." : "保存中...",
     "Couldn't send reset email. Please contact your administrator." : "リセットメールを送信できませんでした。管理者に問い合わせてください。",
@@ -71,17 +98,18 @@ OC.L10N.register(
     "Good password" : "良好なパスワード",
     "Strong password" : "強いパスワード",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースが動作していないようです。Webサーバーは、ファイルの同期を許可するよう適切に設定されていません。",
-    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "このサーバーはインターネットに接続されていません。この場合、外部ストレージのマウント、更新の通知やサードパーティ製のアプリ、といったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信のような機能も利用できない可能性があります。全ての機能を利用するためには、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティ製のアプリ、といった一部の機能が利用できません。また、リモート接続でのファイルアクセス、通知メールの送信のような機能も利用できないことがあります。すべての機能を利用するには、このサーバーのインターネット接続を有効にすることをお勧めします。",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにWebサーバーを設定するか、Webサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "メモリキャッシュが設定されていません。パフォーマンスを向上するために、可能であれば memcache を設定してください。 より詳しい情報については、<a href=\"{docLink}\">documentation</a> を参照してください。",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom は PHP から読み取ることができず、この状態はセキュリティの観点からおすすめできません。より詳しい情報については、<a href=\"{docLink}\">documentation</a> を参照ください。",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "ご利用のPHPのバージョン ({version}) は、<a href=\"{phpLink}\">PHPでサポート</a> されていません。 我々は、PHPから提供されている新しいバージョンにアップグレードし、それによるセキュリティの確保とパフォーマンスのメリットを受けられることを強くお勧めします。",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "リバースプロキシーのヘッダー設定が間違っているか、または信頼されたプロキシーからownCloudにアクセスしていません。もし、信頼されたプロキシーからアクセスしているのでないなら、セキュリティに問題があり、ownCloudを詐称したIPアドレスから攻撃者に対して見えるよう許可していることになります。詳細な情報は、<a href=\"{docLink}\">ドキュメント</a>を確認してください。",
     "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP ヘッダは \"{expected}\" に設定されていません。これは潜在的なセキュリティリスクもしくはプライバシーリスクとなる可能性があるため、この設定を見直すことをおすすめします。",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP ヘッダは最小値の \"{seconds}\" 秒に設定されていません。 セキュリティーを強化するため、<a href=\"{docUrl}\">security tips</a>を参照して HSTS を有効にすることをおすすめします。",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP ヘッダが最小値の \"{seconds}\" 秒に設定されていません。 セキュリティを強化するため、<a href=\"{docUrl}\">security tips</a>を参照して、HSTS を有効にすることをおすすめします。",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP経由でアクセスしています。<a href=\"{docUrl}\">security tips</a>を参照して、代わりにHTTPSを使用するようサーバーを設定することを強くおすすめします。 instead as described in our .",
     "Shared" : "共有中",
     "Shared with {recipients}" : "{recipients} と共有",
-    "Share" : "共有",
     "Error" : "エラー",
     "Error while sharing" : "共有でエラー発生",
     "Error while unsharing" : "共有解除でエラー発生",
@@ -90,6 +118,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "{owner} と共有中",
     "Share with users or groups …" : "ユーザーもしくはグループと共有 ...",
     "Share with users, groups or remote users …" : "ユーザー、グループもしくはリモートユーザーと共有 ...",
+    "Share" : "共有",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "次の形式で指定して他のownCloudのユーザーと、共有",
     "Share link" : "URLで共有",
     "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
@@ -216,9 +245,9 @@ OC.L10N.register(
     "Please contact your administrator." : "管理者に問い合わせてください。",
     "An internal error occured." : "内部エラーが発生しました。",
     "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。",
-    "Forgot your password? Reset it!" : "パスワードを忘れましたか？リセットします！",
-    "remember" : "パスワードを保存",
     "Log in" : "ログイン",
+    "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？",
+    "remember" : "パスワードを保存",
     "Alternative Logins" : "代替ログイン",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "このownCloudインスタンスは、現在シングルユーザーモードです。",
@@ -229,12 +258,14 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "管理者に問い合わせてください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "環境により、下のボタンで信頼するドメインに追加する必要があるかもしれません。",
     "Add \"%s\" as trusted domain" : "\"%s\" を信頼するドメイン名に追加",
-    "%s will be updated to version %s." : "%s はバージョン %s にアップデートされました。",
-    "The following apps will be disabled:" : "以下のアプリは無効です：",
+    "App update required" : "アプリの更新が必要",
+    "%s will be updated to version %s" : "%s が %s バーションへ更新される",
+    "These apps will be updated:" : "次のアプリは更新される：",
+    "These incompatible apps will be disabled:" : "次の非互換のないアプリは無効になる：",
     "The theme %s has been disabled." : "テーマ %s が無効になっています。",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "データベースを確認してください。実行前にconfigフォルダーとdataフォルダーをバックアップします。",
     "Start update" : "アップデートを開始",
-    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性があるため、インストールディレクトリで次のコマンドを実行しても構いません。",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性があるため、インストールディレクトリで以下のコマンドを実行することもできます。",
     "This %s instance is currently in maintenance mode, which may take a while." : "このサーバー %s は現在メンテナンスモードです。しばらくお待ちください。",
     "This page will refresh itself when the %s instance is available again." : "この画面は、サーバー %s の再起動後に自動的に更新されます。"
 },
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index fbf2d611ec..ad18b1f98e 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -11,6 +11,7 @@
     "Repair error: " : "修復エラー:",
     "Following incompatible apps have been disabled: %s" : "次の互換性のないアプリは無効にされています: %s",
     "Following apps have been disabled: %s" : "以下のアプリが無効にされています: %s",
+    "File is too big" : "ファイルが大きすぎます",
     "Invalid file provided" : "無効なファイルが提供されました",
     "No image or file provided" : "画像もしくはファイルが提供されていません",
     "Unknown filetype" : "不明なファイルタイプ",
@@ -26,6 +27,20 @@
     "Thursday" : "木",
     "Friday" : "金",
     "Saturday" : "土",
+    "Sun." : "日",
+    "Mon." : "月",
+    "Tue." : "火",
+    "Wed." : "水",
+    "Thu." : "木",
+    "Fri." : "金",
+    "Sat." : "土",
+    "Su" : "日",
+    "Mo" : "月",
+    "Tu" : "火",
+    "We" : "水",
+    "Th" : "木",
+    "Fr" : "金",
+    "Sa" : "土",
     "January" : "1月",
     "February" : "2月",
     "March" : "3月",
@@ -38,6 +53,18 @@
     "October" : "10月",
     "November" : "11月",
     "December" : "12月",
+    "Jan." : "1月",
+    "Feb." : "2月",
+    "Mar." : "3月",
+    "Apr." : "4月",
+    "May." : "5月",
+    "Jun." : "6月",
+    "Jul." : "7月",
+    "Aug." : "8月",
+    "Sep." : "9月",
+    "Oct." : "10月",
+    "Nov." : "11月",
+    "Dec." : "12月",
     "Settings" : "設定",
     "Saving..." : "保存中...",
     "Couldn't send reset email. Please contact your administrator." : "リセットメールを送信できませんでした。管理者に問い合わせてください。",
@@ -69,17 +96,18 @@
     "Good password" : "良好なパスワード",
     "Strong password" : "強いパスワード",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースが動作していないようです。Webサーバーは、ファイルの同期を許可するよう適切に設定されていません。",
-    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "このサーバーはインターネットに接続されていません。この場合、外部ストレージのマウント、更新の通知やサードパーティ製のアプリ、といったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信のような機能も利用できない可能性があります。全ての機能を利用するためには、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティ製のアプリ、といった一部の機能が利用できません。また、リモート接続でのファイルアクセス、通知メールの送信のような機能も利用できないことがあります。すべての機能を利用するには、このサーバーのインターネット接続を有効にすることをお勧めします。",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにWebサーバーを設定するか、Webサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "メモリキャッシュが設定されていません。パフォーマンスを向上するために、可能であれば memcache を設定してください。 より詳しい情報については、<a href=\"{docLink}\">documentation</a> を参照してください。",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom は PHP から読み取ることができず、この状態はセキュリティの観点からおすすめできません。より詳しい情報については、<a href=\"{docLink}\">documentation</a> を参照ください。",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "ご利用のPHPのバージョン ({version}) は、<a href=\"{phpLink}\">PHPでサポート</a> されていません。 我々は、PHPから提供されている新しいバージョンにアップグレードし、それによるセキュリティの確保とパフォーマンスのメリットを受けられることを強くお勧めします。",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "リバースプロキシーのヘッダー設定が間違っているか、または信頼されたプロキシーからownCloudにアクセスしていません。もし、信頼されたプロキシーからアクセスしているのでないなら、セキュリティに問題があり、ownCloudを詐称したIPアドレスから攻撃者に対して見えるよう許可していることになります。詳細な情報は、<a href=\"{docLink}\">ドキュメント</a>を確認してください。",
     "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP ヘッダは \"{expected}\" に設定されていません。これは潜在的なセキュリティリスクもしくはプライバシーリスクとなる可能性があるため、この設定を見直すことをおすすめします。",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP ヘッダは最小値の \"{seconds}\" 秒に設定されていません。 セキュリティーを強化するため、<a href=\"{docUrl}\">security tips</a>を参照して HSTS を有効にすることをおすすめします。",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP ヘッダが最小値の \"{seconds}\" 秒に設定されていません。 セキュリティを強化するため、<a href=\"{docUrl}\">security tips</a>を参照して、HSTS を有効にすることをおすすめします。",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP経由でアクセスしています。<a href=\"{docUrl}\">security tips</a>を参照して、代わりにHTTPSを使用するようサーバーを設定することを強くおすすめします。 instead as described in our .",
     "Shared" : "共有中",
     "Shared with {recipients}" : "{recipients} と共有",
-    "Share" : "共有",
     "Error" : "エラー",
     "Error while sharing" : "共有でエラー発生",
     "Error while unsharing" : "共有解除でエラー発生",
@@ -88,6 +116,7 @@
     "Shared with you by {owner}" : "{owner} と共有中",
     "Share with users or groups …" : "ユーザーもしくはグループと共有 ...",
     "Share with users, groups or remote users …" : "ユーザー、グループもしくはリモートユーザーと共有 ...",
+    "Share" : "共有",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "次の形式で指定して他のownCloudのユーザーと、共有",
     "Share link" : "URLで共有",
     "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
@@ -214,9 +243,9 @@
     "Please contact your administrator." : "管理者に問い合わせてください。",
     "An internal error occured." : "内部エラーが発生しました。",
     "Please try again or contact your administrator." : "もう一度試してみるか、管理者に問い合わせてください。",
-    "Forgot your password? Reset it!" : "パスワードを忘れましたか？リセットします！",
-    "remember" : "パスワードを保存",
     "Log in" : "ログイン",
+    "Wrong password. Reset it?" : "パスワードが間違っています。リセットしますか？",
+    "remember" : "パスワードを保存",
     "Alternative Logins" : "代替ログイン",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "このownCloudインスタンスは、現在シングルユーザーモードです。",
@@ -227,12 +256,14 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "管理者に問い合わせてください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "環境により、下のボタンで信頼するドメインに追加する必要があるかもしれません。",
     "Add \"%s\" as trusted domain" : "\"%s\" を信頼するドメイン名に追加",
-    "%s will be updated to version %s." : "%s はバージョン %s にアップデートされました。",
-    "The following apps will be disabled:" : "以下のアプリは無効です：",
+    "App update required" : "アプリの更新が必要",
+    "%s will be updated to version %s" : "%s が %s バーションへ更新される",
+    "These apps will be updated:" : "次のアプリは更新される：",
+    "These incompatible apps will be disabled:" : "次の非互換のないアプリは無効になる：",
     "The theme %s has been disabled." : "テーマ %s が無効になっています。",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "データベースを確認してください。実行前にconfigフォルダーとdataフォルダーをバックアップします。",
     "Start update" : "アップデートを開始",
-    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性があるため、インストールディレクトリで次のコマンドを実行しても構いません。",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性があるため、インストールディレクトリで以下のコマンドを実行することもできます。",
     "This %s instance is currently in maintenance mode, which may take a while." : "このサーバー %s は現在メンテナンスモードです。しばらくお待ちください。",
     "This page will refresh itself when the %s instance is available again." : "この画面は、サーバー %s の再起動後に自動的に更新されます。"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
index ed9ab2bbd7..d6ae525c86 100644
--- a/core/l10n/ka_GE.js
+++ b/core/l10n/ka_GE.js
@@ -8,6 +8,13 @@ OC.L10N.register(
     "Thursday" : "ხუთშაბათი",
     "Friday" : "პარასკევი",
     "Saturday" : "შაბათი",
+    "Sun." : "კვ.",
+    "Mon." : "ორშ.",
+    "Tue." : "სამ.",
+    "Wed." : "ოთხ.",
+    "Thu." : "ხუთ.",
+    "Fri." : "პარ.",
+    "Sat." : "შაბ.",
     "January" : "იანვარი",
     "February" : "თებერვალი",
     "March" : "მარტი",
@@ -20,6 +27,18 @@ OC.L10N.register(
     "October" : "ოქტომბერი",
     "November" : "ნოემბერი",
     "December" : "დეკემბერი",
+    "Jan." : "იან.",
+    "Feb." : "თებ.",
+    "Mar." : "მარ.",
+    "Apr." : "აპრ.",
+    "May." : "მაი.",
+    "Jun." : "ივნ.",
+    "Jul." : "ივლ.",
+    "Aug." : "აგვ.",
+    "Sep." : "სექ.",
+    "Oct." : "ოქტ.",
+    "Nov." : "ნოე.",
+    "Dec." : "დეკ.",
     "Settings" : "პარამეტრები",
     "Saving..." : "შენახვა...",
     "No" : "არა",
@@ -29,13 +48,13 @@ OC.L10N.register(
     "New Files" : "ახალი ფაილები",
     "Cancel" : "უარყოფა",
     "Shared" : "გაზიარებული",
-    "Share" : "გაზიარება",
     "Error" : "შეცდომა",
     "Error while sharing" : "შეცდომა გაზიარების დროს",
     "Error while unsharing" : "შეცდომა გაზიარების გაუქმების დროს",
     "Error while changing permissions" : "შეცდომა დაშვების ცვლილების დროს",
     "Shared with you and the group {group} by {owner}" : "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
     "Shared with you by {owner}" : "გაზიარდა თქვენთვის {owner}–ის მიერ",
+    "Share" : "გაზიარება",
     "Password protect" : "პაროლით დაცვა",
     "Password" : "პაროლი",
     "Email link to person" : "ლინკის პიროვნების იმეილზე გაგზავნა",
@@ -83,8 +102,8 @@ OC.L10N.register(
     "Finish setup" : "კონფიგურაციის დასრულება",
     "Log out" : "გამოსვლა",
     "Search" : "ძებნა",
-    "remember" : "დამახსოვრება",
     "Log in" : "შესვლა",
+    "remember" : "დამახსოვრება",
     "Alternative Logins" : "ალტერნატიული Login–ი"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
index 3d5a85a99f..85fecffe0c 100644
--- a/core/l10n/ka_GE.json
+++ b/core/l10n/ka_GE.json
@@ -6,6 +6,13 @@
     "Thursday" : "ხუთშაბათი",
     "Friday" : "პარასკევი",
     "Saturday" : "შაბათი",
+    "Sun." : "კვ.",
+    "Mon." : "ორშ.",
+    "Tue." : "სამ.",
+    "Wed." : "ოთხ.",
+    "Thu." : "ხუთ.",
+    "Fri." : "პარ.",
+    "Sat." : "შაბ.",
     "January" : "იანვარი",
     "February" : "თებერვალი",
     "March" : "მარტი",
@@ -18,6 +25,18 @@
     "October" : "ოქტომბერი",
     "November" : "ნოემბერი",
     "December" : "დეკემბერი",
+    "Jan." : "იან.",
+    "Feb." : "თებ.",
+    "Mar." : "მარ.",
+    "Apr." : "აპრ.",
+    "May." : "მაი.",
+    "Jun." : "ივნ.",
+    "Jul." : "ივლ.",
+    "Aug." : "აგვ.",
+    "Sep." : "სექ.",
+    "Oct." : "ოქტ.",
+    "Nov." : "ნოე.",
+    "Dec." : "დეკ.",
     "Settings" : "პარამეტრები",
     "Saving..." : "შენახვა...",
     "No" : "არა",
@@ -27,13 +46,13 @@
     "New Files" : "ახალი ფაილები",
     "Cancel" : "უარყოფა",
     "Shared" : "გაზიარებული",
-    "Share" : "გაზიარება",
     "Error" : "შეცდომა",
     "Error while sharing" : "შეცდომა გაზიარების დროს",
     "Error while unsharing" : "შეცდომა გაზიარების გაუქმების დროს",
     "Error while changing permissions" : "შეცდომა დაშვების ცვლილების დროს",
     "Shared with you and the group {group} by {owner}" : "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
     "Shared with you by {owner}" : "გაზიარდა თქვენთვის {owner}–ის მიერ",
+    "Share" : "გაზიარება",
     "Password protect" : "პაროლით დაცვა",
     "Password" : "პაროლი",
     "Email link to person" : "ლინკის პიროვნების იმეილზე გაგზავნა",
@@ -81,8 +100,8 @@
     "Finish setup" : "კონფიგურაციის დასრულება",
     "Log out" : "გამოსვლა",
     "Search" : "ძებნა",
-    "remember" : "დამახსოვრება",
     "Log in" : "შესვლა",
+    "remember" : "დამახსოვრება",
     "Alternative Logins" : "ალტერნატიული Login–ი"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/km.js b/core/l10n/km.js
index b3332580e2..b2d3fa069e 100644
--- a/core/l10n/km.js
+++ b/core/l10n/km.js
@@ -10,6 +10,13 @@ OC.L10N.register(
     "Thursday" : "ថ្ងៃព្រហស្បតិ៍",
     "Friday" : "ថ្ងៃសុក្រ",
     "Saturday" : "ថ្ងៃសៅរ៍",
+    "Sun." : "អាទិត្យ",
+    "Mon." : "ចន្ទ",
+    "Tue." : "អង្គារ",
+    "Wed." : "ពុធ",
+    "Thu." : "ព្រហ.",
+    "Fri." : "សុក្រ",
+    "Sat." : "សៅរ៍",
     "January" : "ខែមករា",
     "February" : "ខែកុម្ភៈ",
     "March" : "ខែមីនា",
@@ -22,6 +29,18 @@ OC.L10N.register(
     "October" : "ខែតុលា",
     "November" : "ខែវិច្ឆិកា",
     "December" : "ខែធ្នូ",
+    "Jan." : "មករា",
+    "Feb." : "កុម្ភៈ",
+    "Mar." : "មីនា",
+    "Apr." : "មេសា",
+    "May." : "ឧសភា",
+    "Jun." : "មិថុនា",
+    "Jul." : "កក្កដា",
+    "Aug." : "សីហា",
+    "Sep." : "កញ្ញា",
+    "Oct." : "តុលា",
+    "Nov." : "វិច្ឆិកា",
+    "Dec." : "ធ្នូ",
     "Settings" : "ការកំណត់",
     "Saving..." : "កំពុង​រក្សាទុក",
     "No" : "ទេ",
@@ -40,13 +59,13 @@ OC.L10N.register(
     "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
     "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
     "Shared" : "បាន​ចែក​រំលែក",
-    "Share" : "ចែក​រំលែក",
     "Error" : "កំហុស",
     "Error while sharing" : "កំហុស​ពេល​ចែក​រំលែក",
     "Error while unsharing" : "កំពុង​ពេល​លែង​ចែក​រំលែក",
     "Error while changing permissions" : "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ",
     "Shared with you and the group {group} by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
     "Shared with you by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
+    "Share" : "ចែក​រំលែក",
     "Password protect" : "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
     "Password" : "ពាក្យសម្ងាត់",
     "Send" : "ផ្ញើ",
@@ -91,7 +110,6 @@ OC.L10N.register(
     "Log out" : "ចាក​ចេញ",
     "Search" : "ស្វែង​រក",
     "remember" : "ចងចាំ",
-    "Log in" : "ចូល",
     "Alternative Logins" : "ការ​ចូល​ជំនួស"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/km.json b/core/l10n/km.json
index fceb9e6872..b8307fb08d 100644
--- a/core/l10n/km.json
+++ b/core/l10n/km.json
@@ -8,6 +8,13 @@
     "Thursday" : "ថ្ងៃព្រហស្បតិ៍",
     "Friday" : "ថ្ងៃសុក្រ",
     "Saturday" : "ថ្ងៃសៅរ៍",
+    "Sun." : "អាទិត្យ",
+    "Mon." : "ចន្ទ",
+    "Tue." : "អង្គារ",
+    "Wed." : "ពុធ",
+    "Thu." : "ព្រហ.",
+    "Fri." : "សុក្រ",
+    "Sat." : "សៅរ៍",
     "January" : "ខែមករា",
     "February" : "ខែកុម្ភៈ",
     "March" : "ខែមីនា",
@@ -20,6 +27,18 @@
     "October" : "ខែតុលា",
     "November" : "ខែវិច្ឆិកា",
     "December" : "ខែធ្នូ",
+    "Jan." : "មករា",
+    "Feb." : "កុម្ភៈ",
+    "Mar." : "មីនា",
+    "Apr." : "មេសា",
+    "May." : "ឧសភា",
+    "Jun." : "មិថុនា",
+    "Jul." : "កក្កដា",
+    "Aug." : "សីហា",
+    "Sep." : "កញ្ញា",
+    "Oct." : "តុលា",
+    "Nov." : "វិច្ឆិកា",
+    "Dec." : "ធ្នូ",
     "Settings" : "ការកំណត់",
     "Saving..." : "កំពុង​រក្សាទុក",
     "No" : "ទេ",
@@ -38,13 +57,13 @@
     "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
     "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
     "Shared" : "បាន​ចែក​រំលែក",
-    "Share" : "ចែក​រំលែក",
     "Error" : "កំហុស",
     "Error while sharing" : "កំហុស​ពេល​ចែក​រំលែក",
     "Error while unsharing" : "កំពុង​ពេល​លែង​ចែក​រំលែក",
     "Error while changing permissions" : "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ",
     "Shared with you and the group {group} by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
     "Shared with you by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
+    "Share" : "ចែក​រំលែក",
     "Password protect" : "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
     "Password" : "ពាក្យសម្ងាត់",
     "Send" : "ផ្ញើ",
@@ -89,7 +108,6 @@
     "Log out" : "ចាក​ចេញ",
     "Search" : "ស្វែង​រក",
     "remember" : "ចងចាំ",
-    "Log in" : "ចូល",
     "Alternative Logins" : "ការ​ចូល​ជំនួស"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/kn.js b/core/l10n/kn.js
index 365a7ddb3f..d4743271ae 100644
--- a/core/l10n/kn.js
+++ b/core/l10n/kn.js
@@ -61,13 +61,13 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "ಪರಿಚಾರಿಕ ಗಣಕವನ್ನು ಪರಿಶೀಲಿಸುವಾಗ ದೋಷವುಂಟಾಗಿದೆ",
     "Shared" : "ಹಂಚಿಕೆಯ",
     "Shared with {recipients}" : "ಹಂಚಿಕೆಯನ್ನು ಪಡೆದವರು {recipients}",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Error" : "ತಪ್ಪಾಗಿದೆ",
     "Error while sharing" : "ಹಂಚುವಾಗ ಏನೊ ಲೋಪವಾಗಿದೆ",
     "Error while unsharing" : " ಹಂಚಿಕೆಯನ್ನು ಹಿಂದೆರುಗಿಸು ಸಂದರ್ಭದಲ್ಲಿ ಲೋಪವಾಗಿದೆ",
     "Error while changing permissions" : "ಅನುಮತಿಗಳನ್ನು ಬದಲಾವಣೆ ಮಾಡುವಾಗ ದೋಷವಾಗಿದೆ",
     "Shared with you and the group {group} by {owner}" : "ನಿಮಗೆ ಮತ್ತು {group} ಗುಂಪಿನೂಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
     "Shared with you by {owner}" : "ನಿಮ್ಮೊಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Share link" : "ಸಂಪರ್ಕ ಕೊಂಡಿಯನ್ನು  ಹಂಚಿಕೊಳ್ಳಬಹುದು",
     "The public link will expire no later than {days} days after it is created" : "ರಚನೆಯಾದ {days} ದಿನಗಳ ನಂತರ ಈ ಸಾರ್ವಜನಿಕ ಸಂಪರ್ಕ ಕೊಂಡಿ ಅಂತ್ಯಗೊಳ್ಳಲಿದೆ",
     "Link" : "ಸಂಪರ್ಕ ಕೊಂಡಿ",
@@ -160,13 +160,10 @@ OC.L10N.register(
     "Log out" : "ಈ ಆವೃತ್ತಿ ಇಂದ ನಿರ್ಗಮಿಸಿ",
     "Search" : "ಹುಡುಕು",
     "Please contact your administrator." : "ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಲು ಕೋರಲಾಗಿದೆ.",
-    "Forgot your password? Reset it!" : "ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು ಮರೆತಿರಾ? ಮರುಹೊಂದಿಸಿ!",
     "remember" : "ನೆನಪಿಡಿ",
     "This ownCloud instance is currently in single user mode." : "ಪ್ರಸ್ತುತ ಕ್ರಮದಲ್ಲಿ, ಈ OwnCloud ನ್ನು ಕೇವಲ ಒಬ್ಬನೇ ಬಳಕೆದಾರ ಮಾತ್ರ ಬಳಸಬಹುದಾಗಿದೆ.",
     "This means only administrators can use the instance." : "ಇದರ ಅರ್ಥ, ಸದ್ಯದ ನಿದರ್ಶನದಲ್ಲಿ ನಿರ್ವಾಹಕರು ಮಾತ್ರ ಬಳಸಬಹುದಾಗಿದೆ.",
     "Thank you for your patience." : "ನಿಮ್ಮ ತಾಳ್ಮೆಗೆ ಧನ್ಯವಾದಗಳು.",
-    "%s will be updated to version %s." : "%s ರ ಆವೃತ್ತಿ %s ನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತದೆ.",
-    "The following apps will be disabled:" : "ಈ ಕೆಳಗಿನ ಕಾರ್ಯಕ್ರಮಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ:",
     "Start update" : "ನವೀಕರಿಣವನ್ನು ಆರಂಭಿಸಿ"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/kn.json b/core/l10n/kn.json
index 9e03ebd496..0522fbd957 100644
--- a/core/l10n/kn.json
+++ b/core/l10n/kn.json
@@ -59,13 +59,13 @@
     "Error occurred while checking server setup" : "ಪರಿಚಾರಿಕ ಗಣಕವನ್ನು ಪರಿಶೀಲಿಸುವಾಗ ದೋಷವುಂಟಾಗಿದೆ",
     "Shared" : "ಹಂಚಿಕೆಯ",
     "Shared with {recipients}" : "ಹಂಚಿಕೆಯನ್ನು ಪಡೆದವರು {recipients}",
-    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Error" : "ತಪ್ಪಾಗಿದೆ",
     "Error while sharing" : "ಹಂಚುವಾಗ ಏನೊ ಲೋಪವಾಗಿದೆ",
     "Error while unsharing" : " ಹಂಚಿಕೆಯನ್ನು ಹಿಂದೆರುಗಿಸು ಸಂದರ್ಭದಲ್ಲಿ ಲೋಪವಾಗಿದೆ",
     "Error while changing permissions" : "ಅನುಮತಿಗಳನ್ನು ಬದಲಾವಣೆ ಮಾಡುವಾಗ ದೋಷವಾಗಿದೆ",
     "Shared with you and the group {group} by {owner}" : "ನಿಮಗೆ ಮತ್ತು {group} ಗುಂಪಿನೂಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
     "Shared with you by {owner}" : "ನಿಮ್ಮೊಂದಿಗೆ {owner} ಹಂಚಿಕೊಂಡಿದ್ದಾರೆ",
+    "Share" : "ಹಂಚಿಕೊಳ್ಳಿ",
     "Share link" : "ಸಂಪರ್ಕ ಕೊಂಡಿಯನ್ನು  ಹಂಚಿಕೊಳ್ಳಬಹುದು",
     "The public link will expire no later than {days} days after it is created" : "ರಚನೆಯಾದ {days} ದಿನಗಳ ನಂತರ ಈ ಸಾರ್ವಜನಿಕ ಸಂಪರ್ಕ ಕೊಂಡಿ ಅಂತ್ಯಗೊಳ್ಳಲಿದೆ",
     "Link" : "ಸಂಪರ್ಕ ಕೊಂಡಿ",
@@ -158,13 +158,10 @@
     "Log out" : "ಈ ಆವೃತ್ತಿ ಇಂದ ನಿರ್ಗಮಿಸಿ",
     "Search" : "ಹುಡುಕು",
     "Please contact your administrator." : "ನಿಮ್ಮ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಲು ಕೋರಲಾಗಿದೆ.",
-    "Forgot your password? Reset it!" : "ನಿಮ್ಮ ಗುಪ್ತಪದವನ್ನು ಮರೆತಿರಾ? ಮರುಹೊಂದಿಸಿ!",
     "remember" : "ನೆನಪಿಡಿ",
     "This ownCloud instance is currently in single user mode." : "ಪ್ರಸ್ತುತ ಕ್ರಮದಲ್ಲಿ, ಈ OwnCloud ನ್ನು ಕೇವಲ ಒಬ್ಬನೇ ಬಳಕೆದಾರ ಮಾತ್ರ ಬಳಸಬಹುದಾಗಿದೆ.",
     "This means only administrators can use the instance." : "ಇದರ ಅರ್ಥ, ಸದ್ಯದ ನಿದರ್ಶನದಲ್ಲಿ ನಿರ್ವಾಹಕರು ಮಾತ್ರ ಬಳಸಬಹುದಾಗಿದೆ.",
     "Thank you for your patience." : "ನಿಮ್ಮ ತಾಳ್ಮೆಗೆ ಧನ್ಯವಾದಗಳು.",
-    "%s will be updated to version %s." : "%s ರ ಆವೃತ್ತಿ %s ನ್ನು ನವೀಕರಿಸಲಾಗುತ್ತದೆ.",
-    "The following apps will be disabled:" : "ಈ ಕೆಳಗಿನ ಕಾರ್ಯಕ್ರಮಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತದೆ:",
     "Start update" : "ನವೀಕರಿಣವನ್ನು ಆರಂಭಿಸಿ"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index c5e4197590..56fe67b553 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "%s 님에게 메일을 보낼 수 없습니다.",
+    "Preparing update" : "업데이트 준비 중",
     "Turned on maintenance mode" : "유지 보수 모드 켜짐",
     "Turned off maintenance mode" : "유지 보수 모드 꺼짐",
     "Maintenance mode is kept active" : "유지 보수 모드가 켜져 있음",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "수리 오류:",
     "Following incompatible apps have been disabled: %s" : "다음 호환되지 않는 앱이 비활성화되었습니다: %s",
     "Following apps have been disabled: %s" : "다음 앱이 비활성화되었습니다: %s",
+    "Already up to date" : "최신 상태임",
+    "File is too big" : "파일이 너무 큼",
     "Invalid file provided" : "잘못된 파일 지정됨",
     "No image or file provided" : "사진이나 파일이 없음",
     "Unknown filetype" : "알려지지 않은 파일 형식",
@@ -28,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "목요일",
     "Friday" : "금요일",
     "Saturday" : "토요일",
+    "Sun." : "일",
+    "Mon." : "월",
+    "Tue." : "화",
+    "Wed." : "수",
+    "Thu." : "목",
+    "Fri." : "금",
+    "Sat." : "토",
+    "Su" : "일",
+    "Mo" : "월",
+    "Tu" : "화",
+    "We" : "수",
+    "Th" : "목",
+    "Fr" : "금",
+    "Sa" : "토",
     "January" : "1월",
     "February" : "2월",
     "March" : "3월",
@@ -40,6 +57,18 @@ OC.L10N.register(
     "October" : "10월",
     "November" : "11월",
     "December" : "12월",
+    "Jan." : "1월",
+    "Feb." : "2월",
+    "Mar." : "3월",
+    "Apr." : "4월",
+    "May." : "5월",
+    "Jun." : "6월",
+    "Jul." : "7월",
+    "Aug." : "8월",
+    "Sep." : "9월",
+    "Oct." : "10월",
+    "Nov." : "11월",
+    "Dec." : "12월",
     "Settings" : "설정",
     "Saving..." : "저장 중...",
     "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
@@ -75,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "인터넷에서 데이터 디렉터리와 파일에 접근할 수 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 직접 접근할 수 없도록 하거나, 데이터 디렉터리를 웹 서버 문서 경로 바깥에 두십시오.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "메모리 캐시가 설정되지 않았습니다. 성능을 향상시키려면 사용 가능한 경우 메모리 캐시를 설정하십시오. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "PHP에서 /dev/urandom을 읽을 수 없으며, 보안상의 이유로 권장되지 않습니다. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "사용하고 있는 PHP 버전({version})은 더 이상 <a href=\"{phpLink}\">PHP에서 지원하지 않습니다.</a> PHP를 업그레이드하여 성능 및 보안 개선을 누리십시오.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "역방향 프록시 헤더 설정이 잘못되었거나, 신뢰할 수 있는 프록시에서 ownCloud에 접근하고 있습니다. 신뢰할 수 있는 프록시에서 ownCloud에 접근하는 것이 아니라면, 이 상황은 보안 문제이며 공격자가 ownCloud에 접근하는 IP 주소를 속일 수 있습니다. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
     "Error occurred while checking server setup" : "서버 설정을 확인하는 중 오류 발생",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 헤더가 \"{expected}\"와(과) 같이 설정되지 않았습니다. 잠재적인 보안 위협이 될 수 있으므로 설정을 변경하는 것을 추천합니다.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP 헤더 \"Strict-Transport-Security\"가 최소한 \"{seconds}\"초 이상으로 설정되어야 합니다. 강화된 보안을 위해서 <a href=\"{docUrl}\">보안 팁</a>에 나타난 것처럼 HSTS를 활성화하는 것을 추천합니다.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "이 사이트를 HTTP로 접근하고 있습니다. <a href=\"{docUrl}\">보안 팁</a>에 나타난 것처럼 서버 설정을 변경하여 HTTPS를 사용하는 것을 강력히 추천합니다.",
     "Shared" : "공유됨",
     "Shared with {recipients}" : "{recipients} 님과 공유됨",
-    "Share" : "공유",
     "Error" : "오류",
     "Error while sharing" : "공유하는 중 오류 발생",
     "Error while unsharing" : "공유 해제하는 중 오류 발생",
@@ -90,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "{owner} 님이 공유 중",
     "Share with users or groups …" : "사용자 및 그룹과 공유...",
     "Share with users, groups or remote users …" : "사용자, 그룹 및 원격 사용자와 공유...",
+    "Share" : "공유",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/owncloud 형식으로 다른 ownCloud 사용자와 공유할 수 있습니다",
     "Share link" : "링크 공유",
     "The public link will expire no later than {days} days after it is created" : "공개 링크를 만든 후 최대 {days}일까지 유지됩니다",
@@ -143,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "업데이트가 성공하였습니다. 일부 경고가 있습니다.",
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "Couldn't reset password because the token is invalid" : "토큰이 잘못되었기 때문에 암호를 초기화할 수 없습니다",
+    "Couldn't reset password because the token is expired" : "토큰이 만료되어 암호를 초기화할 수 없습니다",
     "Couldn't send reset email. Please make sure your username is correct." : "재설정 메일을 보낼 수 없습니다. 사용자 이름이 올바른지 확인하십시오.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "해당 사용자 이름에 등록된 이메일 주소가 없어서 재설정 메일을 보낼 수 없습니다. 관리자에게 문의하십시오.",
     "%s password reset" : "%s 암호 재설정",
@@ -216,9 +248,9 @@ OC.L10N.register(
     "Please contact your administrator." : "관리자에게 문의하십시오.",
     "An internal error occured." : "내부 오류가 발생하였습니다.",
     "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.",
-    "Forgot your password? Reset it!" : "암호를 잊으셨나요? 재설정하세요!",
-    "remember" : "기억하기",
     "Log in" : "로그인",
+    "Wrong password. Reset it?" : "암호가 잘못되었습니다. 다시 설정하시겠습니까?",
+    "remember" : "기억하기",
     "Alternative Logins" : "대체 로그인",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "안녕하세요,<br><br>%s 님이 <strong>%s</strong>을(를) 공유하였음을 알려 드립니다.<br><a href=\"%s\">보러 가기!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ownCloud 인스턴스가 현재 단일 사용자 모드로 동작 중입니다.",
@@ -229,8 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "관리자에게 연락해 주십시오. 만약 이 인스턴스 관리자라면 config/config.php에서 \"trusted_domain\" 설정을 편집하십시오. 예제 설정 파일은 config/config.sample.php에 있습니다.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "설정에 따라서 관리자 권한으로 아래 단추를 눌러서 이 도메인을 신뢰하도록 설정할 수 있습니다.",
     "Add \"%s\" as trusted domain" : "\"%s\"을(를) 신뢰할 수 있는 도메인으로 추가",
-    "%s will be updated to version %s." : "%s이(가) 버전 %s(으)로 업데이트될 것입니다.",
-    "The following apps will be disabled:" : "다음 앱이 비활성화됩니다:",
+    "App update required" : "앱 업데이트 필요",
+    "%s will be updated to version %s" : "%s 앱을 버전 %s(으)로 업데이트합니다",
+    "These apps will be updated:" : "다음 앱을 업데이트합니다:",
+    "These incompatible apps will be disabled:" : "다음 호환되지 않는 앱이 비활성화됩니다:",
     "The theme %s has been disabled." : "%s 테마가 비활성화되었습니다.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "계속하기 전에 데이터베이스, 설정 폴더, 데이터 폴더가 백업되어 있는지 확인하십시오.",
     "Start update" : "업데이트 시작",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index 2a96b77b81..1e1f427ecb 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "%s 님에게 메일을 보낼 수 없습니다.",
+    "Preparing update" : "업데이트 준비 중",
     "Turned on maintenance mode" : "유지 보수 모드 켜짐",
     "Turned off maintenance mode" : "유지 보수 모드 꺼짐",
     "Maintenance mode is kept active" : "유지 보수 모드가 켜져 있음",
@@ -11,6 +12,8 @@
     "Repair error: " : "수리 오류:",
     "Following incompatible apps have been disabled: %s" : "다음 호환되지 않는 앱이 비활성화되었습니다: %s",
     "Following apps have been disabled: %s" : "다음 앱이 비활성화되었습니다: %s",
+    "Already up to date" : "최신 상태임",
+    "File is too big" : "파일이 너무 큼",
     "Invalid file provided" : "잘못된 파일 지정됨",
     "No image or file provided" : "사진이나 파일이 없음",
     "Unknown filetype" : "알려지지 않은 파일 형식",
@@ -26,6 +29,20 @@
     "Thursday" : "목요일",
     "Friday" : "금요일",
     "Saturday" : "토요일",
+    "Sun." : "일",
+    "Mon." : "월",
+    "Tue." : "화",
+    "Wed." : "수",
+    "Thu." : "목",
+    "Fri." : "금",
+    "Sat." : "토",
+    "Su" : "일",
+    "Mo" : "월",
+    "Tu" : "화",
+    "We" : "수",
+    "Th" : "목",
+    "Fr" : "금",
+    "Sa" : "토",
     "January" : "1월",
     "February" : "2월",
     "March" : "3월",
@@ -38,6 +55,18 @@
     "October" : "10월",
     "November" : "11월",
     "December" : "12월",
+    "Jan." : "1월",
+    "Feb." : "2월",
+    "Mar." : "3월",
+    "Apr." : "4월",
+    "May." : "5월",
+    "Jun." : "6월",
+    "Jul." : "7월",
+    "Aug." : "8월",
+    "Sep." : "9월",
+    "Oct." : "10월",
+    "Nov." : "11월",
+    "Dec." : "12월",
     "Settings" : "설정",
     "Saving..." : "저장 중...",
     "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
@@ -73,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "인터넷에서 데이터 디렉터리와 파일에 접근할 수 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 직접 접근할 수 없도록 하거나, 데이터 디렉터리를 웹 서버 문서 경로 바깥에 두십시오.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "메모리 캐시가 설정되지 않았습니다. 성능을 향상시키려면 사용 가능한 경우 메모리 캐시를 설정하십시오. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "PHP에서 /dev/urandom을 읽을 수 없으며, 보안상의 이유로 권장되지 않습니다. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "사용하고 있는 PHP 버전({version})은 더 이상 <a href=\"{phpLink}\">PHP에서 지원하지 않습니다.</a> PHP를 업그레이드하여 성능 및 보안 개선을 누리십시오.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "역방향 프록시 헤더 설정이 잘못되었거나, 신뢰할 수 있는 프록시에서 ownCloud에 접근하고 있습니다. 신뢰할 수 있는 프록시에서 ownCloud에 접근하는 것이 아니라면, 이 상황은 보안 문제이며 공격자가 ownCloud에 접근하는 IP 주소를 속일 수 있습니다. 더 많은 정보를 보려면 <a href=\"{docLink}\">문서</a>를 참고하십시오.",
     "Error occurred while checking server setup" : "서버 설정을 확인하는 중 오류 발생",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 헤더가 \"{expected}\"와(과) 같이 설정되지 않았습니다. 잠재적인 보안 위협이 될 수 있으므로 설정을 변경하는 것을 추천합니다.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP 헤더 \"Strict-Transport-Security\"가 최소한 \"{seconds}\"초 이상으로 설정되어야 합니다. 강화된 보안을 위해서 <a href=\"{docUrl}\">보안 팁</a>에 나타난 것처럼 HSTS를 활성화하는 것을 추천합니다.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "이 사이트를 HTTP로 접근하고 있습니다. <a href=\"{docUrl}\">보안 팁</a>에 나타난 것처럼 서버 설정을 변경하여 HTTPS를 사용하는 것을 강력히 추천합니다.",
     "Shared" : "공유됨",
     "Shared with {recipients}" : "{recipients} 님과 공유됨",
-    "Share" : "공유",
     "Error" : "오류",
     "Error while sharing" : "공유하는 중 오류 발생",
     "Error while unsharing" : "공유 해제하는 중 오류 발생",
@@ -88,6 +118,7 @@
     "Shared with you by {owner}" : "{owner} 님이 공유 중",
     "Share with users or groups …" : "사용자 및 그룹과 공유...",
     "Share with users, groups or remote users …" : "사용자, 그룹 및 원격 사용자와 공유...",
+    "Share" : "공유",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/owncloud 형식으로 다른 ownCloud 사용자와 공유할 수 있습니다",
     "Share link" : "링크 공유",
     "The public link will expire no later than {days} days after it is created" : "공개 링크를 만든 후 최대 {days}일까지 유지됩니다",
@@ -141,6 +172,7 @@
     "The update was successful. There were warnings." : "업데이트가 성공하였습니다. 일부 경고가 있습니다.",
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "Couldn't reset password because the token is invalid" : "토큰이 잘못되었기 때문에 암호를 초기화할 수 없습니다",
+    "Couldn't reset password because the token is expired" : "토큰이 만료되어 암호를 초기화할 수 없습니다",
     "Couldn't send reset email. Please make sure your username is correct." : "재설정 메일을 보낼 수 없습니다. 사용자 이름이 올바른지 확인하십시오.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "해당 사용자 이름에 등록된 이메일 주소가 없어서 재설정 메일을 보낼 수 없습니다. 관리자에게 문의하십시오.",
     "%s password reset" : "%s 암호 재설정",
@@ -214,9 +246,9 @@
     "Please contact your administrator." : "관리자에게 문의하십시오.",
     "An internal error occured." : "내부 오류가 발생하였습니다.",
     "Please try again or contact your administrator." : "다시 시도하거나 관리자에게 연락하십시오.",
-    "Forgot your password? Reset it!" : "암호를 잊으셨나요? 재설정하세요!",
-    "remember" : "기억하기",
     "Log in" : "로그인",
+    "Wrong password. Reset it?" : "암호가 잘못되었습니다. 다시 설정하시겠습니까?",
+    "remember" : "기억하기",
     "Alternative Logins" : "대체 로그인",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "안녕하세요,<br><br>%s 님이 <strong>%s</strong>을(를) 공유하였음을 알려 드립니다.<br><a href=\"%s\">보러 가기!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ownCloud 인스턴스가 현재 단일 사용자 모드로 동작 중입니다.",
@@ -227,8 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "관리자에게 연락해 주십시오. 만약 이 인스턴스 관리자라면 config/config.php에서 \"trusted_domain\" 설정을 편집하십시오. 예제 설정 파일은 config/config.sample.php에 있습니다.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "설정에 따라서 관리자 권한으로 아래 단추를 눌러서 이 도메인을 신뢰하도록 설정할 수 있습니다.",
     "Add \"%s\" as trusted domain" : "\"%s\"을(를) 신뢰할 수 있는 도메인으로 추가",
-    "%s will be updated to version %s." : "%s이(가) 버전 %s(으)로 업데이트될 것입니다.",
-    "The following apps will be disabled:" : "다음 앱이 비활성화됩니다:",
+    "App update required" : "앱 업데이트 필요",
+    "%s will be updated to version %s" : "%s 앱을 버전 %s(으)로 업데이트합니다",
+    "These apps will be updated:" : "다음 앱을 업데이트합니다:",
+    "These incompatible apps will be disabled:" : "다음 호환되지 않는 앱이 비활성화됩니다:",
     "The theme %s has been disabled." : "%s 테마가 비활성화되었습니다.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "계속하기 전에 데이터베이스, 설정 폴더, 데이터 폴더가 백업되어 있는지 확인하십시오.",
     "Start update" : "업데이트 시작",
diff --git a/core/l10n/ku_IQ.js b/core/l10n/ku_IQ.js
index e68c31a1f3..033c0952f0 100644
--- a/core/l10n/ku_IQ.js
+++ b/core/l10n/ku_IQ.js
@@ -7,8 +7,8 @@ OC.L10N.register(
     "Yes" : "بەڵێ",
     "Ok" : "باشە",
     "Cancel" : "لابردن",
-    "Share" : "هاوبەشی کردن",
     "Error" : "هه‌ڵه",
+    "Share" : "هاوبەشی کردن",
     "Password" : "وشەی تێپەربو",
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
diff --git a/core/l10n/ku_IQ.json b/core/l10n/ku_IQ.json
index 587d2cd018..3acb06de04 100644
--- a/core/l10n/ku_IQ.json
+++ b/core/l10n/ku_IQ.json
@@ -5,8 +5,8 @@
     "Yes" : "بەڵێ",
     "Ok" : "باشە",
     "Cancel" : "لابردن",
-    "Share" : "هاوبەشی کردن",
     "Error" : "هه‌ڵه",
+    "Share" : "هاوبەشی کردن",
     "Password" : "وشەی تێپەربو",
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
index 2f383be349..4fa998c42f 100644
--- a/core/l10n/lb.js
+++ b/core/l10n/lb.js
@@ -14,6 +14,13 @@ OC.L10N.register(
     "Thursday" : "Donneschdeg",
     "Friday" : "Freideg",
     "Saturday" : "Samschdeg",
+    "Sun." : "So. ",
+    "Mon." : "Méi.",
+    "Tue." : "Dë.",
+    "Wed." : "Më.",
+    "Thu." : "Do.",
+    "Fri." : "Fr.",
+    "Sat." : "Sa.",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mäerz",
@@ -26,6 +33,18 @@ OC.L10N.register(
     "October" : "Oktober",
     "November" : "November",
     "December" : "Dezember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mäe.",
+    "Apr." : "Abr.",
+    "May." : "Mee",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Astellungen",
     "Saving..." : "Speicheren...",
     "No" : "Nee",
@@ -38,13 +57,13 @@ OC.L10N.register(
     "(all selected)" : "(all ausgewielt)",
     "({count} selected)" : "({count} ausgewielt)",
     "Shared" : "Gedeelt",
-    "Share" : "Deelen",
     "Error" : "Feeler",
     "Error while sharing" : "Feeler beim Deelen",
     "Error while unsharing" : "Feeler beim Annuléiere vum Deelen",
     "Error while changing permissions" : "Feeler beim Ännere vun de Rechter",
     "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
     "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
+    "Share" : "Deelen",
     "Share link" : "Link deelen",
     "Password protect" : "Passwuertgeschützt",
     "Password" : "Passwuert",
@@ -101,8 +120,8 @@ OC.L10N.register(
     "Finishing …" : "Schléissen of ...",
     "Log out" : "Ofmellen",
     "Search" : "Sichen",
-    "remember" : "verhalen",
     "Log in" : "Umellen",
+    "remember" : "verhalen",
     "Alternative Logins" : "Alternativ Umeldungen",
     "Thank you for your patience." : "Merci fir deng Gedold."
 },
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
index 44445e3bda..0a201c98f1 100644
--- a/core/l10n/lb.json
+++ b/core/l10n/lb.json
@@ -12,6 +12,13 @@
     "Thursday" : "Donneschdeg",
     "Friday" : "Freideg",
     "Saturday" : "Samschdeg",
+    "Sun." : "So. ",
+    "Mon." : "Méi.",
+    "Tue." : "Dë.",
+    "Wed." : "Më.",
+    "Thu." : "Do.",
+    "Fri." : "Fr.",
+    "Sat." : "Sa.",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mäerz",
@@ -24,6 +31,18 @@
     "October" : "Oktober",
     "November" : "November",
     "December" : "Dezember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mäe.",
+    "Apr." : "Abr.",
+    "May." : "Mee",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Astellungen",
     "Saving..." : "Speicheren...",
     "No" : "Nee",
@@ -36,13 +55,13 @@
     "(all selected)" : "(all ausgewielt)",
     "({count} selected)" : "({count} ausgewielt)",
     "Shared" : "Gedeelt",
-    "Share" : "Deelen",
     "Error" : "Feeler",
     "Error while sharing" : "Feeler beim Deelen",
     "Error while unsharing" : "Feeler beim Annuléiere vum Deelen",
     "Error while changing permissions" : "Feeler beim Ännere vun de Rechter",
     "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
     "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
+    "Share" : "Deelen",
     "Share link" : "Link deelen",
     "Password protect" : "Passwuertgeschützt",
     "Password" : "Passwuert",
@@ -99,8 +118,8 @@
     "Finishing …" : "Schléissen of ...",
     "Log out" : "Ofmellen",
     "Search" : "Sichen",
-    "remember" : "verhalen",
     "Log in" : "Umellen",
+    "remember" : "verhalen",
     "Alternative Logins" : "Alternativ Umeldungen",
     "Thank you for your patience." : "Merci fir deng Gedold."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
index 64f62a8762..f36b66dcf5 100644
--- a/core/l10n/lt_LT.js
+++ b/core/l10n/lt_LT.js
@@ -18,6 +18,13 @@ OC.L10N.register(
     "Thursday" : "Ketvirtadienis",
     "Friday" : "Penktadienis",
     "Saturday" : "Šeštadienis",
+    "Sun." : "Sk.",
+    "Mon." : "Pr.",
+    "Tue." : "An.",
+    "Wed." : "Tr.",
+    "Thu." : "Kt.",
+    "Fri." : "Pn.",
+    "Sat." : "Št.",
     "January" : "Sausis",
     "February" : "Vasaris",
     "March" : "Kovas",
@@ -30,6 +37,18 @@ OC.L10N.register(
     "October" : "Spalis",
     "November" : "Lapkritis",
     "December" : "Gruodis",
+    "Jan." : "Sau.",
+    "Feb." : "Vas.",
+    "Mar." : "Kov.",
+    "Apr." : "Bal.",
+    "May." : "Geg.",
+    "Jun." : "Bir.",
+    "Jul." : "Lie.",
+    "Aug." : "Rugp.",
+    "Sep." : "Rugs.",
+    "Oct." : "Spa.",
+    "Nov." : "Lap.",
+    "Dec." : "Groud.",
     "Settings" : "Nustatymai",
     "Saving..." : "Saugoma...",
     "No" : "Ne",
@@ -49,13 +68,13 @@ OC.L10N.register(
     "({count} selected)" : "({count} pažymėtų)",
     "Error loading file exists template" : "Klaida įkeliant esančių failų ruošinį",
     "Shared" : "Dalinamasi",
-    "Share" : "Dalintis",
     "Error" : "Klaida",
     "Error while sharing" : "Klaida, dalijimosi metu",
     "Error while unsharing" : "Klaida, kai atšaukiamas dalijimasis",
     "Error while changing permissions" : "Klaida, keičiant privilegijas",
     "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
     "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
+    "Share" : "Dalintis",
     "Share link" : "Dalintis nuoroda",
     "Link" : "Nuoroda",
     "Password protect" : "Apsaugotas slaptažodžiu",
@@ -137,8 +156,8 @@ OC.L10N.register(
     "Search" : "Ieškoti",
     "Server side authentication failed!" : "Autentikacija serveryje nepavyko!",
     "Please contact your administrator." : "Kreipkitės į savo sistemos administratorių.",
-    "remember" : "prisiminti",
     "Log in" : "Prisijungti",
+    "remember" : "prisiminti",
     "Alternative Logins" : "Alternatyvūs prisijungimai",
     "This ownCloud instance is currently in single user mode." : "Ši ownCloud sistema yra vieno naudotojo veiksenoje.",
     "This means only administrators can use the instance." : "Tai reiškia, kad tik administratorius gali naudotis sistema.",
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
index 0dae47445c..5261b7ee07 100644
--- a/core/l10n/lt_LT.json
+++ b/core/l10n/lt_LT.json
@@ -16,6 +16,13 @@
     "Thursday" : "Ketvirtadienis",
     "Friday" : "Penktadienis",
     "Saturday" : "Šeštadienis",
+    "Sun." : "Sk.",
+    "Mon." : "Pr.",
+    "Tue." : "An.",
+    "Wed." : "Tr.",
+    "Thu." : "Kt.",
+    "Fri." : "Pn.",
+    "Sat." : "Št.",
     "January" : "Sausis",
     "February" : "Vasaris",
     "March" : "Kovas",
@@ -28,6 +35,18 @@
     "October" : "Spalis",
     "November" : "Lapkritis",
     "December" : "Gruodis",
+    "Jan." : "Sau.",
+    "Feb." : "Vas.",
+    "Mar." : "Kov.",
+    "Apr." : "Bal.",
+    "May." : "Geg.",
+    "Jun." : "Bir.",
+    "Jul." : "Lie.",
+    "Aug." : "Rugp.",
+    "Sep." : "Rugs.",
+    "Oct." : "Spa.",
+    "Nov." : "Lap.",
+    "Dec." : "Groud.",
     "Settings" : "Nustatymai",
     "Saving..." : "Saugoma...",
     "No" : "Ne",
@@ -47,13 +66,13 @@
     "({count} selected)" : "({count} pažymėtų)",
     "Error loading file exists template" : "Klaida įkeliant esančių failų ruošinį",
     "Shared" : "Dalinamasi",
-    "Share" : "Dalintis",
     "Error" : "Klaida",
     "Error while sharing" : "Klaida, dalijimosi metu",
     "Error while unsharing" : "Klaida, kai atšaukiamas dalijimasis",
     "Error while changing permissions" : "Klaida, keičiant privilegijas",
     "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
     "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
+    "Share" : "Dalintis",
     "Share link" : "Dalintis nuoroda",
     "Link" : "Nuoroda",
     "Password protect" : "Apsaugotas slaptažodžiu",
@@ -135,8 +154,8 @@
     "Search" : "Ieškoti",
     "Server side authentication failed!" : "Autentikacija serveryje nepavyko!",
     "Please contact your administrator." : "Kreipkitės į savo sistemos administratorių.",
-    "remember" : "prisiminti",
     "Log in" : "Prisijungti",
+    "remember" : "prisiminti",
     "Alternative Logins" : "Alternatyvūs prisijungimai",
     "This ownCloud instance is currently in single user mode." : "Ši ownCloud sistema yra vieno naudotojo veiksenoje.",
     "This means only administrators can use the instance." : "Tai reiškia, kad tik administratorius gali naudotis sistema.",
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
index 1abec29f5b..d7905ef30a 100644
--- a/core/l10n/lv.js
+++ b/core/l10n/lv.js
@@ -14,6 +14,13 @@ OC.L10N.register(
     "Thursday" : "Ceturtdiena",
     "Friday" : "Piektdiena",
     "Saturday" : "Sestdiena",
+    "Sun." : "Sv.",
+    "Mon." : "Pr.",
+    "Tue." : "Ot.",
+    "Wed." : "Tr.",
+    "Thu." : "Ce.",
+    "Fri." : "Pk.",
+    "Sat." : "Se.",
     "January" : "Janvāris",
     "February" : "Februāris",
     "March" : "Marts",
@@ -26,6 +33,18 @@ OC.L10N.register(
     "October" : "Oktobris",
     "November" : "Novembris",
     "December" : "Decembris",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mai.",
+    "Jun." : "Jūn.",
+    "Jul." : "Jūl.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Iestatījumi",
     "Saving..." : "Saglabā...",
     "I know what I'm doing" : "Es zinu ko es daru",
@@ -44,13 +63,13 @@ OC.L10N.register(
     "Good password" : "Laba parole",
     "Strong password" : "Lieliska parole",
     "Shared" : "Kopīgs",
-    "Share" : "Dalīties",
     "Error" : "Kļūda",
     "Error while sharing" : "Kļūda, daloties",
     "Error while unsharing" : "Kļūda, beidzot dalīties",
     "Error while changing permissions" : "Kļūda, mainot atļaujas",
     "Shared with you and the group {group} by {owner}" : "{owner} dalījās ar jums un grupu {group}",
     "Shared with you by {owner}" : "{owner} dalījās ar jums",
+    "Share" : "Dalīties",
     "Password protect" : "Aizsargāt ar paroli",
     "Password" : "Parole",
     "Email link to person" : "Sūtīt saiti personai pa e-pastu",
@@ -100,8 +119,8 @@ OC.L10N.register(
     "Finish setup" : "Pabeigt iestatīšanu",
     "Log out" : "Izrakstīties",
     "Search" : "Meklēt",
-    "remember" : "atcerēties",
     "Log in" : "Ierakstīties",
+    "remember" : "atcerēties",
     "Alternative Logins" : "Alternatīvās pieteikšanās"
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
index acbb677e86..49188f77e8 100644
--- a/core/l10n/lv.json
+++ b/core/l10n/lv.json
@@ -12,6 +12,13 @@
     "Thursday" : "Ceturtdiena",
     "Friday" : "Piektdiena",
     "Saturday" : "Sestdiena",
+    "Sun." : "Sv.",
+    "Mon." : "Pr.",
+    "Tue." : "Ot.",
+    "Wed." : "Tr.",
+    "Thu." : "Ce.",
+    "Fri." : "Pk.",
+    "Sat." : "Se.",
     "January" : "Janvāris",
     "February" : "Februāris",
     "March" : "Marts",
@@ -24,6 +31,18 @@
     "October" : "Oktobris",
     "November" : "Novembris",
     "December" : "Decembris",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mai.",
+    "Jun." : "Jūn.",
+    "Jul." : "Jūl.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Iestatījumi",
     "Saving..." : "Saglabā...",
     "I know what I'm doing" : "Es zinu ko es daru",
@@ -42,13 +61,13 @@
     "Good password" : "Laba parole",
     "Strong password" : "Lieliska parole",
     "Shared" : "Kopīgs",
-    "Share" : "Dalīties",
     "Error" : "Kļūda",
     "Error while sharing" : "Kļūda, daloties",
     "Error while unsharing" : "Kļūda, beidzot dalīties",
     "Error while changing permissions" : "Kļūda, mainot atļaujas",
     "Shared with you and the group {group} by {owner}" : "{owner} dalījās ar jums un grupu {group}",
     "Shared with you by {owner}" : "{owner} dalījās ar jums",
+    "Share" : "Dalīties",
     "Password protect" : "Aizsargāt ar paroli",
     "Password" : "Parole",
     "Email link to person" : "Sūtīt saiti personai pa e-pastu",
@@ -98,8 +117,8 @@
     "Finish setup" : "Pabeigt iestatīšanu",
     "Log out" : "Izrakstīties",
     "Search" : "Meklēt",
-    "remember" : "atcerēties",
     "Log in" : "Ierakstīties",
+    "remember" : "atcerēties",
     "Alternative Logins" : "Alternatīvās pieteikšanās"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
index a023e7a676..e960bb4b7f 100644
--- a/core/l10n/mk.js
+++ b/core/l10n/mk.js
@@ -26,6 +26,13 @@ OC.L10N.register(
     "Thursday" : "Четврток",
     "Friday" : "Петок",
     "Saturday" : "Сабота",
+    "Sun." : "Нед.",
+    "Mon." : "Пон.",
+    "Tue." : "Вто.",
+    "Wed." : "Сре.",
+    "Thu." : "Чет.",
+    "Fri." : "Пет.",
+    "Sat." : "Саб.",
     "January" : "Јануари",
     "February" : "Февруари",
     "March" : "Март",
@@ -38,6 +45,18 @@ OC.L10N.register(
     "October" : "Октомври",
     "November" : "Ноември",
     "December" : "Декември",
+    "Jan." : "Јан.",
+    "Feb." : "Фев.",
+    "Mar." : "Мар.",
+    "Apr." : "Апр.",
+    "May." : "Мај.",
+    "Jun." : "Јун.",
+    "Jul." : "Јул.",
+    "Aug." : "Авг.",
+    "Sep." : "Сеп.",
+    "Oct." : "Окт.",
+    "Nov." : "Ное.",
+    "Dec." : "Дек.",
     "Settings" : "Подесувања",
     "Saving..." : "Снимам...",
     "Couldn't send reset email. Please contact your administrator." : "Не можам да истпратам порака за ресетирање. Ве молам контактирајте го вашиот администратор.",
@@ -75,7 +94,6 @@ OC.L10N.register(
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP заглавието \"{header}\" не е конфигурирано да биде еднакво на \"{expected}\". Ова е потенцијално сигурносен ризик и препорачуваме да прилагодат подесувањата.",
     "Shared" : "Споделен",
     "Shared with {recipients}" : "Споделено со {recipients}",
-    "Share" : "Сподели",
     "Error" : "Грешка",
     "Error while sharing" : "Грешка при споделување",
     "Error while unsharing" : "Грешка при прекин на споделување",
@@ -84,6 +102,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Споделено со Вас од {owner}",
     "Share with users or groups …" : "Сподели со корисници или групи ...",
     "Share with users, groups or remote users …" : "Споделено со корисници, групи или оддалечени корисници ...",
+    "Share" : "Сподели",
     "Share link" : "Сподели ја врската",
     "Password protect" : "Заштити со лозинка",
     "Password" : "Лозинка",
@@ -149,8 +168,8 @@ OC.L10N.register(
     "Search" : "Барај",
     "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!",
     "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.",
-    "remember" : "запамти",
     "Log in" : "Најава",
+    "remember" : "запамти",
     "Alternative Logins" : "Алтернативни најавувања",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.",
     "Thank you for your patience." : "Благодариме на вашето трпение."
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
index 419083daf4..722af208b2 100644
--- a/core/l10n/mk.json
+++ b/core/l10n/mk.json
@@ -24,6 +24,13 @@
     "Thursday" : "Четврток",
     "Friday" : "Петок",
     "Saturday" : "Сабота",
+    "Sun." : "Нед.",
+    "Mon." : "Пон.",
+    "Tue." : "Вто.",
+    "Wed." : "Сре.",
+    "Thu." : "Чет.",
+    "Fri." : "Пет.",
+    "Sat." : "Саб.",
     "January" : "Јануари",
     "February" : "Февруари",
     "March" : "Март",
@@ -36,6 +43,18 @@
     "October" : "Октомври",
     "November" : "Ноември",
     "December" : "Декември",
+    "Jan." : "Јан.",
+    "Feb." : "Фев.",
+    "Mar." : "Мар.",
+    "Apr." : "Апр.",
+    "May." : "Мај.",
+    "Jun." : "Јун.",
+    "Jul." : "Јул.",
+    "Aug." : "Авг.",
+    "Sep." : "Сеп.",
+    "Oct." : "Окт.",
+    "Nov." : "Ное.",
+    "Dec." : "Дек.",
     "Settings" : "Подесувања",
     "Saving..." : "Снимам...",
     "Couldn't send reset email. Please contact your administrator." : "Не можам да истпратам порака за ресетирање. Ве молам контактирајте го вашиот администратор.",
@@ -73,7 +92,6 @@
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP заглавието \"{header}\" не е конфигурирано да биде еднакво на \"{expected}\". Ова е потенцијално сигурносен ризик и препорачуваме да прилагодат подесувањата.",
     "Shared" : "Споделен",
     "Shared with {recipients}" : "Споделено со {recipients}",
-    "Share" : "Сподели",
     "Error" : "Грешка",
     "Error while sharing" : "Грешка при споделување",
     "Error while unsharing" : "Грешка при прекин на споделување",
@@ -82,6 +100,7 @@
     "Shared with you by {owner}" : "Споделено со Вас од {owner}",
     "Share with users or groups …" : "Сподели со корисници или групи ...",
     "Share with users, groups or remote users …" : "Споделено со корисници, групи или оддалечени корисници ...",
+    "Share" : "Сподели",
     "Share link" : "Сподели ја врската",
     "Password protect" : "Заштити со лозинка",
     "Password" : "Лозинка",
@@ -147,8 +166,8 @@
     "Search" : "Барај",
     "Server side authentication failed!" : "Автентификацијата на серверската страна е неуспешна!",
     "Please contact your administrator." : "Ве молиме контактирајте го вашиот администратор.",
-    "remember" : "запамти",
     "Log in" : "Најава",
+    "remember" : "запамти",
     "Alternative Logins" : "Алтернативни најавувања",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Контактирајте го вашиот систем администратор до колку оваа порака продолжи да се појавува или пак се појавува ненадејно.",
     "Thank you for your patience." : "Благодариме на вашето трпение."
diff --git a/core/l10n/ms_MY.js b/core/l10n/ms_MY.js
index a6c70c3211..cd2c54abf4 100644
--- a/core/l10n/ms_MY.js
+++ b/core/l10n/ms_MY.js
@@ -8,6 +8,13 @@ OC.L10N.register(
     "Thursday" : "Khamis",
     "Friday" : "Jumaat",
     "Saturday" : "Sabtu",
+    "Sun." : "Ahad",
+    "Mon." : "Isnin",
+    "Tue." : "Selasa",
+    "Wed." : "Rabu ",
+    "Thu." : "Khamis",
+    "Fri." : "Jumaat",
+    "Sat." : "Sabtu",
     "January" : "Januari",
     "February" : "Februari",
     "March" : "Mac",
@@ -20,14 +27,26 @@ OC.L10N.register(
     "October" : "Oktober",
     "November" : "November",
     "December" : "Disember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mac.",
+    "Apr." : "Apr.",
+    "May." : "Mei",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ogos.",
+    "Sep." : "Sept.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dis.",
     "Settings" : "Tetapan",
     "Saving..." : "Simpan...",
     "No" : "Tidak",
     "Yes" : "Ya",
     "Ok" : "Ok",
     "Cancel" : "Batal",
-    "Share" : "Kongsi",
     "Error" : "Ralat",
+    "Share" : "Kongsi",
     "Password" : "Kata laluan",
     "Send" : "Hantar",
     "group" : "kumpulan",
@@ -56,7 +75,6 @@ OC.L10N.register(
     "Finish setup" : "Setup selesai",
     "Log out" : "Log keluar",
     "Search" : "Cari",
-    "remember" : "ingat",
-    "Log in" : "Log masuk"
+    "remember" : "ingat"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json
index 2e41332f77..7e8fa3e085 100644
--- a/core/l10n/ms_MY.json
+++ b/core/l10n/ms_MY.json
@@ -6,6 +6,13 @@
     "Thursday" : "Khamis",
     "Friday" : "Jumaat",
     "Saturday" : "Sabtu",
+    "Sun." : "Ahad",
+    "Mon." : "Isnin",
+    "Tue." : "Selasa",
+    "Wed." : "Rabu ",
+    "Thu." : "Khamis",
+    "Fri." : "Jumaat",
+    "Sat." : "Sabtu",
     "January" : "Januari",
     "February" : "Februari",
     "March" : "Mac",
@@ -18,14 +25,26 @@
     "October" : "Oktober",
     "November" : "November",
     "December" : "Disember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mac.",
+    "Apr." : "Apr.",
+    "May." : "Mei",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ogos.",
+    "Sep." : "Sept.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dis.",
     "Settings" : "Tetapan",
     "Saving..." : "Simpan...",
     "No" : "Tidak",
     "Yes" : "Ya",
     "Ok" : "Ok",
     "Cancel" : "Batal",
-    "Share" : "Kongsi",
     "Error" : "Ralat",
+    "Share" : "Kongsi",
     "Password" : "Kata laluan",
     "Send" : "Hantar",
     "group" : "kumpulan",
@@ -54,7 +73,6 @@
     "Finish setup" : "Setup selesai",
     "Log out" : "Log keluar",
     "Search" : "Cari",
-    "remember" : "ingat",
-    "Log in" : "Log masuk"
+    "remember" : "ingat"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
index a800e908dc..a885e55a22 100644
--- a/core/l10n/my_MM.js
+++ b/core/l10n/my_MM.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "Database password" : "Database စကားဝှက်",
     "Database name" : "Database အမည်",
     "Finish setup" : "တပ်ဆင်ခြင်းပြီးပါပြီ။",
-    "remember" : "မှတ်မိစေသည်",
-    "Log in" : "ဝင်ရောက်ရန်"
+    "remember" : "မှတ်မိစေသည်"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
index 329fd19431..a505042f7e 100644
--- a/core/l10n/my_MM.json
+++ b/core/l10n/my_MM.json
@@ -37,7 +37,6 @@
     "Database password" : "Database စကားဝှက်",
     "Database name" : "Database အမည်",
     "Finish setup" : "တပ်ဆင်ခြင်းပြီးပါပြီ။",
-    "remember" : "မှတ်မိစေသည်",
-    "Log in" : "ဝင်ရောက်ရန်"
+    "remember" : "မှတ်မိစေသည်"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index c01e230ac7..2dc995b2a9 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Klarte ikke å sende mail til følgende brukere: %s",
+    "Preparing update" : "Forbereder oppdatering",
     "Turned on maintenance mode" : "Slo på vedlikeholdsmodus",
     "Turned off maintenance mode" : "Slo av vedlikeholdsmodus",
     "Maintenance mode is kept active" : "Vedlikeholdsmodus blir beholdt aktiv",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "Feil ved reparering: ",
     "Following incompatible apps have been disabled: %s" : "Følgende inkompatible apper har blitt deaktivert: %s",
     "Following apps have been disabled: %s" : "Følgende apper har blitt deaktivert: %s",
+    "Already up to date" : "Allerede oppdatert",
+    "File is too big" : "Filen er for stor",
     "Invalid file provided" : "Ugyldig fil oppgitt",
     "No image or file provided" : "Bilde eller fil ikke angitt",
     "Unknown filetype" : "Ukjent filtype",
@@ -28,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Torsdag",
     "Friday" : "Fredag",
     "Saturday" : "Lørdag",
+    "Sun." : "Sø.",
+    "Mon." : "Ma.",
+    "Tue." : "Ti.",
+    "Wed." : "On.",
+    "Thu." : "To.",
+    "Fri." : "Fr.",
+    "Sat." : "Lø.",
+    "Su" : "Sø",
+    "Mo" : "Ma",
+    "Tu" : "Ti",
+    "We" : "On",
+    "Th" : "To",
+    "Fr" : "Fr",
+    "Sa" : "Lø",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mars",
@@ -40,6 +57,18 @@ OC.L10N.register(
     "October" : "Oktober",
     "November" : "November",
     "December" : "Desember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Des.",
     "Settings" : "Innstillinger",
     "Saving..." : "Lagrer...",
     "Couldn't send reset email. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling. Kontakt administratoren.",
@@ -75,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Intet minne-cache er konfigurert. For å forbedre ytelsen, installer et minne-cache hvis tilgjengelig. Mer informasjon finnes i <a href=\"{docLink}\">dokumentasjonen</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom kan ikke leses av PHP, noe som er sterkt frarådet av sikkerhetshensyn. Mer informasjon finnes i <a href=\"{docLink}\">dokumentasjonen</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Din PHP-versjon ({version}) er ikke <a href=\"{phpLink}\">støttet av PHP</a> lenger. Vi oppfordrer deg til å oppgradere din PHP-versjon for å nyte fordel av ytelses- og sikkerhetsoppdateringer som tilbys av PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Konfigurasjon av reverse proxy-headers er ikke korrekt, eller du aksesserer ownCloud fra en \"trusted proxy\". Hvis du ikke aksesserer ownCloud fra en \"trusted proxy\", er dette en sikkerhetsrisiko som kan la en angriper forfalske IP-addressen sin slik den oppfattes av ownCloud. Mer informasjon i <a href=\"{docLink}\">dokumentasjonen</a>.",
     "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" er ikke konfigurert til minst \"{seconds}\" sekunder. For beste sikkerhet anbefaler vi at HSTS aktiveres som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du aksesserer denne nettsiden via HTTP. Vi anbefaler på det sterkeste at du konfigurerer serveren til å kreve HTTPS i stedet, som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.",
     "Shared" : "Delt",
     "Shared with {recipients}" : "Delt med {recipients}",
-    "Share" : "Del",
     "Error" : "Feil",
     "Error while sharing" : "Feil under deling",
     "Error while unsharing" : "Feil ved oppheving av deling",
@@ -90,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Delt med deg av {owner}",
     "Share with users or groups …" : "Del med brukere eller grupper ...",
     "Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...",
+    "Share" : "Del",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud",
     "Share link" : "Del lenke",
     "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
@@ -143,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Oppdateringen var vellykket. Det oppstod advarsler.",
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
     "Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi token er ugyldig.",
+    "Couldn't reset password because the token is expired" : "Klarte ikke å tilbakestille passordet fordi token er utløpt.",
     "Couldn't send reset email. Please make sure your username is correct." : "Klarte ikke å sende e-post for tilbakestilling av passord. Sjekk at brukernavnet ditt er korrekt.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.",
     "%s password reset" : "%s tilbakestilling av passord",
@@ -216,9 +248,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Vennligst kontakt administratoren din.",
     "An internal error occured." : "Det oppstod en intern feil.",
     "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.",
-    "Forgot your password? Reset it!" : "Glemt passordet ditt? Tilbakestill det!",
-    "remember" : "husk",
     "Log in" : "Logg inn",
+    "Wrong password. Reset it?" : "Feil passord. Nullstille det?",
+    "remember" : "husk",
     "Alternative Logins" : "Alternative innlogginger",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>Dette er en beskjed om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis den!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.",
@@ -229,8 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.",
     "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et tiltrodd domene",
-    "%s will be updated to version %s." : "%s vil bli oppdatert til versjon %s.",
-    "The following apps will be disabled:" : "Følgende apper vil bli deaktivert:",
+    "App update required" : "App-oppdatering kreves",
+    "%s will be updated to version %s" : "%s vil bli oppdatert til versjon %s",
+    "These apps will be updated:" : "Disse appene vil bli oppdatert:",
+    "These incompatible apps will be disabled:" : "Disse ikke-kompatible appene vil bli deaktivert:",
     "The theme %s has been disabled." : "Temaet %s har blitt deaktivert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Forsikre deg om at databasen, config-mappen og datamappen er blitt sikkerhetskopiert før du fortsetter.",
     "Start update" : "Start oppdatering",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index 16828a6427..528913e424 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Klarte ikke å sende mail til følgende brukere: %s",
+    "Preparing update" : "Forbereder oppdatering",
     "Turned on maintenance mode" : "Slo på vedlikeholdsmodus",
     "Turned off maintenance mode" : "Slo av vedlikeholdsmodus",
     "Maintenance mode is kept active" : "Vedlikeholdsmodus blir beholdt aktiv",
@@ -11,6 +12,8 @@
     "Repair error: " : "Feil ved reparering: ",
     "Following incompatible apps have been disabled: %s" : "Følgende inkompatible apper har blitt deaktivert: %s",
     "Following apps have been disabled: %s" : "Følgende apper har blitt deaktivert: %s",
+    "Already up to date" : "Allerede oppdatert",
+    "File is too big" : "Filen er for stor",
     "Invalid file provided" : "Ugyldig fil oppgitt",
     "No image or file provided" : "Bilde eller fil ikke angitt",
     "Unknown filetype" : "Ukjent filtype",
@@ -26,6 +29,20 @@
     "Thursday" : "Torsdag",
     "Friday" : "Fredag",
     "Saturday" : "Lørdag",
+    "Sun." : "Sø.",
+    "Mon." : "Ma.",
+    "Tue." : "Ti.",
+    "Wed." : "On.",
+    "Thu." : "To.",
+    "Fri." : "Fr.",
+    "Sat." : "Lø.",
+    "Su" : "Sø",
+    "Mo" : "Ma",
+    "Tu" : "Ti",
+    "We" : "On",
+    "Th" : "To",
+    "Fr" : "Fr",
+    "Sa" : "Lø",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mars",
@@ -38,6 +55,18 @@
     "October" : "Oktober",
     "November" : "November",
     "December" : "Desember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Des.",
     "Settings" : "Innstillinger",
     "Saving..." : "Lagrer...",
     "Couldn't send reset email. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling. Kontakt administratoren.",
@@ -73,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Datamappen og filene dine er sannsynligvis tilgjengelige fra Internett. .htaccess-filen fungerer ikke. Vi anbefaler sterkt at du konfigurerer web-serveren slik at datamappen ikke kan aksesseres eller at du flytter datamappen ut av web-serverens dokumentrot.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Intet minne-cache er konfigurert. For å forbedre ytelsen, installer et minne-cache hvis tilgjengelig. Mer informasjon finnes i <a href=\"{docLink}\">dokumentasjonen</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom kan ikke leses av PHP, noe som er sterkt frarådet av sikkerhetshensyn. Mer informasjon finnes i <a href=\"{docLink}\">dokumentasjonen</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Din PHP-versjon ({version}) er ikke <a href=\"{phpLink}\">støttet av PHP</a> lenger. Vi oppfordrer deg til å oppgradere din PHP-versjon for å nyte fordel av ytelses- og sikkerhetsoppdateringer som tilbys av PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Konfigurasjon av reverse proxy-headers er ikke korrekt, eller du aksesserer ownCloud fra en \"trusted proxy\". Hvis du ikke aksesserer ownCloud fra en \"trusted proxy\", er dette en sikkerhetsrisiko som kan la en angriper forfalske IP-addressen sin slik den oppfattes av ownCloud. Mer informasjon i <a href=\"{docLink}\">dokumentasjonen</a>.",
     "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP-header \"{header}\" er ikke konfigurert lik \"{expected}\". Dette kan være en sikkerhetsrisiko og vi anbefaler at denne innstillingen endres.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP header \"Strict-Transport-Security\" er ikke konfigurert til minst \"{seconds}\" sekunder. For beste sikkerhet anbefaler vi at HSTS aktiveres som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Du aksesserer denne nettsiden via HTTP. Vi anbefaler på det sterkeste at du konfigurerer serveren til å kreve HTTPS i stedet, som beskrevet i <a href=\"{docUrl}\">sikkerhetstips</a>.",
     "Shared" : "Delt",
     "Shared with {recipients}" : "Delt med {recipients}",
-    "Share" : "Del",
     "Error" : "Feil",
     "Error while sharing" : "Feil under deling",
     "Error while unsharing" : "Feil ved oppheving av deling",
@@ -88,6 +118,7 @@
     "Shared with you by {owner}" : "Delt med deg av {owner}",
     "Share with users or groups …" : "Del med brukere eller grupper ...",
     "Share with users, groups or remote users …" : "Del med brukere, grupper eller eksterne brukere ...",
+    "Share" : "Del",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Del med personer på andre ownCloud-installasjoner med syntaksen brukernavn@example.com/owncloud",
     "Share link" : "Del lenke",
     "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
@@ -141,6 +172,7 @@
     "The update was successful. There were warnings." : "Oppdateringen var vellykket. Det oppstod advarsler.",
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
     "Couldn't reset password because the token is invalid" : "Klarte ikke å tilbakestille passordet fordi token er ugyldig.",
+    "Couldn't reset password because the token is expired" : "Klarte ikke å tilbakestille passordet fordi token er utløpt.",
     "Couldn't send reset email. Please make sure your username is correct." : "Klarte ikke å sende e-post for tilbakestilling av passord. Sjekk at brukernavnet ditt er korrekt.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Klarte ikke å sende e-post for tilbakestilling av passord fordi det ikke finnes noen e-postadresse for dette brukernavnet. Kontakt administratoren din.",
     "%s password reset" : "%s tilbakestilling av passord",
@@ -214,9 +246,9 @@
     "Please contact your administrator." : "Vennligst kontakt administratoren din.",
     "An internal error occured." : "Det oppstod en intern feil.",
     "Please try again or contact your administrator." : "Prøv igjen eller kontakt en administrator.",
-    "Forgot your password? Reset it!" : "Glemt passordet ditt? Tilbakestill det!",
-    "remember" : "husk",
     "Log in" : "Logg inn",
+    "Wrong password. Reset it?" : "Feil passord. Nullstille det?",
+    "remember" : "husk",
     "Alternative Logins" : "Alternative innlogginger",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hei,<br><br>Dette er en beskjed om at %s delte <strong>%s</strong> med deg.<br><a href=\"%s\">Vis den!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.",
@@ -227,8 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.",
     "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et tiltrodd domene",
-    "%s will be updated to version %s." : "%s vil bli oppdatert til versjon %s.",
-    "The following apps will be disabled:" : "Følgende apper vil bli deaktivert:",
+    "App update required" : "App-oppdatering kreves",
+    "%s will be updated to version %s" : "%s vil bli oppdatert til versjon %s",
+    "These apps will be updated:" : "Disse appene vil bli oppdatert:",
+    "These incompatible apps will be disabled:" : "Disse ikke-kompatible appene vil bli deaktivert:",
     "The theme %s has been disabled." : "Temaet %s har blitt deaktivert.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Forsikre deg om at databasen, config-mappen og datamappen er blitt sikkerhetskopiert før du fortsetter.",
     "Start update" : "Start oppdatering",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 5634cf0069..b7606ec84c 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s",
+    "Preparing update" : "Update voorbereiden",
     "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
     "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
     "Maintenance mode is kept active" : "Onderhoudsmodus blijft actief",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "Reparatiefout:",
     "Following incompatible apps have been disabled: %s" : "De volgende incompatibele apps zijn uitgeschakeld: %s",
     "Following apps have been disabled: %s" : "De volgende apps zijn gedeactiveerd: %s",
+    "Already up to date" : "Al bijgewerkt",
+    "File is too big" : "Bestand te groot",
     "Invalid file provided" : "Ongeldig bestand opgegeven",
     "No image or file provided" : "Geen afbeelding of bestand opgegeven",
     "Unknown filetype" : "Onbekend bestandsformaat",
@@ -28,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "donderdag",
     "Friday" : "vrijdag",
     "Saturday" : "zaterdag",
+    "Sun." : "Zon.",
+    "Mon." : "Maa.",
+    "Tue." : "Din.",
+    "Wed." : "Woe.",
+    "Thu." : "Do.",
+    "Fri." : "Vri.",
+    "Sat." : "Zat.",
+    "Su" : "Zo",
+    "Mo" : "Ma",
+    "Tu" : "Di",
+    "We" : "Wo",
+    "Th" : "Do",
+    "Fr" : "Vr",
+    "Sa" : "Za",
     "January" : "januari",
     "February" : "februari",
     "March" : "maart",
@@ -40,6 +57,18 @@ OC.L10N.register(
     "October" : "oktober",
     "November" : "november",
     "December" : "december",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Maa.",
+    "Apr." : "Apr.",
+    "May." : "Mei.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Instellingen",
     "Saving..." : "Opslaan",
     "Couldn't send reset email. Please contact your administrator." : "Kon herstel e-mail niet versturen. Neem contact op met uw beheerder.",
@@ -75,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om uw datadirectory te verplaatsen naar een locatie buiten de document root van de webserver.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a href=\"{docLink}\">documentatie</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom is niet leesbaar door PHP, hetgeen wordt afgeraden wegens beveiligingsredenen. Meer informatie in onze <a href=\"{docLink}\">documentatie</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "UwPHP versie ({version}) wordt niet langer <a href=\"{phpLink}\">ondersteund door PHP</a>. We adviseren u om uw PHP versie te upgraden voor betere prestaties en security updates geleverd door PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "De reverse proxy headerconfiguratie is onjuist, of u hebt toegang tot ownCloud via een vertrouwde proxy. Als u ownCloud niet via een vertrouwde proxy benadert, dan levert dan een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat ownCloud ziet kan spoofen. Meer informatie is te vinden in onze <a href=\"{docLink}\">documentatie</a>.",
     "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd als minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "U bent met deze site verbonden over HTTP. We adviseren met klem uw server zo te configureren dat HTTPS wordt vereist, zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.",
     "Shared" : "Gedeeld",
     "Shared with {recipients}" : "Gedeeld met {recipients}",
-    "Share" : "Delen",
     "Error" : "Fout",
     "Error while sharing" : "Fout tijdens het delen",
     "Error while unsharing" : "Fout tijdens het stoppen met delen",
@@ -90,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Gedeeld met u door {owner}",
     "Share with users or groups …" : "Delen met gebruikers of groepen ...",
     "Share with users, groups or remote users …" : "Delen met gebruikers, groepen of externe gebruikers ...",
+    "Share" : "Delen",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Delen met mensen op andere ownClouds via de syntax gebruikersnaam@voorbeeld.org/owncloud",
     "Share link" : "Deel link",
     "The public link will expire no later than {days} days after it is created" : "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
@@ -143,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "De update is geslaagd. Er zijn wel waarschuwingen.",
     "The update was successful. Redirecting you to ownCloud now." : "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
     "Couldn't reset password because the token is invalid" : "Kon het wachtwoord niet herstellen, omdat het token ongeldig is",
+    "Couldn't reset password because the token is expired" : "Kon het wachtwoord niet herstellen, omdat het token verlopen is",
     "Couldn't send reset email. Please make sure your username is correct." : "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met uw beheerder.",
     "%s password reset" : "%s wachtwoord reset",
@@ -169,7 +201,7 @@ OC.L10N.register(
     "File not found" : "Bestand niet gevonden",
     "The specified document has not been found on the server." : "Het opgegeven document is niet gevonden op deze server.",
     "You can click here to return to %s." : "Klik hier om terug te keren naar %s.",
-    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\n%s deelt %s met u.\nBekijk het hier: %s\n\n",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\n%s deelt %s met u.\nBekijk hier: %s\n\n",
     "The share will expire on %s." : "De share vervalt op %s.",
     "Cheers!" : "Proficiat!",
     "Internal Server Error" : "Interne serverfout",
@@ -216,11 +248,10 @@ OC.L10N.register(
     "Please contact your administrator." : "Neem contact op met uw systeembeheerder.",
     "An internal error occured." : "Er heeft zich een interne fout voorgedaan.",
     "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.",
-    "Forgot your password? Reset it!" : "Wachtwoord vergeten? Herstel het!",
+    "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?",
     "remember" : "onthoud gegevens",
-    "Log in" : "Meld u aan",
     "Alternative Logins" : "Alternatieve inlogs",
-    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk hier!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
     "This means only administrators can use the instance." : "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Neem contact op met uw systeembeheerder als deze melding aanhoudt of onverwacht verscheen.",
@@ -229,8 +260,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhankelijk van uw configuratie zou u als beheerder ook de onderstaande knop kunnen gebruiken om dit domein te vertrouwen.",
     "Add \"%s\" as trusted domain" : "\"%s\" toevoegen als vertrouwd domein",
-    "%s will be updated to version %s." : "%s wordt bijgewerkt naar versie %s.",
-    "The following apps will be disabled:" : "De volgende apps worden uitgeschakeld:",
+    "App update required" : "Bijwerken App vereist",
+    "%s will be updated to version %s" : "%s wordt bijgewerkt naar versie %s",
+    "These apps will be updated:" : "Deze apps worden bijgewerkt:",
+    "These incompatible apps will be disabled:" : "De volgende incompatibele apps worden uitgeschakeld:",
     "The theme %s has been disabled." : "Het thema %s is uitgeschakeld.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Let erop dat de database, de config map en de data map zijn gebackupped voordat u verder gaat.",
     "Start update" : "Begin de update",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index d106e938bd..1a3b8a40ad 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s",
+    "Preparing update" : "Update voorbereiden",
     "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
     "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
     "Maintenance mode is kept active" : "Onderhoudsmodus blijft actief",
@@ -11,6 +12,8 @@
     "Repair error: " : "Reparatiefout:",
     "Following incompatible apps have been disabled: %s" : "De volgende incompatibele apps zijn uitgeschakeld: %s",
     "Following apps have been disabled: %s" : "De volgende apps zijn gedeactiveerd: %s",
+    "Already up to date" : "Al bijgewerkt",
+    "File is too big" : "Bestand te groot",
     "Invalid file provided" : "Ongeldig bestand opgegeven",
     "No image or file provided" : "Geen afbeelding of bestand opgegeven",
     "Unknown filetype" : "Onbekend bestandsformaat",
@@ -26,6 +29,20 @@
     "Thursday" : "donderdag",
     "Friday" : "vrijdag",
     "Saturday" : "zaterdag",
+    "Sun." : "Zon.",
+    "Mon." : "Maa.",
+    "Tue." : "Din.",
+    "Wed." : "Woe.",
+    "Thu." : "Do.",
+    "Fri." : "Vri.",
+    "Sat." : "Zat.",
+    "Su" : "Zo",
+    "Mo" : "Ma",
+    "Tu" : "Di",
+    "We" : "Wo",
+    "Th" : "Do",
+    "Fr" : "Vr",
+    "Sa" : "Za",
     "January" : "januari",
     "February" : "februari",
     "March" : "maart",
@@ -38,6 +55,18 @@
     "October" : "oktober",
     "November" : "november",
     "December" : "december",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Maa.",
+    "Apr." : "Apr.",
+    "May." : "Mei.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Instellingen",
     "Saving..." : "Opslaan",
     "Couldn't send reset email. Please contact your administrator." : "Kon herstel e-mail niet versturen. Neem contact op met uw beheerder.",
@@ -73,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datadirectory niet bereikbaar is vanaf het internet of om uw datadirectory te verplaatsen naar een locatie buiten de document root van de webserver.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kunt u de memcache configureren als die beschikbaar is. Meer informatie vind u in onze <a href=\"{docLink}\">documentatie</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom is niet leesbaar door PHP, hetgeen wordt afgeraden wegens beveiligingsredenen. Meer informatie in onze <a href=\"{docLink}\">documentatie</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "UwPHP versie ({version}) wordt niet langer <a href=\"{phpLink}\">ondersteund door PHP</a>. We adviseren u om uw PHP versie te upgraden voor betere prestaties en security updates geleverd door PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "De reverse proxy headerconfiguratie is onjuist, of u hebt toegang tot ownCloud via een vertrouwde proxy. Als u ownCloud niet via een vertrouwde proxy benadert, dan levert dan een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat ownCloud ziet kan spoofen. Meer informatie is te vinden in onze <a href=\"{docLink}\">documentatie</a>.",
     "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "De \"{header}\" HTTP header is niet overeenkomstig met \"{expected}\" geconfigureerd. Dit is een potentieel security of privacy risico en we adviseren om deze instelling te wijzigen.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "De \"Strict-Transport-Security\" HTTP header is niet geconfigureerd als minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "U bent met deze site verbonden over HTTP. We adviseren met klem uw server zo te configureren dat HTTPS wordt vereist, zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.",
     "Shared" : "Gedeeld",
     "Shared with {recipients}" : "Gedeeld met {recipients}",
-    "Share" : "Delen",
     "Error" : "Fout",
     "Error while sharing" : "Fout tijdens het delen",
     "Error while unsharing" : "Fout tijdens het stoppen met delen",
@@ -88,6 +118,7 @@
     "Shared with you by {owner}" : "Gedeeld met u door {owner}",
     "Share with users or groups …" : "Delen met gebruikers of groepen ...",
     "Share with users, groups or remote users …" : "Delen met gebruikers, groepen of externe gebruikers ...",
+    "Share" : "Delen",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Delen met mensen op andere ownClouds via de syntax gebruikersnaam@voorbeeld.org/owncloud",
     "Share link" : "Deel link",
     "The public link will expire no later than {days} days after it is created" : "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
@@ -141,6 +172,7 @@
     "The update was successful. There were warnings." : "De update is geslaagd. Er zijn wel waarschuwingen.",
     "The update was successful. Redirecting you to ownCloud now." : "De update is geslaagd. U wordt teruggeleid naar uw eigen ownCloud.",
     "Couldn't reset password because the token is invalid" : "Kon het wachtwoord niet herstellen, omdat het token ongeldig is",
+    "Couldn't reset password because the token is expired" : "Kon het wachtwoord niet herstellen, omdat het token verlopen is",
     "Couldn't send reset email. Please make sure your username is correct." : "Kon e-mail niet versturen. Verifieer of uw gebruikersnaam correct is.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kon geen herstel e-mail versturen, omdat er geen e-mailadres bekend is bij deze gebruikersnaam. Neem contact op met uw beheerder.",
     "%s password reset" : "%s wachtwoord reset",
@@ -167,7 +199,7 @@
     "File not found" : "Bestand niet gevonden",
     "The specified document has not been found on the server." : "Het opgegeven document is niet gevonden op deze server.",
     "You can click here to return to %s." : "Klik hier om terug te keren naar %s.",
-    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\n%s deelt %s met u.\nBekijk het hier: %s\n\n",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\n%s deelt %s met u.\nBekijk hier: %s\n\n",
     "The share will expire on %s." : "De share vervalt op %s.",
     "Cheers!" : "Proficiat!",
     "Internal Server Error" : "Interne serverfout",
@@ -214,11 +246,10 @@
     "Please contact your administrator." : "Neem contact op met uw systeembeheerder.",
     "An internal error occured." : "Er heeft zich een interne fout voorgedaan.",
     "Please try again or contact your administrator." : "Probeer het opnieuw of neem contact op met uw beheerder.",
-    "Forgot your password? Reset it!" : "Wachtwoord vergeten? Herstel het!",
+    "Wrong password. Reset it?" : "Onjuist wachtwoord. Resetten?",
     "remember" : "onthoud gegevens",
-    "Log in" : "Meld u aan",
     "Alternative Logins" : "Alternatieve inlogs",
-    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk hier!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
     "This means only administrators can use the instance." : "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Neem contact op met uw systeembeheerder als deze melding aanhoudt of onverwacht verscheen.",
@@ -227,8 +258,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhankelijk van uw configuratie zou u als beheerder ook de onderstaande knop kunnen gebruiken om dit domein te vertrouwen.",
     "Add \"%s\" as trusted domain" : "\"%s\" toevoegen als vertrouwd domein",
-    "%s will be updated to version %s." : "%s wordt bijgewerkt naar versie %s.",
-    "The following apps will be disabled:" : "De volgende apps worden uitgeschakeld:",
+    "App update required" : "Bijwerken App vereist",
+    "%s will be updated to version %s" : "%s wordt bijgewerkt naar versie %s",
+    "These apps will be updated:" : "Deze apps worden bijgewerkt:",
+    "These incompatible apps will be disabled:" : "De volgende incompatibele apps worden uitgeschakeld:",
     "The theme %s has been disabled." : "Het thema %s is uitgeschakeld.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Let erop dat de database, de config map en de data map zijn gebackupped voordat u verder gaat.",
     "Start update" : "Begin de update",
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
index 21ec7302c7..7466a7d9a9 100644
--- a/core/l10n/nn_NO.js
+++ b/core/l10n/nn_NO.js
@@ -17,6 +17,13 @@ OC.L10N.register(
     "Thursday" : "Torsdag",
     "Friday" : "Fredag",
     "Saturday" : "Laurdag",
+    "Sun." : "Søn.",
+    "Mon." : "Mån.",
+    "Tue." : "Tys.",
+    "Wed." : "Ons.",
+    "Thu." : "Tor.",
+    "Fri." : "Fre.",
+    "Sat." : "Lau.",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mars",
@@ -29,6 +36,18 @@ OC.L10N.register(
     "October" : "Oktober",
     "November" : "November",
     "December" : "Desember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar,",
+    "Apr." : "Apr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Des.",
     "Settings" : "Innstillingar",
     "Saving..." : "Lagrar …",
     "I know what I'm doing" : "Eg veit kva eg gjer",
@@ -50,13 +69,13 @@ OC.L10N.register(
     "Very weak password" : "Veldig svakt passord",
     "Weak password" : "Svakt passord",
     "Shared" : "Delt",
-    "Share" : "Del",
     "Error" : "Feil",
     "Error while sharing" : "Feil ved deling",
     "Error while unsharing" : "Feil ved udeling",
     "Error while changing permissions" : "Feil ved endring av tillatingar",
     "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppa {group} av {owner}",
     "Shared with you by {owner}" : "Delt med deg av {owner}",
+    "Share" : "Del",
     "Share link" : "Del lenkje",
     "Password protect" : "Passordvern",
     "Password" : "Passord",
@@ -109,7 +128,6 @@ OC.L10N.register(
     "Log out" : "Logg ut",
     "Search" : "Søk",
     "remember" : "hugs",
-    "Log in" : "Logg inn",
     "Alternative Logins" : "Alternative innloggingar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json
index d2b7abbe39..ae90139ddc 100644
--- a/core/l10n/nn_NO.json
+++ b/core/l10n/nn_NO.json
@@ -15,6 +15,13 @@
     "Thursday" : "Torsdag",
     "Friday" : "Fredag",
     "Saturday" : "Laurdag",
+    "Sun." : "Søn.",
+    "Mon." : "Mån.",
+    "Tue." : "Tys.",
+    "Wed." : "Ons.",
+    "Thu." : "Tor.",
+    "Fri." : "Fre.",
+    "Sat." : "Lau.",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mars",
@@ -27,6 +34,18 @@
     "October" : "Oktober",
     "November" : "November",
     "December" : "Desember",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar,",
+    "Apr." : "Apr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Des.",
     "Settings" : "Innstillingar",
     "Saving..." : "Lagrar …",
     "I know what I'm doing" : "Eg veit kva eg gjer",
@@ -48,13 +67,13 @@
     "Very weak password" : "Veldig svakt passord",
     "Weak password" : "Svakt passord",
     "Shared" : "Delt",
-    "Share" : "Del",
     "Error" : "Feil",
     "Error while sharing" : "Feil ved deling",
     "Error while unsharing" : "Feil ved udeling",
     "Error while changing permissions" : "Feil ved endring av tillatingar",
     "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppa {group} av {owner}",
     "Shared with you by {owner}" : "Delt med deg av {owner}",
+    "Share" : "Del",
     "Share link" : "Del lenkje",
     "Password protect" : "Passordvern",
     "Password" : "Passord",
@@ -107,7 +126,6 @@
     "Log out" : "Logg ut",
     "Search" : "Søk",
     "remember" : "hugs",
-    "Log in" : "Logg inn",
     "Alternative Logins" : "Alternative innloggingar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
index 0c7d99c8f4..910f5a2265 100644
--- a/core/l10n/oc.js
+++ b/core/l10n/oc.js
@@ -26,6 +26,13 @@ OC.L10N.register(
     "Thursday" : "Dijòus",
     "Friday" : "Divendres",
     "Saturday" : "Dissabte",
+    "Sun." : "Dim.",
+    "Mon." : "Luns.",
+    "Tue." : "Març.",
+    "Wed." : "Mec.",
+    "Thu." : "Jòu.",
+    "Fri." : "Ven.",
+    "Sat." : "Sab.",
     "January" : "genièr",
     "February" : "febrièr",
     "March" : "març",
@@ -38,6 +45,18 @@ OC.L10N.register(
     "October" : "octobre",
     "November" : "novembre",
     "December" : "decembre",
+    "Jan." : "Gen.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ago.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Paramètres",
     "Saving..." : "Enregistrament…",
     "Couldn't send reset email. Please contact your administrator." : "Impossible de mandar lo corrièl de reïnicializacion. Contactatz vòstre administrator.",
@@ -77,7 +96,6 @@ OC.L10N.register(
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'entèsta HTTP \"{header}\" es pas configurada per èsser egala a \"{expected}\" en creant potencialament un risc religat a la seguretat e a la vida privada. Es doncas recomandat d'ajustar aqueste paramètre.",
     "Shared" : "Partejat",
     "Shared with {recipients}" : "Partejat amb {recipients}",
-    "Share" : "Partejar",
     "Error" : "Error",
     "Error while sharing" : "Error al moment de la mesa en partiment",
     "Error while unsharing" : "Error al moment de l'anullacion del partiment",
@@ -86,6 +104,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Partejat amb vos per {owner}",
     "Share with users or groups …" : "Partejar amb d'utilizaires o gropes...",
     "Share with users, groups or remote users …" : "Partejar amb d'utilizaires, gropes, o utilizaires distants",
+    "Share" : "Partejar",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partejatz amb de personas sus d'autres ownClouds en utilizant la sintaxi utilizaire@exemple.com/owncloud",
     "Share link" : "Partejar per ligam public",
     "The public link will expire no later than {days} days after it is created" : "Aqueste ligam public expirarà al mai tard {days} jorns aprèp sa creacion.",
@@ -210,9 +229,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Contactatz vòstre administrator.",
     "An internal error occured." : "Una error intèrna s'es produsida.",
     "Please try again or contact your administrator." : "Reensajatz o contactatz vòstre administrator.",
-    "Forgot your password? Reset it!" : "Senhal doblidat ? Reïnicializatz-lo !",
     "remember" : "se remembrar de ieu",
-    "Log in" : "Connexion",
     "Alternative Logins" : "Identificants alternatius",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjorn,<br><br>Vos informam que %s a partejat <strong>%s</strong> amb vos.<br><a href=\"%s\">Clicatz aicí per i accedir !</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Aquesta instància de ownCloud es actualament en mòde utilizaire unic.",
@@ -223,8 +240,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contactatz vòstre administrator. Se sètz administrator d'aquesta instància, configuratz lo paramètre « trusted_domain » dins lo fichièr config/config.php. Un exemple de configuracion es provesit dins lo fichièr config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En foncion de vòstra configuracion, en tant qu'administrator podètz tanben utilizar lo boton çaijós per aprovar aqueste domeni.",
     "Add \"%s\" as trusted domain" : "Apondre \"%s\" a la lista dels domenis aprovats",
-    "%s will be updated to version %s." : "%s serà mes a jorn cap a la version %s.",
-    "The following apps will be disabled:" : "Las aplicacions seguentas seràn desactivadas :",
     "The theme %s has been disabled." : "Lo tèma %s es estat desactivat.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Asseguratz-vos qu'una còpia de salvament de la banca de donadas, del dorsièr de configuracion (config) e del dorsièr de donadas (data) es estat realizada abans de començar.",
     "Start update" : "Aviar la mesa a jorn",
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
index 2f8433d0db..6c859cd0c7 100644
--- a/core/l10n/oc.json
+++ b/core/l10n/oc.json
@@ -24,6 +24,13 @@
     "Thursday" : "Dijòus",
     "Friday" : "Divendres",
     "Saturday" : "Dissabte",
+    "Sun." : "Dim.",
+    "Mon." : "Luns.",
+    "Tue." : "Març.",
+    "Wed." : "Mec.",
+    "Thu." : "Jòu.",
+    "Fri." : "Ven.",
+    "Sat." : "Sab.",
     "January" : "genièr",
     "February" : "febrièr",
     "March" : "març",
@@ -36,6 +43,18 @@
     "October" : "octobre",
     "November" : "novembre",
     "December" : "decembre",
+    "Jan." : "Gen.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ago.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Paramètres",
     "Saving..." : "Enregistrament…",
     "Couldn't send reset email. Please contact your administrator." : "Impossible de mandar lo corrièl de reïnicializacion. Contactatz vòstre administrator.",
@@ -75,7 +94,6 @@
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "L'entèsta HTTP \"{header}\" es pas configurada per èsser egala a \"{expected}\" en creant potencialament un risc religat a la seguretat e a la vida privada. Es doncas recomandat d'ajustar aqueste paramètre.",
     "Shared" : "Partejat",
     "Shared with {recipients}" : "Partejat amb {recipients}",
-    "Share" : "Partejar",
     "Error" : "Error",
     "Error while sharing" : "Error al moment de la mesa en partiment",
     "Error while unsharing" : "Error al moment de l'anullacion del partiment",
@@ -84,6 +102,7 @@
     "Shared with you by {owner}" : "Partejat amb vos per {owner}",
     "Share with users or groups …" : "Partejar amb d'utilizaires o gropes...",
     "Share with users, groups or remote users …" : "Partejar amb d'utilizaires, gropes, o utilizaires distants",
+    "Share" : "Partejar",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Partejatz amb de personas sus d'autres ownClouds en utilizant la sintaxi utilizaire@exemple.com/owncloud",
     "Share link" : "Partejar per ligam public",
     "The public link will expire no later than {days} days after it is created" : "Aqueste ligam public expirarà al mai tard {days} jorns aprèp sa creacion.",
@@ -208,9 +227,7 @@
     "Please contact your administrator." : "Contactatz vòstre administrator.",
     "An internal error occured." : "Una error intèrna s'es produsida.",
     "Please try again or contact your administrator." : "Reensajatz o contactatz vòstre administrator.",
-    "Forgot your password? Reset it!" : "Senhal doblidat ? Reïnicializatz-lo !",
     "remember" : "se remembrar de ieu",
-    "Log in" : "Connexion",
     "Alternative Logins" : "Identificants alternatius",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Bonjorn,<br><br>Vos informam que %s a partejat <strong>%s</strong> amb vos.<br><a href=\"%s\">Clicatz aicí per i accedir !</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Aquesta instància de ownCloud es actualament en mòde utilizaire unic.",
@@ -221,8 +238,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contactatz vòstre administrator. Se sètz administrator d'aquesta instància, configuratz lo paramètre « trusted_domain » dins lo fichièr config/config.php. Un exemple de configuracion es provesit dins lo fichièr config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En foncion de vòstra configuracion, en tant qu'administrator podètz tanben utilizar lo boton çaijós per aprovar aqueste domeni.",
     "Add \"%s\" as trusted domain" : "Apondre \"%s\" a la lista dels domenis aprovats",
-    "%s will be updated to version %s." : "%s serà mes a jorn cap a la version %s.",
-    "The following apps will be disabled:" : "Las aplicacions seguentas seràn desactivadas :",
     "The theme %s has been disabled." : "Lo tèma %s es estat desactivat.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Asseguratz-vos qu'una còpia de salvament de la banca de donadas, del dorsièr de configuracion (config) e del dorsièr de donadas (data) es estat realizada abans de començar.",
     "Start update" : "Aviar la mesa a jorn",
diff --git a/core/l10n/pa.js b/core/l10n/pa.js
index 49a40a64ed..2fbfabce1b 100644
--- a/core/l10n/pa.js
+++ b/core/l10n/pa.js
@@ -27,8 +27,8 @@ OC.L10N.register(
     "Choose" : "ਚੁਣੋ",
     "Ok" : "ਠੀਕ ਹੈ",
     "Cancel" : "ਰੱਦ ਕਰੋ",
-    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Error" : "ਗਲ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Password" : "ਪਾਸਵਰ",
     "Send" : "ਭੇਜੋ",
     "Warning" : "ਚੇਤਾਵਨੀ",
diff --git a/core/l10n/pa.json b/core/l10n/pa.json
index ef4e2e2327..037c1d9482 100644
--- a/core/l10n/pa.json
+++ b/core/l10n/pa.json
@@ -25,8 +25,8 @@
     "Choose" : "ਚੁਣੋ",
     "Ok" : "ਠੀਕ ਹੈ",
     "Cancel" : "ਰੱਦ ਕਰੋ",
-    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Error" : "ਗਲ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
     "Password" : "ਪਾਸਵਰ",
     "Send" : "ਭੇਜੋ",
     "Warning" : "ਚੇਤਾਵਨੀ",
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index 7bc447bffc..3eda4c2ed9 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -24,6 +24,13 @@ OC.L10N.register(
     "Thursday" : "Czwartek",
     "Friday" : "Piątek",
     "Saturday" : "Sobota",
+    "Sun." : "N.",
+    "Mon." : "Pn.",
+    "Tue." : "Wt.",
+    "Wed." : "Śr.",
+    "Thu." : "Cz.",
+    "Fri." : "Pt.",
+    "Sat." : "S.",
     "January" : "Styczeń",
     "February" : "Luty",
     "March" : "Marzec",
@@ -36,6 +43,18 @@ OC.L10N.register(
     "October" : "Październik",
     "November" : "Listopad",
     "December" : "Grudzień",
+    "Jan." : "Sty.",
+    "Feb." : "Lut.",
+    "Mar." : "Mar.",
+    "Apr." : "Kwi.",
+    "May." : "Maj.",
+    "Jun." : "Cze.",
+    "Jul." : "Lip.",
+    "Aug." : "Sie.",
+    "Sep." : "Wrz.",
+    "Oct." : "Paź.",
+    "Nov." : "Lis.",
+    "Dec." : "Gru.",
     "Settings" : "Ustawienia",
     "Saving..." : "Zapisywanie...",
     "Couldn't send reset email. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Skontaktuj się z administratorem.",
@@ -69,7 +88,6 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera",
     "Shared" : "Udostępniono",
     "Shared with {recipients}" : "Współdzielony z {recipients}",
-    "Share" : "Udostępnij",
     "Error" : "Błąd",
     "Error while sharing" : "Błąd podczas współdzielenia",
     "Error while unsharing" : "Błąd podczas zatrzymywania współdzielenia",
@@ -77,6 +95,7 @@ OC.L10N.register(
     "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
     "Shared with you by {owner}" : "Udostępnione tobie przez {owner}",
     "Share with users or groups …" : "Współdziel z użytkownikami lub grupami",
+    "Share" : "Udostępnij",
     "Share link" : "Udostępnij link",
     "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
     "Link" : "Odnośnik",
@@ -187,9 +206,8 @@ OC.L10N.register(
     "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!",
     "Please contact your administrator." : "Skontaktuj się z administratorem",
     "Please try again or contact your administrator." : "Spróbuj ponownie lub skontaktuj się z administratorem.",
-    "Forgot your password? Reset it!" : "Nie pamiętasz hasła? Zresetuj je!",
-    "remember" : "pamiętaj",
     "Log in" : "Zaloguj",
+    "remember" : "pamiętaj",
     "Alternative Logins" : "Alternatywne loginy",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ta instalacja ownCloud działa obecnie w trybie pojedynczego użytkownika.",
@@ -200,8 +218,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Proszę skontaktuj się z administratorem. Jeśli jesteś administratorem tej instancji, skonfiguruj parametr \"trusted_domain\" w pliku config/config.php. Przykładowa konfiguracja jest dostępna w pliku config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "W zależności od konfiguracji, jako administrator możesz także użyć poniższego przycisku aby zaufać tej domenie.",
     "Add \"%s\" as trusted domain" : "Dodaj \"%s\" jako domenę zaufaną",
-    "%s will be updated to version %s." : "%s zostanie zaktualizowane do wersji %s.",
-    "The following apps will be disabled:" : "Następujące aplikacje zostaną zablokowane:",
     "The theme %s has been disabled." : "Motyw %s został wyłączony.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Proszę się upewnić, że baza danych, folder konfiguracji oraz folder danych zostały zarchiwizowane przed przejściem dalej.",
     "Start update" : "Rozpocznij aktualizację",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index 66f3c36921..94001147b7 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -22,6 +22,13 @@
     "Thursday" : "Czwartek",
     "Friday" : "Piątek",
     "Saturday" : "Sobota",
+    "Sun." : "N.",
+    "Mon." : "Pn.",
+    "Tue." : "Wt.",
+    "Wed." : "Śr.",
+    "Thu." : "Cz.",
+    "Fri." : "Pt.",
+    "Sat." : "S.",
     "January" : "Styczeń",
     "February" : "Luty",
     "March" : "Marzec",
@@ -34,6 +41,18 @@
     "October" : "Październik",
     "November" : "Listopad",
     "December" : "Grudzień",
+    "Jan." : "Sty.",
+    "Feb." : "Lut.",
+    "Mar." : "Mar.",
+    "Apr." : "Kwi.",
+    "May." : "Maj.",
+    "Jun." : "Cze.",
+    "Jul." : "Lip.",
+    "Aug." : "Sie.",
+    "Sep." : "Wrz.",
+    "Oct." : "Paź.",
+    "Nov." : "Lis.",
+    "Dec." : "Gru.",
     "Settings" : "Ustawienia",
     "Saving..." : "Zapisywanie...",
     "Couldn't send reset email. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Skontaktuj się z administratorem.",
@@ -67,7 +86,6 @@
     "Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera",
     "Shared" : "Udostępniono",
     "Shared with {recipients}" : "Współdzielony z {recipients}",
-    "Share" : "Udostępnij",
     "Error" : "Błąd",
     "Error while sharing" : "Błąd podczas współdzielenia",
     "Error while unsharing" : "Błąd podczas zatrzymywania współdzielenia",
@@ -75,6 +93,7 @@
     "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
     "Shared with you by {owner}" : "Udostępnione tobie przez {owner}",
     "Share with users or groups …" : "Współdziel z użytkownikami lub grupami",
+    "Share" : "Udostępnij",
     "Share link" : "Udostępnij link",
     "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
     "Link" : "Odnośnik",
@@ -185,9 +204,8 @@
     "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!",
     "Please contact your administrator." : "Skontaktuj się z administratorem",
     "Please try again or contact your administrator." : "Spróbuj ponownie lub skontaktuj się z administratorem.",
-    "Forgot your password? Reset it!" : "Nie pamiętasz hasła? Zresetuj je!",
-    "remember" : "pamiętaj",
     "Log in" : "Zaloguj",
+    "remember" : "pamiętaj",
     "Alternative Logins" : "Alternatywne loginy",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ta instalacja ownCloud działa obecnie w trybie pojedynczego użytkownika.",
@@ -198,8 +216,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Proszę skontaktuj się z administratorem. Jeśli jesteś administratorem tej instancji, skonfiguruj parametr \"trusted_domain\" w pliku config/config.php. Przykładowa konfiguracja jest dostępna w pliku config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "W zależności od konfiguracji, jako administrator możesz także użyć poniższego przycisku aby zaufać tej domenie.",
     "Add \"%s\" as trusted domain" : "Dodaj \"%s\" jako domenę zaufaną",
-    "%s will be updated to version %s." : "%s zostanie zaktualizowane do wersji %s.",
-    "The following apps will be disabled:" : "Następujące aplikacje zostaną zablokowane:",
     "The theme %s has been disabled." : "Motyw %s został wyłączony.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Proszę się upewnić, że baza danych, folder konfiguracji oraz folder danych zostały zarchiwizowane przed przejściem dalej.",
     "Start update" : "Rozpocznij aktualizację",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 3d4843bcb8..8f1a2878aa 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Não foi possível enviar e-mail para os seguintes usuários: %s",
+    "Preparing update" : "Preparando atualização",
     "Turned on maintenance mode" : "Ativar modo de manutenção",
     "Turned off maintenance mode" : "Desligar o modo de manutenção",
     "Maintenance mode is kept active" : "O modo de manutenção está sendo mantido como ativo",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "Reparação de erro:",
     "Following incompatible apps have been disabled: %s" : "Seguir aplicativos incompatíveis foi desativado: %s",
     "Following apps have been disabled: %s" : "Os seguintes aplicativos foram desabilitados: %s",
+    "Already up to date" : "Já está atualizado",
     "File is too big" : "O arquivo é muito grande",
     "Invalid file provided" : "Arquivo fornecido inválido",
     "No image or file provided" : "Nenhuma imagem ou arquivo fornecido",
@@ -29,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Quinta-feira",
     "Friday" : "Sexta-feira",
     "Saturday" : "Sábado",
+    "Sun." : "Dom.",
+    "Mon." : "Seg.",
+    "Tue." : "Ter.",
+    "Wed." : "Qua.",
+    "Thu." : "Qui.",
+    "Fri." : "Sex.",
+    "Sat." : "Sáb.",
+    "Su" : "Do",
+    "Mo" : "Se",
+    "Tu" : "Te",
+    "We" : "Qa",
+    "Th" : "Qu",
+    "Fr" : "Se",
+    "Sa" : "Sa",
     "January" : "Janeiro",
     "February" : "Fevereiro",
     "March" : "Março",
@@ -41,6 +57,18 @@ OC.L10N.register(
     "October" : "Outubro",
     "November" : "Novembro",
     "December" : "Dezembro",
+    "Jan." : "Jan.",
+    "Feb." : "Fev.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ago.",
+    "Sep." : "Set.",
+    "Oct." : "Out.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Configurações",
     "Saving..." : "Salvando...",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
@@ -76,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "O seu diretório de dados e os arquivos estão, provavelmente, acessíveis a partir da Internet. O arquivo .htaccess não está funcionando. Nós sugerimos que você configure o servidor web de uma forma que o diretório de dados não seja acessível ou mova o diretório de dados para fora do diretório raiz de documentos do servidor web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nenhum cache de memória foi configurado. Para melhorar o seu desempenho, por favor configurar um cache de memória, se disponível. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\"> documentação </a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom não pode ser lido por PHP o que é altamente desencorajado por razões de segurança. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\">documentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A sua versão do PHP ({version}) não é <a href=\"{phpLink}\">suportada pela PHP</a>. Nós o incentivamos a atualizar sua versão do PHP para tirar proveito de atualizações de desempenho e de segurança fornecidos pela PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "A configuração de cabeçalhos do proxy reverso está incorreta, ou você está acessando ownCloud de um proxy confiável. Se você não está acessando ownCloud de um proxy confiável, esta é uma questão de segurança e pode permitir a um invasor falsificar seu endereço IP como visível para ownCloud. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\">documentação</a>.",
     "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O \"{header}\" cabeçalho HTTP não está configurado igual ao \"{expected}\". Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "O cabeçalho \"Transporte-de-Segurança-Restrita\"HTTP não está configurada para menos de \"{seconds}\" segundos. Para uma maior segurança recomendamos a ativação HSTS conforme descrito em nossas  <a href=\"{docUrl}\">dicas de segurança</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Você está acessando este site via HTTP. Nós fortemente sugerimos que você ao invéz, configure o servidor para exigir o uso de HTTPS como descrito em nossas  <a href=\"{docUrl}\">dicas de segurança</a>.",
     "Shared" : "Compartilhados",
     "Shared with {recipients}" : "Compartilhado com {recipients}",
-    "Share" : "Compartilhar",
     "Error" : "Erro",
     "Error while sharing" : "Erro ao compartilhar",
     "Error while unsharing" : "Erro ao descompartilhar",
@@ -91,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Compartilhado com você por {owner}",
     "Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
     "Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
+    "Share" : "Compartilhar",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
     "Share link" : "Compartilhar link",
     "The public link will expire no later than {days} days after it is created" : "O link público irá expirar não antes de {days} depois de ser criado",
@@ -144,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "A atualização foi bem sucedida. Havia advertências.",
     "The update was successful. Redirecting you to ownCloud now." : "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
     "Couldn't reset password because the token is invalid" : "Não foi possível redefinir a senha porque o token é inválido",
+    "Couldn't reset password because the token is expired" : "Não foi possível redefinir a senha porque o token expirou",
     "Couldn't send reset email. Please make sure your username is correct." : "Não foi possível enviar e-mail de redefinição. Verifique se o seu nome de usuário está correto.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
     "%s password reset" : "%s redefinir senha",
@@ -217,9 +248,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Por favor, contate o administrador.",
     "An internal error occured." : "Ocorreu um erro interno.",
     "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.",
-    "Forgot your password? Reset it!" : "Esqueceu sua senha? Redefini-la!",
+    "Log in" : "Entrar",
+    "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?",
     "remember" : "lembrar",
-    "Log in" : "Fazer login",
     "Alternative Logins" : "Logins Alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>só para seu conhecimento que %s compartilhou <strong>%s</strong> com você. <br><a href=\"%s\">Verificar!</a><br><br> ",
     "This ownCloud instance is currently in single user mode." : "Nesta instância ownCloud está em modo de usuário único.",
@@ -230,8 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
     "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio confiavel",
-    "%s will be updated to version %s." : "%s será atualizado para a versão %s.",
-    "The following apps will be disabled:" : "Os seguintes aplicativos serão desativados:",
+    "App update required" : "Atualização de aplicativo é requerida",
+    "%s will be updated to version %s" : "%s será atualizado para a versão %s",
+    "These apps will be updated:" : "Esses aplicativos serão atualizados:",
+    "These incompatible apps will be disabled:" : "Esses aplicativos inconpatíveis serão desabilitados:",
     "The theme %s has been disabled." : "O tema %s foi desativado.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.",
     "Start update" : "Iniciar atualização",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index d4e2fe1fd3..d07686e7bd 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Não foi possível enviar e-mail para os seguintes usuários: %s",
+    "Preparing update" : "Preparando atualização",
     "Turned on maintenance mode" : "Ativar modo de manutenção",
     "Turned off maintenance mode" : "Desligar o modo de manutenção",
     "Maintenance mode is kept active" : "O modo de manutenção está sendo mantido como ativo",
@@ -11,6 +12,7 @@
     "Repair error: " : "Reparação de erro:",
     "Following incompatible apps have been disabled: %s" : "Seguir aplicativos incompatíveis foi desativado: %s",
     "Following apps have been disabled: %s" : "Os seguintes aplicativos foram desabilitados: %s",
+    "Already up to date" : "Já está atualizado",
     "File is too big" : "O arquivo é muito grande",
     "Invalid file provided" : "Arquivo fornecido inválido",
     "No image or file provided" : "Nenhuma imagem ou arquivo fornecido",
@@ -27,6 +29,20 @@
     "Thursday" : "Quinta-feira",
     "Friday" : "Sexta-feira",
     "Saturday" : "Sábado",
+    "Sun." : "Dom.",
+    "Mon." : "Seg.",
+    "Tue." : "Ter.",
+    "Wed." : "Qua.",
+    "Thu." : "Qui.",
+    "Fri." : "Sex.",
+    "Sat." : "Sáb.",
+    "Su" : "Do",
+    "Mo" : "Se",
+    "Tu" : "Te",
+    "We" : "Qa",
+    "Th" : "Qu",
+    "Fr" : "Se",
+    "Sa" : "Sa",
     "January" : "Janeiro",
     "February" : "Fevereiro",
     "March" : "Março",
@@ -39,6 +55,18 @@
     "October" : "Outubro",
     "November" : "Novembro",
     "December" : "Dezembro",
+    "Jan." : "Jan.",
+    "Feb." : "Fev.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ago.",
+    "Sep." : "Set.",
+    "Oct." : "Out.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Configurações",
     "Saving..." : "Salvando...",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
@@ -74,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "O seu diretório de dados e os arquivos estão, provavelmente, acessíveis a partir da Internet. O arquivo .htaccess não está funcionando. Nós sugerimos que você configure o servidor web de uma forma que o diretório de dados não seja acessível ou mova o diretório de dados para fora do diretório raiz de documentos do servidor web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nenhum cache de memória foi configurado. Para melhorar o seu desempenho, por favor configurar um cache de memória, se disponível. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\"> documentação </a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom não pode ser lido por PHP o que é altamente desencorajado por razões de segurança. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\">documentation</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "A sua versão do PHP ({version}) não é <a href=\"{phpLink}\">suportada pela PHP</a>. Nós o incentivamos a atualizar sua versão do PHP para tirar proveito de atualizações de desempenho e de segurança fornecidos pela PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "A configuração de cabeçalhos do proxy reverso está incorreta, ou você está acessando ownCloud de um proxy confiável. Se você não está acessando ownCloud de um proxy confiável, esta é uma questão de segurança e pode permitir a um invasor falsificar seu endereço IP como visível para ownCloud. Mais informações podem ser encontradas em nossa <a href=\"{docLink}\">documentação</a>.",
     "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O \"{header}\" cabeçalho HTTP não está configurado igual ao \"{expected}\". Este é um risco potencial para a segurança e recomendamos ajustar essa configuração.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "O cabeçalho \"Transporte-de-Segurança-Restrita\"HTTP não está configurada para menos de \"{seconds}\" segundos. Para uma maior segurança recomendamos a ativação HSTS conforme descrito em nossas  <a href=\"{docUrl}\">dicas de segurança</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Você está acessando este site via HTTP. Nós fortemente sugerimos que você ao invéz, configure o servidor para exigir o uso de HTTPS como descrito em nossas  <a href=\"{docUrl}\">dicas de segurança</a>.",
     "Shared" : "Compartilhados",
     "Shared with {recipients}" : "Compartilhado com {recipients}",
-    "Share" : "Compartilhar",
     "Error" : "Erro",
     "Error while sharing" : "Erro ao compartilhar",
     "Error while unsharing" : "Erro ao descompartilhar",
@@ -89,6 +118,7 @@
     "Shared with you by {owner}" : "Compartilhado com você por {owner}",
     "Share with users or groups …" : "Compartilhar com usuários ou grupos ...",
     "Share with users, groups or remote users …" : "Compartilhar com usuários, grupos ou usuários remoto ...",
+    "Share" : "Compartilhar",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhar com usuários em outros ownClouds usando a sintaxe username@example.com/owncloud",
     "Share link" : "Compartilhar link",
     "The public link will expire no later than {days} days after it is created" : "O link público irá expirar não antes de {days} depois de ser criado",
@@ -142,6 +172,7 @@
     "The update was successful. There were warnings." : "A atualização foi bem sucedida. Havia advertências.",
     "The update was successful. Redirecting you to ownCloud now." : "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
     "Couldn't reset password because the token is invalid" : "Não foi possível redefinir a senha porque o token é inválido",
+    "Couldn't reset password because the token is expired" : "Não foi possível redefinir a senha porque o token expirou",
     "Couldn't send reset email. Please make sure your username is correct." : "Não foi possível enviar e-mail de redefinição. Verifique se o seu nome de usuário está correto.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
     "%s password reset" : "%s redefinir senha",
@@ -215,9 +246,9 @@
     "Please contact your administrator." : "Por favor, contate o administrador.",
     "An internal error occured." : "Ocorreu um erro interno.",
     "Please try again or contact your administrator." : "Por favor tente novamente ou faça contato com o seu administrador.",
-    "Forgot your password? Reset it!" : "Esqueceu sua senha? Redefini-la!",
+    "Log in" : "Entrar",
+    "Wrong password. Reset it?" : "Senha incorreta. Redefini-la?",
     "remember" : "lembrar",
-    "Log in" : "Fazer login",
     "Alternative Logins" : "Logins Alternativos",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>só para seu conhecimento que %s compartilhou <strong>%s</strong> com você. <br><a href=\"%s\">Verificar!</a><br><br> ",
     "This ownCloud instance is currently in single user mode." : "Nesta instância ownCloud está em modo de usuário único.",
@@ -228,8 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
     "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio confiavel",
-    "%s will be updated to version %s." : "%s será atualizado para a versão %s.",
-    "The following apps will be disabled:" : "Os seguintes aplicativos serão desativados:",
+    "App update required" : "Atualização de aplicativo é requerida",
+    "%s will be updated to version %s" : "%s será atualizado para a versão %s",
+    "These apps will be updated:" : "Esses aplicativos serão atualizados:",
+    "These incompatible apps will be disabled:" : "Esses aplicativos inconpatíveis serão desabilitados:",
     "The theme %s has been disabled." : "O tema %s foi desativado.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.",
     "Start update" : "Iniciar atualização",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index d7d70d4b5d..a5c899a598 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -2,23 +2,28 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Não foi possível enviar a mensagem para os seguintes utilizadores: %s",
+    "Preparing update" : "A preparar atualização",
     "Turned on maintenance mode" : "Ativado o modo de manutenção",
     "Turned off maintenance mode" : "Desativado o modo de manutenção",
+    "Maintenance mode is kept active" : "O modo de manutenção é mantido ativo",
     "Updated database" : "Base de dados atualizada",
     "Checked database schema update" : "Atualização do esquema da base de dados verificada.",
     "Checked database schema update for apps" : "Atualização do esquema da base de dados verificada.",
     "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s",
     "Repair warning: " : "Aviso de reparação:",
-    "Repair error: " : "Repare o erro:",
-    "Following incompatible apps have been disabled: %s" : "As seguintes aplicações incompatíveis foram desativadas: %s",
-    "Invalid file provided" : "Ficheiro selecionado inválido",
+    "Repair error: " : "Corrija o erro:",
+    "Following incompatible apps have been disabled: %s" : "As seguintes apps incompatíveis foram desativadas: %s",
+    "Following apps have been disabled: %s" : "As seguintes apps foram desativadas: %s",
+    "Already up to date" : "Já está atualizado",
+    "File is too big" : "O ficheiro é muito grande",
+    "Invalid file provided" : "Ficheiro indicado inválido",
     "No image or file provided" : "Não foi fornecido nenhum ficheiro ou imagem",
     "Unknown filetype" : "Tipo de ficheiro desconhecido",
     "Invalid image" : "Imagem inválida",
     "No temporary profile picture available, try again" : "Fotografia temporária do perfil indisponível, tente novamente",
     "No crop data provided" : "Não foram fornecidos dados de recorte",
-    "No valid crop data provided" : "Sem dados válidos selecionados",
-    "Crop is not square" : "Recorte não é quadrado",
+    "No valid crop data provided" : "Não foram indicados dados de recorte válidos",
+    "Crop is not square" : "O recorte não é quadrado",
     "Sunday" : "Domingo",
     "Monday" : "Segunda",
     "Tuesday" : "Terça",
@@ -26,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Quinta",
     "Friday" : "Sexta",
     "Saturday" : "Sábado",
+    "Sun." : "Dom.",
+    "Mon." : "Seg.",
+    "Tue." : "Ter.",
+    "Wed." : "Qua.",
+    "Thu." : "Qui.",
+    "Fri." : "Sex.",
+    "Sat." : "Sáb.",
+    "Su" : "Dom",
+    "Mo" : "Seg",
+    "Tu" : "Ter",
+    "We" : "Qua",
+    "Th" : "Qui",
+    "Fr" : "Sex",
+    "Sa" : "Sáb",
     "January" : "Janeiro",
     "February" : "Fevereiro",
     "March" : "Março",
@@ -38,11 +57,23 @@ OC.L10N.register(
     "October" : "Outubro",
     "November" : "Novembro",
     "December" : "Dezembro",
+    "Jan." : "Jan.",
+    "Feb." : "Fev.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ago.",
+    "Sep." : "Set.",
+    "Oct." : "Out.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Definições",
     "Saving..." : "A guardar ...",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.",
-    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A hiperligação para reiniciar a sua senha foi enviada para o seu correio eletrónico. Se não a receber dentro de um tempo aceitável, verifique as suas pastas de span/lixo.<br> Se não a encontrar, pergunte ao seu administrador local.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não ativou a chave de recuperação, não terá nenhum modo para voltar obter os seus dados depois de reiniciar a sua senha. <br />Se não tem a certeza do que fazer, por favor, contacte o seu administrador antes de continuar.<br />  Tem a certeza que quer continuar?",
     "I know what I'm doing" : "Eu sei o que eu estou a fazer",
     "Password can not be changed. Please contact your administrator." : "A palavra-passe não pode ser alterada. Por favor, contacte o seu administrador.",
     "No" : "Não",
@@ -53,11 +84,11 @@ OC.L10N.register(
     "Error loading message template: {error}" : "Ocorreu um erro ao carregar o modelo: {error}",
     "read-only" : "só-de-leitura",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de ficheiro","{count} conflitos de ficheiro"],
-    "One file conflict" : "Um conflito no ficheiro",
+    "One file conflict" : "Um conflito de ficheiro",
     "New Files" : "Ficheiros Novos",
     "Already existing files" : "Ficheiros já existentes",
     "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?",
-    "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
+    "If you select both versions, the copied file will have a number added to its name." : "Se selecionar ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
     "Cancel" : "Cancelar",
     "Continue" : "Continuar",
     "(all selected)" : "(todos selecionados)",
@@ -68,7 +99,7 @@ OC.L10N.register(
     "So-so password" : "Palavra-passe aceitável",
     "Good password" : "Palavra-passe boa",
     "Strong password" : "Palavra-passe forte",
-    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "O seu servidor da Web não está configurado corretamente para permitir a sincronização de ficheiro, porque a interface WebDAV parece estar com problemas.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor ownCloud não tem uma ligação de Internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos, notificações sobre actualizações, ou a instalação de aplicações de terceiros não irá funcionar. Aceder aos ficheiros remotamente e enviar notificações de email poderão não funcionar também. Sugerimos que active uma ligação à Internet se pretende obter todas as funcionalidades do ownCloud.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nenhuma memória de cache foi configurada. Se possível configure-a de forma a optimizar o desempenho. Mais informações podem ser encontradas na <a href=\"{docLink}\">documentação</a>.",
@@ -76,7 +107,6 @@ OC.L10N.register(
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O cabeçalho HTTP \"{header}\" não está configurado para igualar \"{expected}\". Isto é um potencial risco de segurança ou privacidade e recomendamos que o corrija.",
     "Shared" : "Partilhado",
     "Shared with {recipients}" : "Partilhado com {recipients}",
-    "Share" : "Compartilhar",
     "Error" : "Erro",
     "Error while sharing" : "Erro ao partilhar",
     "Error while unsharing" : "Erro ao remover a partilha",
@@ -85,6 +115,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Partilhado consigo por {owner}",
     "Share with users or groups …" : "Partilhar com utilizadores ou grupos...",
     "Share with users, groups or remote users …" : "Partilhar com utilizadores, grupos ou utilizadores remotos...",
+    "Share" : "Compartilhar",
     "Share link" : "Compartilhar hiperligação",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
     "Link" : "Hiperligação",
@@ -130,11 +161,14 @@ OC.L10N.register(
     "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo está {weather}",
     "Hello {name}" : "Olá {name}",
     "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"],
+    "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informação sobre como atualizar.",
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor, recarregue a página.",
     "The update was unsuccessful. " : "Não foi possível atualizar.",
+    "The update was successful. There were warnings." : "A atualização foi bem sucedida. Tem alguns avisos.",
     "The update was successful. Redirecting you to ownCloud now." : "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
     "Couldn't reset password because the token is invalid" : "Não foi possível repor a palavra-passe porque a senha é inválida",
+    "Couldn't reset password because the token is expired" : "Não foi possível repor a palavra-passe porque a senha expirou",
     "Couldn't send reset email. Please make sure your username is correct." : "Ocorreu um problema com o envio do e-mail, por favor confirme o seu utilizador.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.",
     "%s password reset" : "%s reposição da palavra-passe",
@@ -143,6 +177,7 @@ OC.L10N.register(
     "New Password" : "Nova palavra-passe",
     "Reset password" : "Repor palavra-passe",
     "Searching other places" : "A pesquisar noutros lugares",
+    "No search results in other places" : "Nenhuns resultados em outros locais",
     "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado de pesquisa noutros lugares","{count} resultados de pesquisa noutros lugares"],
     "Personal" : "Pessoal",
     "Users" : "Utilizadores",
@@ -185,6 +220,7 @@ OC.L10N.register(
     "Data folder" : "Pasta de dados",
     "Configure the database" : "Configure a base de dados",
     "Only %s is available." : "Só está disponível %s.",
+    "Install and activate additional PHP modules to choose other database types." : "Instale e ative os  módulos PHP adicionais para escolher outros tipos de base de dados.",
     "For more details check out the documentation." : "Para mais detalhes consulte a documentação.",
     "Database user" : "Utilizador da base de dados",
     "Database password" : "Palavra-passe da base de dados",
@@ -206,9 +242,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Por favor contacte o administrador.",
     "An internal error occured." : "Ocorreu um erro interno.",
     "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
-    "Forgot your password? Reset it!" : "Esqueceu-se da sua palavra-passe? Recupere-a!",
+    "Log in" : "Iniciar Sessão",
+    "Wrong password. Reset it?" : "Senha errada. Repô-la?",
     "remember" : "lembrar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Contas de acesso alternativas",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
@@ -219,8 +255,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte o seu administrador. Se é um administrador desta instância, configure as definições \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
     "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio de confiança",
-    "%s will be updated to version %s." : "O %s irá ser atualizado para a versão %s.",
-    "The following apps will be disabled:" : "As seguintes apps irão ser desativadas:",
+    "App update required" : "É necessário atualizar a app",
+    "%s will be updated to version %s" : "%s será atualizada para a versão %s.",
+    "These apps will be updated:" : "Estas apps irão ser atualizadas.",
+    "These incompatible apps will be disabled:" : "Estas apps incompatíveis irão ser desativadas:",
     "The theme %s has been disabled." : "O tema %s foi desativado.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor garanta a cópia de segurança da base de dados e das pastas 'config' e 'data' antes de prosseguir.",
     "Start update" : "Iniciar atualização",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 947eea1a94..736490eb27 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -1,22 +1,27 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Não foi possível enviar a mensagem para os seguintes utilizadores: %s",
+    "Preparing update" : "A preparar atualização",
     "Turned on maintenance mode" : "Ativado o modo de manutenção",
     "Turned off maintenance mode" : "Desativado o modo de manutenção",
+    "Maintenance mode is kept active" : "O modo de manutenção é mantido ativo",
     "Updated database" : "Base de dados atualizada",
     "Checked database schema update" : "Atualização do esquema da base de dados verificada.",
     "Checked database schema update for apps" : "Atualização do esquema da base de dados verificada.",
     "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s",
     "Repair warning: " : "Aviso de reparação:",
-    "Repair error: " : "Repare o erro:",
-    "Following incompatible apps have been disabled: %s" : "As seguintes aplicações incompatíveis foram desativadas: %s",
-    "Invalid file provided" : "Ficheiro selecionado inválido",
+    "Repair error: " : "Corrija o erro:",
+    "Following incompatible apps have been disabled: %s" : "As seguintes apps incompatíveis foram desativadas: %s",
+    "Following apps have been disabled: %s" : "As seguintes apps foram desativadas: %s",
+    "Already up to date" : "Já está atualizado",
+    "File is too big" : "O ficheiro é muito grande",
+    "Invalid file provided" : "Ficheiro indicado inválido",
     "No image or file provided" : "Não foi fornecido nenhum ficheiro ou imagem",
     "Unknown filetype" : "Tipo de ficheiro desconhecido",
     "Invalid image" : "Imagem inválida",
     "No temporary profile picture available, try again" : "Fotografia temporária do perfil indisponível, tente novamente",
     "No crop data provided" : "Não foram fornecidos dados de recorte",
-    "No valid crop data provided" : "Sem dados válidos selecionados",
-    "Crop is not square" : "Recorte não é quadrado",
+    "No valid crop data provided" : "Não foram indicados dados de recorte válidos",
+    "Crop is not square" : "O recorte não é quadrado",
     "Sunday" : "Domingo",
     "Monday" : "Segunda",
     "Tuesday" : "Terça",
@@ -24,6 +29,20 @@
     "Thursday" : "Quinta",
     "Friday" : "Sexta",
     "Saturday" : "Sábado",
+    "Sun." : "Dom.",
+    "Mon." : "Seg.",
+    "Tue." : "Ter.",
+    "Wed." : "Qua.",
+    "Thu." : "Qui.",
+    "Fri." : "Sex.",
+    "Sat." : "Sáb.",
+    "Su" : "Dom",
+    "Mo" : "Seg",
+    "Tu" : "Ter",
+    "We" : "Qua",
+    "Th" : "Qui",
+    "Fr" : "Sex",
+    "Sa" : "Sáb",
     "January" : "Janeiro",
     "February" : "Fevereiro",
     "March" : "Março",
@@ -36,11 +55,23 @@
     "October" : "Outubro",
     "November" : "Novembro",
     "December" : "Dezembro",
+    "Jan." : "Jan.",
+    "Feb." : "Fev.",
+    "Mar." : "Mar.",
+    "Apr." : "Abr.",
+    "May." : "Mai.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Ago.",
+    "Sep." : "Set.",
+    "Oct." : "Out.",
+    "Nov." : "Nov.",
+    "Dec." : "Dez.",
     "Settings" : "Definições",
     "Saving..." : "A guardar ...",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.",
-    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "A hiperligação para reiniciar a sua senha foi enviada para o seu correio eletrónico. Se não a receber dentro de um tempo aceitável, verifique as suas pastas de span/lixo.<br> Se não a encontrar, pergunte ao seu administrador local.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não ativou a chave de recuperação, não terá nenhum modo para voltar obter os seus dados depois de reiniciar a sua senha. <br />Se não tem a certeza do que fazer, por favor, contacte o seu administrador antes de continuar.<br />  Tem a certeza que quer continuar?",
     "I know what I'm doing" : "Eu sei o que eu estou a fazer",
     "Password can not be changed. Please contact your administrator." : "A palavra-passe não pode ser alterada. Por favor, contacte o seu administrador.",
     "No" : "Não",
@@ -51,11 +82,11 @@
     "Error loading message template: {error}" : "Ocorreu um erro ao carregar o modelo: {error}",
     "read-only" : "só-de-leitura",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de ficheiro","{count} conflitos de ficheiro"],
-    "One file conflict" : "Um conflito no ficheiro",
+    "One file conflict" : "Um conflito de ficheiro",
     "New Files" : "Ficheiros Novos",
     "Already existing files" : "Ficheiros já existentes",
     "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?",
-    "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
+    "If you select both versions, the copied file will have a number added to its name." : "Se selecionar ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
     "Cancel" : "Cancelar",
     "Continue" : "Continuar",
     "(all selected)" : "(todos selecionados)",
@@ -66,7 +97,7 @@
     "So-so password" : "Palavra-passe aceitável",
     "Good password" : "Palavra-passe boa",
     "Strong password" : "Palavra-passe forte",
-    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "O seu servidor da Web não está configurado corretamente para permitir a sincronização de ficheiro, porque a interface WebDAV parece estar com problemas.",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "Este servidor ownCloud não tem uma ligação de Internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos, notificações sobre actualizações, ou a instalação de aplicações de terceiros não irá funcionar. Aceder aos ficheiros remotamente e enviar notificações de email poderão não funcionar também. Sugerimos que active uma ligação à Internet se pretende obter todas as funcionalidades do ownCloud.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Nenhuma memória de cache foi configurada. Se possível configure-a de forma a optimizar o desempenho. Mais informações podem ser encontradas na <a href=\"{docLink}\">documentação</a>.",
@@ -74,7 +105,6 @@
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "O cabeçalho HTTP \"{header}\" não está configurado para igualar \"{expected}\". Isto é um potencial risco de segurança ou privacidade e recomendamos que o corrija.",
     "Shared" : "Partilhado",
     "Shared with {recipients}" : "Partilhado com {recipients}",
-    "Share" : "Compartilhar",
     "Error" : "Erro",
     "Error while sharing" : "Erro ao partilhar",
     "Error while unsharing" : "Erro ao remover a partilha",
@@ -83,6 +113,7 @@
     "Shared with you by {owner}" : "Partilhado consigo por {owner}",
     "Share with users or groups …" : "Partilhar com utilizadores ou grupos...",
     "Share with users, groups or remote users …" : "Partilhar com utilizadores, grupos ou utilizadores remotos...",
+    "Share" : "Compartilhar",
     "Share link" : "Compartilhar hiperligação",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
     "Link" : "Hiperligação",
@@ -128,11 +159,14 @@
     "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo está {weather}",
     "Hello {name}" : "Olá {name}",
     "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"],
+    "{version} is available. Get more information on how to update." : "{version} está disponível. Obtenha mais informação sobre como atualizar.",
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor, recarregue a página.",
     "The update was unsuccessful. " : "Não foi possível atualizar.",
+    "The update was successful. There were warnings." : "A atualização foi bem sucedida. Tem alguns avisos.",
     "The update was successful. Redirecting you to ownCloud now." : "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
     "Couldn't reset password because the token is invalid" : "Não foi possível repor a palavra-passe porque a senha é inválida",
+    "Couldn't reset password because the token is expired" : "Não foi possível repor a palavra-passe porque a senha expirou",
     "Couldn't send reset email. Please make sure your username is correct." : "Ocorreu um problema com o envio do e-mail, por favor confirme o seu utilizador.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contacte o administrador.",
     "%s password reset" : "%s reposição da palavra-passe",
@@ -141,6 +175,7 @@
     "New Password" : "Nova palavra-passe",
     "Reset password" : "Repor palavra-passe",
     "Searching other places" : "A pesquisar noutros lugares",
+    "No search results in other places" : "Nenhuns resultados em outros locais",
     "_{count} search result in other places_::_{count} search results in other places_" : ["{count} resultado de pesquisa noutros lugares","{count} resultados de pesquisa noutros lugares"],
     "Personal" : "Pessoal",
     "Users" : "Utilizadores",
@@ -183,6 +218,7 @@
     "Data folder" : "Pasta de dados",
     "Configure the database" : "Configure a base de dados",
     "Only %s is available." : "Só está disponível %s.",
+    "Install and activate additional PHP modules to choose other database types." : "Instale e ative os  módulos PHP adicionais para escolher outros tipos de base de dados.",
     "For more details check out the documentation." : "Para mais detalhes consulte a documentação.",
     "Database user" : "Utilizador da base de dados",
     "Database password" : "Palavra-passe da base de dados",
@@ -204,9 +240,9 @@
     "Please contact your administrator." : "Por favor contacte o administrador.",
     "An internal error occured." : "Ocorreu um erro interno.",
     "Please try again or contact your administrator." : "Por favor tente de novo ou contacte o administrador.",
-    "Forgot your password? Reset it!" : "Esqueceu-se da sua palavra-passe? Recupere-a!",
+    "Log in" : "Iniciar Sessão",
+    "Wrong password. Reset it?" : "Senha errada. Repô-la?",
     "remember" : "lembrar",
-    "Log in" : "Entrar",
     "Alternative Logins" : "Contas de acesso alternativas",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Olá,<br><br>apenas para informar que %s partilhou <strong>%s</strong> consigo.<br><a href=\"%s\">Consulte aqui!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
@@ -217,8 +253,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte o seu administrador. Se é um administrador desta instância, configure as definições \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
     "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio de confiança",
-    "%s will be updated to version %s." : "O %s irá ser atualizado para a versão %s.",
-    "The following apps will be disabled:" : "As seguintes apps irão ser desativadas:",
+    "App update required" : "É necessário atualizar a app",
+    "%s will be updated to version %s" : "%s será atualizada para a versão %s.",
+    "These apps will be updated:" : "Estas apps irão ser atualizadas.",
+    "These incompatible apps will be disabled:" : "Estas apps incompatíveis irão ser desativadas:",
     "The theme %s has been disabled." : "O tema %s foi desativado.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor garanta a cópia de segurança da base de dados e das pastas 'config' e 'data' antes de prosseguir.",
     "Start update" : "Iniciar atualização",
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
index f088f92f3b..054c5fcb18 100644
--- a/core/l10n/ro.js
+++ b/core/l10n/ro.js
@@ -19,6 +19,13 @@ OC.L10N.register(
     "Thursday" : "Joi",
     "Friday" : "Vineri",
     "Saturday" : "Sâmbătă",
+    "Sun." : "Dum.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mie.",
+    "Thu." : "Joi",
+    "Fri." : "Vin.",
+    "Sat." : "Sâm.",
     "January" : "Ianuarie",
     "February" : "Februarie",
     "March" : "Martie",
@@ -31,6 +38,18 @@ OC.L10N.register(
     "October" : "Octombrie",
     "November" : "Noiembrie",
     "December" : "Decembrie",
+    "Jan." : "Ian.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mai",
+    "Jun." : "Iun.",
+    "Jul." : "Iul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Noi.",
+    "Dec." : "Dec.",
     "Settings" : "Setări",
     "Saving..." : "Se salvează...",
     "Couldn't send reset email. Please contact your administrator." : "Expedierea email-ului de resetare a eşuat. Vă rugăm să contactaţi administratorul dvs.",
@@ -58,13 +77,13 @@ OC.L10N.register(
     "Strong password" : "Parolă puternică",
     "Shared" : "Partajat",
     "Shared with {recipients}" : "Partajat cu {recipients}",
-    "Share" : "Partajează",
     "Error" : "Eroare",
     "Error while sharing" : "Eroare la partajare",
     "Error while unsharing" : "Eroare la anularea partajării",
     "Error while changing permissions" : "Eroare la modificarea permisiunilor",
     "Shared with you and the group {group} by {owner}" : "Distribuie cu tine si grupul {group} de {owner}",
     "Shared with you by {owner}" : "Distribuie cu tine de {owner}",
+    "Share" : "Partajează",
     "Share link" : "Share link",
     "The public link will expire no later than {days} days after it is created" : "Legătura publică va expira nu mai târziu de {days} zile de la ziua creării",
     "Link" : "Legătură",
@@ -129,12 +148,9 @@ OC.L10N.register(
     "Finish setup" : "Finalizează instalarea",
     "Log out" : "Ieșire",
     "Search" : "Căutare",
-    "Forgot your password? Reset it!" : "Ți-ai uitat parola? Resetează!",
     "remember" : "amintește",
-    "Log in" : "Autentificare",
     "Alternative Logins" : "Conectări alternative",
     "Thank you for your patience." : "Îți mulțumim pentru răbrade.",
-    "%s will be updated to version %s." : "%s va fi actualizat la versiunea %s.",
     "Start update" : "Începe actualizarea"
 },
 "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
index 702da64e6a..41f9e9ab0f 100644
--- a/core/l10n/ro.json
+++ b/core/l10n/ro.json
@@ -17,6 +17,13 @@
     "Thursday" : "Joi",
     "Friday" : "Vineri",
     "Saturday" : "Sâmbătă",
+    "Sun." : "Dum.",
+    "Mon." : "Lun.",
+    "Tue." : "Mar.",
+    "Wed." : "Mie.",
+    "Thu." : "Joi",
+    "Fri." : "Vin.",
+    "Sat." : "Sâm.",
     "January" : "Ianuarie",
     "February" : "Februarie",
     "March" : "Martie",
@@ -29,6 +36,18 @@
     "October" : "Octombrie",
     "November" : "Noiembrie",
     "December" : "Decembrie",
+    "Jan." : "Ian.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Mai",
+    "Jun." : "Iun.",
+    "Jul." : "Iul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Oct.",
+    "Nov." : "Noi.",
+    "Dec." : "Dec.",
     "Settings" : "Setări",
     "Saving..." : "Se salvează...",
     "Couldn't send reset email. Please contact your administrator." : "Expedierea email-ului de resetare a eşuat. Vă rugăm să contactaţi administratorul dvs.",
@@ -56,13 +75,13 @@
     "Strong password" : "Parolă puternică",
     "Shared" : "Partajat",
     "Shared with {recipients}" : "Partajat cu {recipients}",
-    "Share" : "Partajează",
     "Error" : "Eroare",
     "Error while sharing" : "Eroare la partajare",
     "Error while unsharing" : "Eroare la anularea partajării",
     "Error while changing permissions" : "Eroare la modificarea permisiunilor",
     "Shared with you and the group {group} by {owner}" : "Distribuie cu tine si grupul {group} de {owner}",
     "Shared with you by {owner}" : "Distribuie cu tine de {owner}",
+    "Share" : "Partajează",
     "Share link" : "Share link",
     "The public link will expire no later than {days} days after it is created" : "Legătura publică va expira nu mai târziu de {days} zile de la ziua creării",
     "Link" : "Legătură",
@@ -127,12 +146,9 @@
     "Finish setup" : "Finalizează instalarea",
     "Log out" : "Ieșire",
     "Search" : "Căutare",
-    "Forgot your password? Reset it!" : "Ți-ai uitat parola? Resetează!",
     "remember" : "amintește",
-    "Log in" : "Autentificare",
     "Alternative Logins" : "Conectări alternative",
     "Thank you for your patience." : "Îți mulțumim pentru răbrade.",
-    "%s will be updated to version %s." : "%s va fi actualizat la versiunea %s.",
     "Start update" : "Începe actualizarea"
 },"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
 }
\ No newline at end of file
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 507c37b137..5b114a933f 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Repair error: " : "Ошибка восстановления:",
     "Following incompatible apps have been disabled: %s" : "Следующие несовместимые приложения были отключены: %s",
     "Following apps have been disabled: %s" : "Были отключены следующие приложения: %s",
+    "File is too big" : "Файл слишком большой",
     "Invalid file provided" : "Указан неправильный файл",
     "No image or file provided" : "Не указано изображение или файл",
     "Unknown filetype" : "Неизвестный тип файла",
@@ -28,6 +29,13 @@ OC.L10N.register(
     "Thursday" : "Четверг",
     "Friday" : "Пятница",
     "Saturday" : "Суббота",
+    "Sun." : "Вс.",
+    "Mon." : "Пн.",
+    "Tue." : "Вт.",
+    "Wed." : "Ср.",
+    "Thu." : "Чт.",
+    "Fri." : "Пт.",
+    "Sat." : "Сб.",
     "January" : "Январь",
     "February" : "Февраль",
     "March" : "Март",
@@ -40,6 +48,18 @@ OC.L10N.register(
     "October" : "Октябрь",
     "November" : "Ноябрь",
     "December" : "Декабрь",
+    "Jan." : "Янв.",
+    "Feb." : "Фев.",
+    "Mar." : "Мар.",
+    "Apr." : "Апр.",
+    "May." : "Май.",
+    "Jun." : "Июн.",
+    "Jul." : "Июл.",
+    "Aug." : "Авг.",
+    "Sep." : "Сен.",
+    "Oct." : "Окт.",
+    "Nov." : "Ноя.",
+    "Dec." : "Дек.",
     "Settings" : "Настройки",
     "Saving..." : "Сохранение...",
     "Couldn't send reset email. Please contact your administrator." : "Не удалось отправить письмо для сброса пароля. Пожалуйста, свяжитесь с вашим администратором.",
@@ -75,13 +95,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш каталог данных и ваши файлы возможно доступны из интернете. .htaccess файл не работает. Мы настоятельно рекомендуем вам настроить ваш веб сервер таким образом, что-бы каталог данных не был больше доступен или переместите каталог данных за пределы корня веб сервера.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Не настроена система кеширования. Для увеличения производительности сервера, по возможности, настройте memcache. Более подробную информацию, вы можете посмотреть в нашей <a href=\"{docLink}\">документации</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom не может быть прочитан PHP, что крайне нежелательно по причинам безопасности. Дополнительную информацию можно найти в a href=\"{docLink}\">документации</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ваша версия PHP ({version}) более не <a href=\"{phpLink}\">поддерживается PHP</a>. Мы советуем Вам обновить Вашу версию PHP для получения обновлений производительности и безопасности, предоставляемых PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Конфигурация заголовков обратного прокси сервера некорректна, либо Вы заходите в ownCloud через доверенный прокси. Если Вы не заходите в ownCloud через доверенный прокси, это может быть небезопасно, так как злоумышленник может подменить видимые Owncloud IP-адреса. Более подробную информацию можно найти в нашей <a href=\"{docLink}\">документации</a>.",
     "Error occurred while checking server setup" : "Произошла ошибка при проверке настроек сервера",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Заголовок HTTP \"{header}\" не настроен на ожидаемый \"{expected}\". Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Заголовок HTTP \"Strict-Transport-Security\" должен быть настроен хотя бы на \"{seconds}\" секунд. Для улучшения безопасности мы рекомендуем включить HSTS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Вы зашли на этот сайт через HTTP. Мы настоятельно рекомендуем настроить ваш сервер на использование HTTPS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.",
     "Shared" : "Общий доступ",
     "Shared with {recipients}" : "Вы поделились с {recipients}",
-    "Share" : "Поделиться",
     "Error" : "Ошибка",
     "Error while sharing" : "При попытке поделиться произошла ошибка",
     "Error while unsharing" : "При закрытии доступа произошла ошибка",
@@ -90,6 +111,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "С вами поделился {owner} ",
     "Share with users or groups …" : "Поделиться с пользователями или группами ...",
     "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...",
+    "Share" : "Поделиться",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud",
     "Share link" : "Поделиться ссылкой",
     "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней после её создания",
@@ -216,9 +238,8 @@ OC.L10N.register(
     "Please contact your administrator." : "Пожалуйста, свяжитесь с вашим администратором.",
     "An internal error occured." : "Произошла внутренняя ошибка",
     "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором",
-    "Forgot your password? Reset it!" : "Забыли пароль? Сбросьте его!",
+    "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?",
     "remember" : "запомнить",
-    "Log in" : "Войти",
     "Alternative Logins" : "Альтернативные имена пользователя",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здравствуйте,<br><br>%s поделился с вами <strong>%s</strong>.<br>Перейдите по <a href=\"%s\">ссылке</a>, чтобы посмотреть<br><br>",
     "This ownCloud instance is currently in single user mode." : "Сервер ownCloud в настоящее время работает в однопользовательском режиме.",
@@ -229,8 +250,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, свяжитесь с вашим администратором. Если вы администратор этого сервера, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, как администратор вы можете также внести домен в доверенные с помощью кнопки ниже.",
     "Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен",
-    "%s will be updated to version %s." : "%s будет обновлен до версии %s.",
-    "The following apps will be disabled:" : "Следующие приложения будут отключены:",
     "The theme %s has been disabled." : "Тема %s была отключена.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продолжением убедитесь, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.",
     "Start update" : "Запустить обновление",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index 31558b7c9b..b9b2bc4e1c 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -11,6 +11,7 @@
     "Repair error: " : "Ошибка восстановления:",
     "Following incompatible apps have been disabled: %s" : "Следующие несовместимые приложения были отключены: %s",
     "Following apps have been disabled: %s" : "Были отключены следующие приложения: %s",
+    "File is too big" : "Файл слишком большой",
     "Invalid file provided" : "Указан неправильный файл",
     "No image or file provided" : "Не указано изображение или файл",
     "Unknown filetype" : "Неизвестный тип файла",
@@ -26,6 +27,13 @@
     "Thursday" : "Четверг",
     "Friday" : "Пятница",
     "Saturday" : "Суббота",
+    "Sun." : "Вс.",
+    "Mon." : "Пн.",
+    "Tue." : "Вт.",
+    "Wed." : "Ср.",
+    "Thu." : "Чт.",
+    "Fri." : "Пт.",
+    "Sat." : "Сб.",
     "January" : "Январь",
     "February" : "Февраль",
     "March" : "Март",
@@ -38,6 +46,18 @@
     "October" : "Октябрь",
     "November" : "Ноябрь",
     "December" : "Декабрь",
+    "Jan." : "Янв.",
+    "Feb." : "Фев.",
+    "Mar." : "Мар.",
+    "Apr." : "Апр.",
+    "May." : "Май.",
+    "Jun." : "Июн.",
+    "Jul." : "Июл.",
+    "Aug." : "Авг.",
+    "Sep." : "Сен.",
+    "Oct." : "Окт.",
+    "Nov." : "Ноя.",
+    "Dec." : "Дек.",
     "Settings" : "Настройки",
     "Saving..." : "Сохранение...",
     "Couldn't send reset email. Please contact your administrator." : "Не удалось отправить письмо для сброса пароля. Пожалуйста, свяжитесь с вашим администратором.",
@@ -73,13 +93,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "Ваш каталог данных и ваши файлы возможно доступны из интернете. .htaccess файл не работает. Мы настоятельно рекомендуем вам настроить ваш веб сервер таким образом, что-бы каталог данных не был больше доступен или переместите каталог данных за пределы корня веб сервера.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Не настроена система кеширования. Для увеличения производительности сервера, по возможности, настройте memcache. Более подробную информацию, вы можете посмотреть в нашей <a href=\"{docLink}\">документации</a>.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom не может быть прочитан PHP, что крайне нежелательно по причинам безопасности. Дополнительную информацию можно найти в a href=\"{docLink}\">документации</a>.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Ваша версия PHP ({version}) более не <a href=\"{phpLink}\">поддерживается PHP</a>. Мы советуем Вам обновить Вашу версию PHP для получения обновлений производительности и безопасности, предоставляемых PHP.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Конфигурация заголовков обратного прокси сервера некорректна, либо Вы заходите в ownCloud через доверенный прокси. Если Вы не заходите в ownCloud через доверенный прокси, это может быть небезопасно, так как злоумышленник может подменить видимые Owncloud IP-адреса. Более подробную информацию можно найти в нашей <a href=\"{docLink}\">документации</a>.",
     "Error occurred while checking server setup" : "Произошла ошибка при проверке настроек сервера",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "Заголовок HTTP \"{header}\" не настроен на ожидаемый \"{expected}\". Это потенциальная проблема безопасности и мы рекомендуем изменить эти настройки.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Заголовок HTTP \"Strict-Transport-Security\" должен быть настроен хотя бы на \"{seconds}\" секунд. Для улучшения безопасности мы рекомендуем включить HSTS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Вы зашли на этот сайт через HTTP. Мы настоятельно рекомендуем настроить ваш сервер на использование HTTPS согласно нашим <a href=\"{docUrl}\">подсказкам по безопасности</a>.",
     "Shared" : "Общий доступ",
     "Shared with {recipients}" : "Вы поделились с {recipients}",
-    "Share" : "Поделиться",
     "Error" : "Ошибка",
     "Error while sharing" : "При попытке поделиться произошла ошибка",
     "Error while unsharing" : "При закрытии доступа произошла ошибка",
@@ -88,6 +109,7 @@
     "Shared with you by {owner}" : "С вами поделился {owner} ",
     "Share with users or groups …" : "Поделиться с пользователями или группами ...",
     "Share with users, groups or remote users …" : "Поделиться с пользователями, группами или удаленными пользователями ...",
+    "Share" : "Поделиться",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах ownCloud используя синтакс username@example.com/owncloud",
     "Share link" : "Поделиться ссылкой",
     "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней после её создания",
@@ -214,9 +236,8 @@
     "Please contact your administrator." : "Пожалуйста, свяжитесь с вашим администратором.",
     "An internal error occured." : "Произошла внутренняя ошибка",
     "Please try again or contact your administrator." : "Пожалуйста попробуйте ещё раз или свяжитесь с вашим администратором",
-    "Forgot your password? Reset it!" : "Забыли пароль? Сбросьте его!",
+    "Wrong password. Reset it?" : "Неправильный пароль. Сбросить его?",
     "remember" : "запомнить",
-    "Log in" : "Войти",
     "Alternative Logins" : "Альтернативные имена пользователя",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здравствуйте,<br><br>%s поделился с вами <strong>%s</strong>.<br>Перейдите по <a href=\"%s\">ссылке</a>, чтобы посмотреть<br><br>",
     "This ownCloud instance is currently in single user mode." : "Сервер ownCloud в настоящее время работает в однопользовательском режиме.",
@@ -227,8 +248,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, свяжитесь с вашим администратором. Если вы администратор этого сервера, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, как администратор вы можете также внести домен в доверенные с помощью кнопки ниже.",
     "Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен",
-    "%s will be updated to version %s." : "%s будет обновлен до версии %s.",
-    "The following apps will be disabled:" : "Следующие приложения будут отключены:",
     "The theme %s has been disabled." : "Тема %s была отключена.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продолжением убедитесь, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.",
     "Start update" : "Запустить обновление",
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
index 11e5ef38e5..9be2cb088a 100644
--- a/core/l10n/si_LK.js
+++ b/core/l10n/si_LK.js
@@ -8,6 +8,13 @@ OC.L10N.register(
     "Thursday" : "බ්‍රහස්පතින්දා",
     "Friday" : "සිකුරාදා",
     "Saturday" : "සෙනසුරාදා",
+    "Sun." : "ඉරිදා",
+    "Mon." : "සඳුදා",
+    "Tue." : "අඟ.",
+    "Wed." : "බදාදා",
+    "Thu." : "බ්‍රහස්.",
+    "Fri." : "සිකු.",
+    "Sat." : "සෙන.",
     "January" : "ජනවාරි",
     "February" : "පෙබරවාරි",
     "March" : "මාර්තු",
@@ -20,6 +27,18 @@ OC.L10N.register(
     "October" : "ඔක්තෝබර",
     "November" : "නොවැම්බර්",
     "December" : "දෙසැම්බර්",
+    "Jan." : "ජන.",
+    "Feb." : "පෙබ.",
+    "Mar." : "මාර්තු",
+    "Apr." : "අප්‍රේල්",
+    "May." : "මැයි",
+    "Jun." : "ජුනි",
+    "Jul." : "ජුලි",
+    "Aug." : "අගෝ.",
+    "Sep." : "සැප්.",
+    "Oct." : "ඔක්.",
+    "Nov." : "නොවැ.",
+    "Dec." : "දෙසැ.",
     "Settings" : "සිටුවම්",
     "Saving..." : "සුරැකෙමින් පවතී...",
     "No" : "එපා",
@@ -27,8 +46,8 @@ OC.L10N.register(
     "Choose" : "තෝරන්න",
     "Ok" : "හරි",
     "Cancel" : "එපා",
-    "Share" : "බෙදා හදා ගන්න",
     "Error" : "දෝෂයක්",
+    "Share" : "බෙදා හදා ගන්න",
     "Password protect" : "මුර පදයකින් ආරක්ශාකරන්න",
     "Password" : "මුර පදය",
     "Set expiration date" : "කල් ඉකුත් විමේ දිනය දමන්න",
@@ -63,7 +82,7 @@ OC.L10N.register(
     "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න",
     "Log out" : "නික්මීම",
     "Search" : "සොයන්න",
-    "remember" : "මතක තබාගන්න",
-    "Log in" : "ප්‍රවේශවන්න"
+    "Log in" : "ප්‍රවේශවන්න",
+    "remember" : "මතක තබාගන්න"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
index 5190ce77e8..7626f55acb 100644
--- a/core/l10n/si_LK.json
+++ b/core/l10n/si_LK.json
@@ -6,6 +6,13 @@
     "Thursday" : "බ්‍රහස්පතින්දා",
     "Friday" : "සිකුරාදා",
     "Saturday" : "සෙනසුරාදා",
+    "Sun." : "ඉරිදා",
+    "Mon." : "සඳුදා",
+    "Tue." : "අඟ.",
+    "Wed." : "බදාදා",
+    "Thu." : "බ්‍රහස්.",
+    "Fri." : "සිකු.",
+    "Sat." : "සෙන.",
     "January" : "ජනවාරි",
     "February" : "පෙබරවාරි",
     "March" : "මාර්තු",
@@ -18,6 +25,18 @@
     "October" : "ඔක්තෝබර",
     "November" : "නොවැම්බර්",
     "December" : "දෙසැම්බර්",
+    "Jan." : "ජන.",
+    "Feb." : "පෙබ.",
+    "Mar." : "මාර්තු",
+    "Apr." : "අප්‍රේල්",
+    "May." : "මැයි",
+    "Jun." : "ජුනි",
+    "Jul." : "ජුලි",
+    "Aug." : "අගෝ.",
+    "Sep." : "සැප්.",
+    "Oct." : "ඔක්.",
+    "Nov." : "නොවැ.",
+    "Dec." : "දෙසැ.",
     "Settings" : "සිටුවම්",
     "Saving..." : "සුරැකෙමින් පවතී...",
     "No" : "එපා",
@@ -25,8 +44,8 @@
     "Choose" : "තෝරන්න",
     "Ok" : "හරි",
     "Cancel" : "එපා",
-    "Share" : "බෙදා හදා ගන්න",
     "Error" : "දෝෂයක්",
+    "Share" : "බෙදා හදා ගන්න",
     "Password protect" : "මුර පදයකින් ආරක්ශාකරන්න",
     "Password" : "මුර පදය",
     "Set expiration date" : "කල් ඉකුත් විමේ දිනය දමන්න",
@@ -61,7 +80,7 @@
     "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න",
     "Log out" : "නික්මීම",
     "Search" : "සොයන්න",
-    "remember" : "මතක තබාගන්න",
-    "Log in" : "ප්‍රවේශවන්න"
+    "Log in" : "ප්‍රවේශවන්න",
+    "remember" : "මතක තබාගන්න"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/sk.js b/core/l10n/sk.js
deleted file mode 100644
index 6d446d1909..0000000000
--- a/core/l10n/sk.js
+++ /dev/null
@@ -1,30 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "Sunday" : "Nedeľa",
-    "Monday" : "Pondelok",
-    "Tuesday" : "Utorok",
-    "Wednesday" : "Streda",
-    "Thursday" : "Štvrtok",
-    "Friday" : "Piatok",
-    "Saturday" : "Sobota",
-    "January" : "Január",
-    "February" : "Február",
-    "March" : "Marec",
-    "April" : "Apríl",
-    "May" : "Máj",
-    "June" : "Jún",
-    "July" : "Júl",
-    "August" : "August",
-    "September" : "September",
-    "October" : "Október",
-    "November" : "November",
-    "December" : "December",
-    "Settings" : "Nastavenia",
-    "Cancel" : "Zrušiť",
-    "Share" : "Zdieľať",
-    "group" : "skupina",
-    "Delete" : "Odstrániť",
-    "Personal" : "Osobné"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/core/l10n/sk.json b/core/l10n/sk.json
deleted file mode 100644
index 05064303da..0000000000
--- a/core/l10n/sk.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{ "translations": {
-    "Sunday" : "Nedeľa",
-    "Monday" : "Pondelok",
-    "Tuesday" : "Utorok",
-    "Wednesday" : "Streda",
-    "Thursday" : "Štvrtok",
-    "Friday" : "Piatok",
-    "Saturday" : "Sobota",
-    "January" : "Január",
-    "February" : "Február",
-    "March" : "Marec",
-    "April" : "Apríl",
-    "May" : "Máj",
-    "June" : "Jún",
-    "July" : "Júl",
-    "August" : "August",
-    "September" : "September",
-    "October" : "Október",
-    "November" : "November",
-    "December" : "December",
-    "Settings" : "Nastavenia",
-    "Cancel" : "Zrušiť",
-    "Share" : "Zdieľať",
-    "group" : "skupina",
-    "Delete" : "Odstrániť",
-    "Personal" : "Osobné"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index 2c92ce9289..2953bc7e0c 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -27,6 +27,13 @@ OC.L10N.register(
     "Thursday" : "Štvrtok",
     "Friday" : "Piatok",
     "Saturday" : "Sobota",
+    "Sun." : "Ned.",
+    "Mon." : "Pon.",
+    "Tue." : "Uto.",
+    "Wed." : "Str.",
+    "Thu." : "Štv.",
+    "Fri." : "Pia.",
+    "Sat." : "Sob.",
     "January" : "Január",
     "February" : "Február",
     "March" : "Marec",
@@ -39,6 +46,18 @@ OC.L10N.register(
     "October" : "Október",
     "November" : "November",
     "December" : "December",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Máj.",
+    "Jun." : "Jún.",
+    "Jul." : "Júl.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Nastavenia",
     "Saving..." : "Ukladám...",
     "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
@@ -75,7 +94,6 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Počas kontroly nastavenia serveru sa stala chyba",
     "Shared" : "Zdieľané",
     "Shared with {recipients}" : "Zdieľa s {recipients}",
-    "Share" : "Zdieľať",
     "Error" : "Chyba",
     "Error while sharing" : "Chyba počas zdieľania",
     "Error while unsharing" : "Chyba počas ukončenia zdieľania",
@@ -84,6 +102,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "Zdieľané s vami používateľom {owner}",
     "Share with users or groups …" : "Zdieľať s používateľmi alebo skupinami ...",
     "Share with users, groups or remote users …" : "Zdieľať s používateľmi, skupinami alebo vzdialenými používateľmi ...",
+    "Share" : "Zdieľať",
     "Share link" : "Zdieľať linku",
     "The public link will expire no later than {days} days after it is created" : "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
     "Link" : "Odkaz",
@@ -208,9 +227,8 @@ OC.L10N.register(
     "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.",
     "An internal error occured." : "Vyskytla sa vnútorná chyba.",
     "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.",
-    "Forgot your password? Reset it!" : "Zabudli ste heslo? Obnovte si ho!",
-    "remember" : "zapamätať",
     "Log in" : "Prihlásiť sa",
+    "remember" : "zapamätať",
     "Alternative Logins" : "Alternatívne prihlásenie",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Táto inštancia ownCloudu je teraz v jednopoužívateľskom móde.",
@@ -221,8 +239,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte správcu. Ak ste správcom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na konfigurácii, vám môže byť ako správcovi umožnené použitie tlačidla nižšie pre označenie tejto domény ako dôveryhodnej.",
     "Add \"%s\" as trusted domain" : "Pridať \"%s\" ako dôveryhodnú doménu",
-    "%s will be updated to version %s." : "%s bude zaktualizovaný na verziu %s.",
-    "The following apps will be disabled:" : "Tieto aplikácie budú zakázané:",
     "The theme %s has been disabled." : "Téma %s bola zakázaná.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
     "Start update" : "Spustiť aktualizáciu",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index ac4cb4d0f8..f39e14ed02 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -25,6 +25,13 @@
     "Thursday" : "Štvrtok",
     "Friday" : "Piatok",
     "Saturday" : "Sobota",
+    "Sun." : "Ned.",
+    "Mon." : "Pon.",
+    "Tue." : "Uto.",
+    "Wed." : "Str.",
+    "Thu." : "Štv.",
+    "Fri." : "Pia.",
+    "Sat." : "Sob.",
     "January" : "Január",
     "February" : "Február",
     "March" : "Marec",
@@ -37,6 +44,18 @@
     "October" : "Október",
     "November" : "November",
     "December" : "December",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Máj.",
+    "Jun." : "Jún.",
+    "Jul." : "Júl.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Nastavenia",
     "Saving..." : "Ukladám...",
     "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
@@ -73,7 +92,6 @@
     "Error occurred while checking server setup" : "Počas kontroly nastavenia serveru sa stala chyba",
     "Shared" : "Zdieľané",
     "Shared with {recipients}" : "Zdieľa s {recipients}",
-    "Share" : "Zdieľať",
     "Error" : "Chyba",
     "Error while sharing" : "Chyba počas zdieľania",
     "Error while unsharing" : "Chyba počas ukončenia zdieľania",
@@ -82,6 +100,7 @@
     "Shared with you by {owner}" : "Zdieľané s vami používateľom {owner}",
     "Share with users or groups …" : "Zdieľať s používateľmi alebo skupinami ...",
     "Share with users, groups or remote users …" : "Zdieľať s používateľmi, skupinami alebo vzdialenými používateľmi ...",
+    "Share" : "Zdieľať",
     "Share link" : "Zdieľať linku",
     "The public link will expire no later than {days} days after it is created" : "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
     "Link" : "Odkaz",
@@ -206,9 +225,8 @@
     "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.",
     "An internal error occured." : "Vyskytla sa vnútorná chyba.",
     "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.",
-    "Forgot your password? Reset it!" : "Zabudli ste heslo? Obnovte si ho!",
-    "remember" : "zapamätať",
     "Log in" : "Prihlásiť sa",
+    "remember" : "zapamätať",
     "Alternative Logins" : "Alternatívne prihlásenie",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Dobrý deň,<br><br>Používateľ %s zdieľa s vami súbor, alebo priečinok s názvom »%s«.<br><a href=\"%s\">Pre zobrazenie kliknite na túto linku!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Táto inštancia ownCloudu je teraz v jednopoužívateľskom móde.",
@@ -219,8 +237,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte správcu. Ak ste správcom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na konfigurácii, vám môže byť ako správcovi umožnené použitie tlačidla nižšie pre označenie tejto domény ako dôveryhodnej.",
     "Add \"%s\" as trusted domain" : "Pridať \"%s\" ako dôveryhodnú doménu",
-    "%s will be updated to version %s." : "%s bude zaktualizovaný na verziu %s.",
-    "The following apps will be disabled:" : "Tieto aplikácie budú zakázané:",
     "The theme %s has been disabled." : "Téma %s bola zakázaná.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
     "Start update" : "Spustiť aktualizáciu",
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index 91aba3049d..cc7633c062 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -21,6 +21,13 @@ OC.L10N.register(
     "Thursday" : "četrtek",
     "Friday" : "petek",
     "Saturday" : "sobota",
+    "Sun." : "ned",
+    "Mon." : "pon",
+    "Tue." : "tor",
+    "Wed." : "sre",
+    "Thu." : "čet",
+    "Fri." : "pet",
+    "Sat." : "sob",
     "January" : "januar",
     "February" : "februar",
     "March" : "marec",
@@ -33,6 +40,18 @@ OC.L10N.register(
     "October" : "oktober",
     "November" : "november",
     "December" : "december",
+    "Jan." : "jan",
+    "Feb." : "feb",
+    "Mar." : "mar",
+    "Apr." : "apr",
+    "May." : "maj",
+    "Jun." : "jun",
+    "Jul." : "jul",
+    "Aug." : "avg",
+    "Sep." : "sep",
+    "Oct." : "okt",
+    "Nov." : "nov",
+    "Dec." : "dec",
     "Settings" : "Nastavitve",
     "Saving..." : "Poteka shranjevanje ...",
     "Couldn't send reset email. Please contact your administrator." : "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
@@ -66,13 +85,13 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Prišlo je do napake med preverjanjem nastavitev strežnika",
     "Shared" : "V souporabi",
     "Shared with {recipients}" : "V souporabi z {recipients}",
-    "Share" : "Souporaba",
     "Error" : "Napaka",
     "Error while sharing" : "Napaka med souporabo",
     "Error while unsharing" : "Napaka med odstranjevanjem souporabe",
     "Error while changing permissions" : "Napaka med spreminjanjem dovoljenj",
     "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
     "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
+    "Share" : "Souporaba",
     "Share link" : "Povezava za prejem",
     "The public link will expire no later than {days} days after it is created" : "Javna povezava bo potekla {days} dni po ustvarjanju.",
     "Link" : "Povezava",
@@ -181,9 +200,7 @@ OC.L10N.register(
     "Search" : "Poišči",
     "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
     "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
-    "Forgot your password? Reset it!" : "Ali ste pozabili geslo? Ponastavite ga!",
     "remember" : "zapomni si",
-    "Log in" : "Prijava",
     "Alternative Logins" : "Druge prijavne možnosti",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ta seja oblaka ownCloud je trenutno v načinu enega sočasnega uporabnika.",
@@ -194,8 +211,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Stopite v stik s skrbnikom ali pa nastavite možnost \"varna_domena\" v datoteki config/config.php. Primer nastavitve je razložen v datoteki config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Glede na nastavitve bi lahko kot skrbnik uporabili spodnji gumb in domeno ročno določili kot varno.",
     "Add \"%s\" as trusted domain" : "Dodaj \"%s\" kot varno domeno",
-    "%s will be updated to version %s." : "%s bo posodobljen na različico %s.",
-    "The following apps will be disabled:" : "Navedeni programi bodo onemogočeni:",
     "The theme %s has been disabled." : "Tema %s je onemogočena za uporabo.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred nadaljevanjem se prepričajte se, da je ustvarjena varnostna kopija podatkovne zbirke, nastavitvenih datotek in podatkovne mape.",
     "Start update" : "Začni posodobitev",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index c799f25845..96945519ca 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -19,6 +19,13 @@
     "Thursday" : "četrtek",
     "Friday" : "petek",
     "Saturday" : "sobota",
+    "Sun." : "ned",
+    "Mon." : "pon",
+    "Tue." : "tor",
+    "Wed." : "sre",
+    "Thu." : "čet",
+    "Fri." : "pet",
+    "Sat." : "sob",
     "January" : "januar",
     "February" : "februar",
     "March" : "marec",
@@ -31,6 +38,18 @@
     "October" : "oktober",
     "November" : "november",
     "December" : "december",
+    "Jan." : "jan",
+    "Feb." : "feb",
+    "Mar." : "mar",
+    "Apr." : "apr",
+    "May." : "maj",
+    "Jun." : "jun",
+    "Jul." : "jul",
+    "Aug." : "avg",
+    "Sep." : "sep",
+    "Oct." : "okt",
+    "Nov." : "nov",
+    "Dec." : "dec",
     "Settings" : "Nastavitve",
     "Saving..." : "Poteka shranjevanje ...",
     "Couldn't send reset email. Please contact your administrator." : "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
@@ -64,13 +83,13 @@
     "Error occurred while checking server setup" : "Prišlo je do napake med preverjanjem nastavitev strežnika",
     "Shared" : "V souporabi",
     "Shared with {recipients}" : "V souporabi z {recipients}",
-    "Share" : "Souporaba",
     "Error" : "Napaka",
     "Error while sharing" : "Napaka med souporabo",
     "Error while unsharing" : "Napaka med odstranjevanjem souporabe",
     "Error while changing permissions" : "Napaka med spreminjanjem dovoljenj",
     "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
     "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
+    "Share" : "Souporaba",
     "Share link" : "Povezava za prejem",
     "The public link will expire no later than {days} days after it is created" : "Javna povezava bo potekla {days} dni po ustvarjanju.",
     "Link" : "Povezava",
@@ -179,9 +198,7 @@
     "Search" : "Poišči",
     "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
     "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
-    "Forgot your password? Reset it!" : "Ali ste pozabili geslo? Ponastavite ga!",
     "remember" : "zapomni si",
-    "Log in" : "Prijava",
     "Alternative Logins" : "Druge prijavne možnosti",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ta seja oblaka ownCloud je trenutno v načinu enega sočasnega uporabnika.",
@@ -192,8 +209,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Stopite v stik s skrbnikom ali pa nastavite možnost \"varna_domena\" v datoteki config/config.php. Primer nastavitve je razložen v datoteki config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Glede na nastavitve bi lahko kot skrbnik uporabili spodnji gumb in domeno ročno določili kot varno.",
     "Add \"%s\" as trusted domain" : "Dodaj \"%s\" kot varno domeno",
-    "%s will be updated to version %s." : "%s bo posodobljen na različico %s.",
-    "The following apps will be disabled:" : "Navedeni programi bodo onemogočeni:",
     "The theme %s has been disabled." : "Tema %s je onemogočena za uporabo.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred nadaljevanjem se prepričajte se, da je ustvarjena varnostna kopija podatkovne zbirke, nastavitvenih datotek in podatkovne mape.",
     "Start update" : "Začni posodobitev",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index cd6cc572cb..8e5eda15f0 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -20,6 +20,13 @@ OC.L10N.register(
     "Thursday" : "E enjte",
     "Friday" : "E premte",
     "Saturday" : "E shtunë",
+    "Sun." : "Djelë",
+    "Mon." : "Hën",
+    "Tue." : "Mar",
+    "Wed." : "Mër",
+    "Thu." : "Enj",
+    "Fri." : "Pre",
+    "Sat." : "Shtu",
     "January" : "Janar",
     "February" : "Shkurt",
     "March" : "Mars",
@@ -32,6 +39,18 @@ OC.L10N.register(
     "October" : "Tetor",
     "November" : "Nëntor",
     "December" : "Dhjetor",
+    "Jan." : "Jan",
+    "Feb." : "Shk",
+    "Mar." : "Mar",
+    "Apr." : "Pri",
+    "May." : "Maj",
+    "Jun." : "Qer",
+    "Jul." : "Kor",
+    "Aug." : "Gush",
+    "Sep." : "Shta",
+    "Oct." : "Tet",
+    "Nov." : "Nën",
+    "Dec." : "Dhje",
     "Settings" : "Parametra",
     "Saving..." : "Duke ruajtur...",
     "Couldn't send reset email. Please contact your administrator." : "Emaili i rivendosjes nuk mund të dërgohet. Ju lutem kontaktoni me administratorin.",
@@ -64,13 +83,13 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Gabim gjatë kontrollit të konfigurimit të serverit",
     "Shared" : "Ndarë",
     "Shared with {recipients}" : "Ndarë me {recipients}",
-    "Share" : "Nda",
     "Error" : "Veprim i gabuar",
     "Error while sharing" : "Veprim i gabuar gjatë ndarjes",
     "Error while unsharing" : "Veprim i gabuar gjatë heqjes së ndarjes",
     "Error while changing permissions" : "Veprim i gabuar gjatë ndryshimit të lejeve",
     "Shared with you and the group {group} by {owner}" : "Ndarë me ju dhe me grupin {group} nga {owner}",
     "Shared with you by {owner}" : "Ndarë me ju nga {owner}",
+    "Share" : "Nda",
     "Share link" : "Ndaje lidhjen",
     "The public link will expire no later than {days} days after it is created" : "Lidhja publike do të skadojë jo më vonë se {days} ditë pas krijimit",
     "Password protect" : "Mbro me kod",
@@ -171,9 +190,7 @@ OC.L10N.register(
     "Search" : "Kërko",
     "Server side authentication failed!" : "Verifikimi në krahun e serverit dështoi!",
     "Please contact your administrator." : "Ju lutem kontaktoni administratorin.",
-    "Forgot your password? Reset it!" : "Keni harruar fjalëkalimin tuaj? Rivendoseni!",
     "remember" : "kujto",
-    "Log in" : "Hyrje",
     "Alternative Logins" : "Hyrje alternative",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Tungjatjeta,<br><br>dëshirojmë t'ju njoftojmë se %s ka ndarë <strong>%s</strong> me ju.<br><a href=\"%s\">Klikoni këtu për ta shikuar!</a><br>",
     "This ownCloud instance is currently in single user mode." : "Kjo instancë ownCloud është aktualisht në gjendje me përdorues të vetëm.",
@@ -184,8 +201,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ju lutem kontaktoni me administratorin. Nëse jeni administrator i kësaj instance, konfiguroni parametrin \"domain i besuar\" në config/config.php . Një konfigurim shembull është dhënë në config/config.sample.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Në varësi të konfigurimit tuaj, ju si administrator mundet gjithashtu të jeni i aftë të përdorni butonin e mëposhtëm për ti dhënë besim këtij domain.",
     "Add \"%s\" as trusted domain" : "Shtoni \"%s\" si domain të besuar",
-    "%s will be updated to version %s." : "%s to të përditësohet në versionin %s.",
-    "The following apps will be disabled:" : "Keto aplikacione do të bllokohen:",
     "The theme %s has been disabled." : "Tema %s u bllokua.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ju lutem sigurohuni që bazës së të dhënave, dosjes së konfigurimit dhe dosjes së të dhënave ti jetë bërë një kopje rezervë përpara se të vazhdoni më tutje.",
     "Start update" : "Fillo përditësimin.",
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index a7554c582f..24d73ab822 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -18,6 +18,13 @@
     "Thursday" : "E enjte",
     "Friday" : "E premte",
     "Saturday" : "E shtunë",
+    "Sun." : "Djelë",
+    "Mon." : "Hën",
+    "Tue." : "Mar",
+    "Wed." : "Mër",
+    "Thu." : "Enj",
+    "Fri." : "Pre",
+    "Sat." : "Shtu",
     "January" : "Janar",
     "February" : "Shkurt",
     "March" : "Mars",
@@ -30,6 +37,18 @@
     "October" : "Tetor",
     "November" : "Nëntor",
     "December" : "Dhjetor",
+    "Jan." : "Jan",
+    "Feb." : "Shk",
+    "Mar." : "Mar",
+    "Apr." : "Pri",
+    "May." : "Maj",
+    "Jun." : "Qer",
+    "Jul." : "Kor",
+    "Aug." : "Gush",
+    "Sep." : "Shta",
+    "Oct." : "Tet",
+    "Nov." : "Nën",
+    "Dec." : "Dhje",
     "Settings" : "Parametra",
     "Saving..." : "Duke ruajtur...",
     "Couldn't send reset email. Please contact your administrator." : "Emaili i rivendosjes nuk mund të dërgohet. Ju lutem kontaktoni me administratorin.",
@@ -62,13 +81,13 @@
     "Error occurred while checking server setup" : "Gabim gjatë kontrollit të konfigurimit të serverit",
     "Shared" : "Ndarë",
     "Shared with {recipients}" : "Ndarë me {recipients}",
-    "Share" : "Nda",
     "Error" : "Veprim i gabuar",
     "Error while sharing" : "Veprim i gabuar gjatë ndarjes",
     "Error while unsharing" : "Veprim i gabuar gjatë heqjes së ndarjes",
     "Error while changing permissions" : "Veprim i gabuar gjatë ndryshimit të lejeve",
     "Shared with you and the group {group} by {owner}" : "Ndarë me ju dhe me grupin {group} nga {owner}",
     "Shared with you by {owner}" : "Ndarë me ju nga {owner}",
+    "Share" : "Nda",
     "Share link" : "Ndaje lidhjen",
     "The public link will expire no later than {days} days after it is created" : "Lidhja publike do të skadojë jo më vonë se {days} ditë pas krijimit",
     "Password protect" : "Mbro me kod",
@@ -169,9 +188,7 @@
     "Search" : "Kërko",
     "Server side authentication failed!" : "Verifikimi në krahun e serverit dështoi!",
     "Please contact your administrator." : "Ju lutem kontaktoni administratorin.",
-    "Forgot your password? Reset it!" : "Keni harruar fjalëkalimin tuaj? Rivendoseni!",
     "remember" : "kujto",
-    "Log in" : "Hyrje",
     "Alternative Logins" : "Hyrje alternative",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Tungjatjeta,<br><br>dëshirojmë t'ju njoftojmë se %s ka ndarë <strong>%s</strong> me ju.<br><a href=\"%s\">Klikoni këtu për ta shikuar!</a><br>",
     "This ownCloud instance is currently in single user mode." : "Kjo instancë ownCloud është aktualisht në gjendje me përdorues të vetëm.",
@@ -182,8 +199,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ju lutem kontaktoni me administratorin. Nëse jeni administrator i kësaj instance, konfiguroni parametrin \"domain i besuar\" në config/config.php . Një konfigurim shembull është dhënë në config/config.sample.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Në varësi të konfigurimit tuaj, ju si administrator mundet gjithashtu të jeni i aftë të përdorni butonin e mëposhtëm për ti dhënë besim këtij domain.",
     "Add \"%s\" as trusted domain" : "Shtoni \"%s\" si domain të besuar",
-    "%s will be updated to version %s." : "%s to të përditësohet në versionin %s.",
-    "The following apps will be disabled:" : "Keto aplikacione do të bllokohen:",
     "The theme %s has been disabled." : "Tema %s u bllokua.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ju lutem sigurohuni që bazës së të dhënave, dosjes së konfigurimit dhe dosjes së të dhënave ti jetë bërë një kopje rezervë përpara se të vazhdoni më tutje.",
     "Start update" : "Fillo përditësimin.",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index 50603a4caa..ac11270c8b 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -28,6 +28,13 @@ OC.L10N.register(
     "Thursday" : "четвртак",
     "Friday" : "петак",
     "Saturday" : "субота",
+    "Sun." : "нед",
+    "Mon." : "пон",
+    "Tue." : "уто",
+    "Wed." : "сре",
+    "Thu." : "чет",
+    "Fri." : "пет",
+    "Sat." : "суб",
     "January" : "јануар",
     "February" : "фебруар",
     "March" : "март",
@@ -40,6 +47,18 @@ OC.L10N.register(
     "October" : "октобар",
     "November" : "новембар",
     "December" : "децембар",
+    "Jan." : "јан",
+    "Feb." : "феб",
+    "Mar." : "мар",
+    "Apr." : "апр",
+    "May." : "мај",
+    "Jun." : "јун",
+    "Jul." : "јул",
+    "Aug." : "авг",
+    "Sep." : "сеп",
+    "Oct." : "окт",
+    "Nov." : "нов",
+    "Dec." : "дец",
     "Settings" : "Поставке",
     "Saving..." : "Уписујем...",
     "Couldn't send reset email. Please contact your administrator." : "Не могу да пошаљем е-пошту за ресетовање лозинке. Контактирајте администратора.",
@@ -79,7 +98,6 @@ OC.L10N.register(
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "ХТТП заглавље „{header}“ није подешено као „{expected}“. Ово потенцијално угрожава безбедност и приватност и препоручујемо да подесите ову поставку.",
     "Shared" : "Дељено",
     "Shared with {recipients}" : "Дељено са {recipients}",
-    "Share" : "Дели",
     "Error" : "Грешка",
     "Error while sharing" : "Грешка при дељењу",
     "Error while unsharing" : "Грешка при укидању дељења",
@@ -88,6 +106,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "{owner} дели са вама",
     "Share with users or groups …" : "Дели са корисницима или групама...",
     "Share with users, groups or remote users …" : "Дели са корисницима, групама или удаљеним корисницима...",
+    "Share" : "Дели",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделите са људима у другим облацима користећи синтаксу корисничкоиме@сервер.com/owncloud",
     "Share link" : "Веза дељења",
     "The public link will expire no later than {days} days after it is created" : "Јавна веза ће престати да важи {days} дана након стварања",
@@ -214,9 +233,7 @@ OC.L10N.register(
     "Please contact your administrator." : "Контактирајте вашег администратора.",
     "An internal error occured." : "Дошло је до интерне грешке.",
     "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.",
-    "Forgot your password? Reset it!" : "Заборавили сте вашу лозинку? Обновите је!",
     "remember" : "упамти",
-    "Log in" : "Пријава",
     "Alternative Logins" : "Алтернативне пријаве",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да %s дели <strong>%s</strong> са вама.<br><a href=\"%s\">Погледајте!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Овај оунКлауд тренутно ради у режиму једног корисника.",
@@ -227,8 +244,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Контактирајте администратора. Ако сте ви администратор, подесите „trusted_domain“ поставку у config/config.php фајлу. Пример подешавања имате у config/config.sample.php фајлу.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Зависно од ваших подешавања, као администратор можете употребити дугме испод да потврдите поузданост домена.",
     "Add \"%s\" as trusted domain" : "Додај „%s“ као поуздан домен",
-    "%s will be updated to version %s." : "%s ће бити ажуриран на верзију %s.",
-    "The following apps will be disabled:" : "Следеће апликације ће бити онемогућене:",
     "The theme %s has been disabled." : "Тема %s је онемогућена.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Проверите да ли сте направили резервну копију фасцикли са подешавањима и подацима пре него што наставите.",
     "Start update" : "Почни надоградњу",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index ead0e061b9..ceee884de1 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -26,6 +26,13 @@
     "Thursday" : "четвртак",
     "Friday" : "петак",
     "Saturday" : "субота",
+    "Sun." : "нед",
+    "Mon." : "пон",
+    "Tue." : "уто",
+    "Wed." : "сре",
+    "Thu." : "чет",
+    "Fri." : "пет",
+    "Sat." : "суб",
     "January" : "јануар",
     "February" : "фебруар",
     "March" : "март",
@@ -38,6 +45,18 @@
     "October" : "октобар",
     "November" : "новембар",
     "December" : "децембар",
+    "Jan." : "јан",
+    "Feb." : "феб",
+    "Mar." : "мар",
+    "Apr." : "апр",
+    "May." : "мај",
+    "Jun." : "јун",
+    "Jul." : "јул",
+    "Aug." : "авг",
+    "Sep." : "сеп",
+    "Oct." : "окт",
+    "Nov." : "нов",
+    "Dec." : "дец",
     "Settings" : "Поставке",
     "Saving..." : "Уписујем...",
     "Couldn't send reset email. Please contact your administrator." : "Не могу да пошаљем е-пошту за ресетовање лозинке. Контактирајте администратора.",
@@ -77,7 +96,6 @@
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "ХТТП заглавље „{header}“ није подешено као „{expected}“. Ово потенцијално угрожава безбедност и приватност и препоручујемо да подесите ову поставку.",
     "Shared" : "Дељено",
     "Shared with {recipients}" : "Дељено са {recipients}",
-    "Share" : "Дели",
     "Error" : "Грешка",
     "Error while sharing" : "Грешка при дељењу",
     "Error while unsharing" : "Грешка при укидању дељења",
@@ -86,6 +104,7 @@
     "Shared with you by {owner}" : "{owner} дели са вама",
     "Share with users or groups …" : "Дели са корисницима или групама...",
     "Share with users, groups or remote users …" : "Дели са корисницима, групама или удаљеним корисницима...",
+    "Share" : "Дели",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделите са људима у другим облацима користећи синтаксу корисничкоиме@сервер.com/owncloud",
     "Share link" : "Веза дељења",
     "The public link will expire no later than {days} days after it is created" : "Јавна веза ће престати да важи {days} дана након стварања",
@@ -212,9 +231,7 @@
     "Please contact your administrator." : "Контактирајте вашег администратора.",
     "An internal error occured." : "Дошло је до интерне грешке.",
     "Please try again or contact your administrator." : "Покушајте поново или контактирајте вашег администратора.",
-    "Forgot your password? Reset it!" : "Заборавили сте вашу лозинку? Обновите је!",
     "remember" : "упамти",
-    "Log in" : "Пријава",
     "Alternative Logins" : "Алтернативне пријаве",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Поздрав,<br><br>само вас обавештавам да %s дели <strong>%s</strong> са вама.<br><a href=\"%s\">Погледајте!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Овај оунКлауд тренутно ради у режиму једног корисника.",
@@ -225,8 +242,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Контактирајте администратора. Ако сте ви администратор, подесите „trusted_domain“ поставку у config/config.php фајлу. Пример подешавања имате у config/config.sample.php фајлу.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Зависно од ваших подешавања, као администратор можете употребити дугме испод да потврдите поузданост домена.",
     "Add \"%s\" as trusted domain" : "Додај „%s“ као поуздан домен",
-    "%s will be updated to version %s." : "%s ће бити ажуриран на верзију %s.",
-    "The following apps will be disabled:" : "Следеће апликације ће бити онемогућене:",
     "The theme %s has been disabled." : "Тема %s је онемогућена.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Проверите да ли сте направили резервну копију фасцикли са подешавањима и подацима пре него што наставите.",
     "Start update" : "Почни надоградњу",
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
index 706f7bd395..5108f16d99 100644
--- a/core/l10n/sr@latin.js
+++ b/core/l10n/sr@latin.js
@@ -20,6 +20,13 @@ OC.L10N.register(
     "Thursday" : "Četvrtak",
     "Friday" : "Petak",
     "Saturday" : "Subota",
+    "Sun." : "ned",
+    "Mon." : "pon",
+    "Tue." : "uto",
+    "Wed." : "sre",
+    "Thu." : "čet",
+    "Fri." : "pet",
+    "Sat." : "sub",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mart",
@@ -32,6 +39,18 @@ OC.L10N.register(
     "October" : "Oktobar",
     "November" : "Novembar",
     "December" : "Decembar",
+    "Jan." : "jan",
+    "Feb." : "feb",
+    "Mar." : "mar",
+    "Apr." : "apr",
+    "May." : "maj",
+    "Jun." : "jun",
+    "Jul." : "jul",
+    "Aug." : "avg",
+    "Sep." : "sep",
+    "Oct." : "okt",
+    "Nov." : "nov",
+    "Dec." : "dec",
     "Settings" : "Podešavanja",
     "Saving..." : "Snimam...",
     "Couldn't send reset email. Please contact your administrator." : "Nemoguće slanje e-mail-a za ponovno postavljanje lozinke. Molimo Vas kontaktirajte Vašeg administratora",
@@ -65,13 +84,13 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Došlo je do greške prilikom provere startovanja servera",
     "Shared" : "Deljeno",
     "Shared with {recipients}" : "Podeljeno sa {recipients}",
-    "Share" : "Podeli",
     "Error" : "Greška",
     "Error while sharing" : "Greška pri deljenju",
     "Error while unsharing" : "Greška u uklanjanju deljenja",
     "Error while changing permissions" : "Greška u promeni dozvola",
     "Shared with you and the group {group} by {owner}" : "{owner} podelio sa Vama i grupom {group} ",
     "Shared with you by {owner}" : "Sa vama podelio {owner}",
+    "Share" : "Podeli",
     "Share link" : "Podeli prečicu",
     "The public link will expire no later than {days} days after it is created" : "Javna prečica će isteći ne kasnije od {days} dana pošto je kreirana",
     "Link" : "Prečica",
@@ -177,9 +196,7 @@ OC.L10N.register(
     "Search" : "Traži",
     "Server side authentication failed!" : "Provera identiteta na stani servera nije uspela!",
     "Please contact your administrator." : "Molimo Vas da kontaktirate Vašeg administratora.",
-    "Forgot your password? Reset it!" : "Zaboravili ste lozinku ? Ponovo je podesite!",
     "remember" : "upamti",
-    "Log in" : "Prijavi se",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej,<br><br>samo ti javljamo da je %s delio <strong>%s</strong> sa tobom.<br><a href=\"%s\">Pogledaj!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova instanca ownCloud-a je trenutno u režimu rada jednog korisnika.",
@@ -190,8 +207,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molimo Vas da kontaktirate Vašeg administratora. Ako ste Vi administrator ove instance, podesite \"trusted_domain\" podešavanje u config/config.php. Primer podešavanja je dat u config/config.sample.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "U zavisnosti od Vaše konfiguracije, kao administrator bi ste mogli da upotrebite dugme ispod da podesite da verujete ovom domenu.",
     "Add \"%s\" as trusted domain" : "Dodaj \"%s\" kao domen od poverenja",
-    "%s will be updated to version %s." : "%s će biti unapređen na verziju %s.",
-    "The following apps will be disabled:" : "Sledeće aplikacije će biti onemogućene:",
     "The theme %s has been disabled." : "Tema %s će biti onemogućena.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Molimo Vas da proverite da li su baza podataka, fascikla sa podešavanjima i fascikla sa podacima bekapovani pre nego što nastavite.",
     "Start update" : "Započni osvežavanje",
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
index ce5dba2d91..5bc49c7e58 100644
--- a/core/l10n/sr@latin.json
+++ b/core/l10n/sr@latin.json
@@ -18,6 +18,13 @@
     "Thursday" : "Četvrtak",
     "Friday" : "Petak",
     "Saturday" : "Subota",
+    "Sun." : "ned",
+    "Mon." : "pon",
+    "Tue." : "uto",
+    "Wed." : "sre",
+    "Thu." : "čet",
+    "Fri." : "pet",
+    "Sat." : "sub",
     "January" : "Januar",
     "February" : "Februar",
     "March" : "Mart",
@@ -30,6 +37,18 @@
     "October" : "Oktobar",
     "November" : "Novembar",
     "December" : "Decembar",
+    "Jan." : "jan",
+    "Feb." : "feb",
+    "Mar." : "mar",
+    "Apr." : "apr",
+    "May." : "maj",
+    "Jun." : "jun",
+    "Jul." : "jul",
+    "Aug." : "avg",
+    "Sep." : "sep",
+    "Oct." : "okt",
+    "Nov." : "nov",
+    "Dec." : "dec",
     "Settings" : "Podešavanja",
     "Saving..." : "Snimam...",
     "Couldn't send reset email. Please contact your administrator." : "Nemoguće slanje e-mail-a za ponovno postavljanje lozinke. Molimo Vas kontaktirajte Vašeg administratora",
@@ -63,13 +82,13 @@
     "Error occurred while checking server setup" : "Došlo je do greške prilikom provere startovanja servera",
     "Shared" : "Deljeno",
     "Shared with {recipients}" : "Podeljeno sa {recipients}",
-    "Share" : "Podeli",
     "Error" : "Greška",
     "Error while sharing" : "Greška pri deljenju",
     "Error while unsharing" : "Greška u uklanjanju deljenja",
     "Error while changing permissions" : "Greška u promeni dozvola",
     "Shared with you and the group {group} by {owner}" : "{owner} podelio sa Vama i grupom {group} ",
     "Shared with you by {owner}" : "Sa vama podelio {owner}",
+    "Share" : "Podeli",
     "Share link" : "Podeli prečicu",
     "The public link will expire no later than {days} days after it is created" : "Javna prečica će isteći ne kasnije od {days} dana pošto je kreirana",
     "Link" : "Prečica",
@@ -175,9 +194,7 @@
     "Search" : "Traži",
     "Server side authentication failed!" : "Provera identiteta na stani servera nije uspela!",
     "Please contact your administrator." : "Molimo Vas da kontaktirate Vašeg administratora.",
-    "Forgot your password? Reset it!" : "Zaboravili ste lozinku ? Ponovo je podesite!",
     "remember" : "upamti",
-    "Log in" : "Prijavi se",
     "Alternative Logins" : "Alternativne prijave",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej,<br><br>samo ti javljamo da je %s delio <strong>%s</strong> sa tobom.<br><a href=\"%s\">Pogledaj!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Ova instanca ownCloud-a je trenutno u režimu rada jednog korisnika.",
@@ -188,8 +205,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molimo Vas da kontaktirate Vašeg administratora. Ako ste Vi administrator ove instance, podesite \"trusted_domain\" podešavanje u config/config.php. Primer podešavanja je dat u config/config.sample.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "U zavisnosti od Vaše konfiguracije, kao administrator bi ste mogli da upotrebite dugme ispod da podesite da verujete ovom domenu.",
     "Add \"%s\" as trusted domain" : "Dodaj \"%s\" kao domen od poverenja",
-    "%s will be updated to version %s." : "%s će biti unapređen na verziju %s.",
-    "The following apps will be disabled:" : "Sledeće aplikacije će biti onemogućene:",
     "The theme %s has been disabled." : "Tema %s će biti onemogućena.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Molimo Vas da proverite da li su baza podataka, fascikla sa podešavanjima i fascikla sa podacima bekapovani pre nego što nastavite.",
     "Start update" : "Započni osvežavanje",
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index 2873fc2658..27c1255f65 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -20,6 +20,13 @@ OC.L10N.register(
     "Thursday" : "Torsdag",
     "Friday" : "Fredag",
     "Saturday" : "Lördag",
+    "Sun." : "Sön.",
+    "Mon." : "Mån.",
+    "Tue." : "Tis.",
+    "Wed." : "Ons.",
+    "Thu." : "Tor.",
+    "Fri." : "Fre.",
+    "Sat." : "Lör.",
     "January" : "Januari",
     "February" : "Februari",
     "March" : "Mars",
@@ -32,6 +39,18 @@ OC.L10N.register(
     "October" : "Oktober",
     "November" : "November",
     "December" : "December",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Maj.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Inställningar",
     "Saving..." : "Sparar...",
     "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmail. Vänligen kontakta din administratör.",
@@ -65,13 +84,13 @@ OC.L10N.register(
     "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens setup gjordes",
     "Shared" : "Delad",
     "Shared with {recipients}" : "Delad med {recipients}",
-    "Share" : "Dela",
     "Error" : "Fel",
     "Error while sharing" : "Fel vid delning",
     "Error while unsharing" : "Fel när delning skulle avslutas",
     "Error while changing permissions" : "Fel vid ändring av rättigheter",
     "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
     "Shared with you by {owner}" : "Delad med dig av {owner}",
+    "Share" : "Dela",
     "Share link" : "Dela länk",
     "The public link will expire no later than {days} days after it is created" : "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
     "Link" : "Länk",
@@ -182,9 +201,8 @@ OC.L10N.register(
     "Search" : "Sök",
     "Server side authentication failed!" : "Servern misslyckades med autentisering!",
     "Please contact your administrator." : "Kontakta din administratör.",
-    "Forgot your password? Reset it!" : "Glömt ditt lösenord? Återställ det!",
-    "remember" : "kom ihåg",
     "Log in" : "Logga in",
+    "remember" : "kom ihåg",
     "Alternative Logins" : "Alternativa inloggningar",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denna ownCloud instans är för närvarande i enanvändarläge",
@@ -195,8 +213,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i  config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Beroende på din konfiguartion, så finns det möjlighet att du som administratör kan använda knappen nedan för att verifiera på denna domän.",
     "Add \"%s\" as trusted domain" : "Lägg till \"%s\" som en trusted domain",
-    "%s will be updated to version %s." : "%s kommer att uppdateras till version %s.",
-    "The following apps will be disabled:" : "Följande appar kommer att inaktiveras:",
     "The theme %s has been disabled." : "Temat  %s har blivit inaktiverat.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Vänligen säkerställ att en säkerhetskopia har gjorts av databasen, konfigurations- och datamappen innan du fortsätter.",
     "Start update" : "Starta uppdateringen",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index 11cb5abc95..befc73dfc4 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -18,6 +18,13 @@
     "Thursday" : "Torsdag",
     "Friday" : "Fredag",
     "Saturday" : "Lördag",
+    "Sun." : "Sön.",
+    "Mon." : "Mån.",
+    "Tue." : "Tis.",
+    "Wed." : "Ons.",
+    "Thu." : "Tor.",
+    "Fri." : "Fre.",
+    "Sat." : "Lör.",
     "January" : "Januari",
     "February" : "Februari",
     "March" : "Mars",
@@ -30,6 +37,18 @@
     "October" : "Oktober",
     "November" : "November",
     "December" : "December",
+    "Jan." : "Jan.",
+    "Feb." : "Feb.",
+    "Mar." : "Mar.",
+    "Apr." : "Apr.",
+    "May." : "Maj.",
+    "Jun." : "Jun.",
+    "Jul." : "Jul.",
+    "Aug." : "Aug.",
+    "Sep." : "Sep.",
+    "Oct." : "Okt.",
+    "Nov." : "Nov.",
+    "Dec." : "Dec.",
     "Settings" : "Inställningar",
     "Saving..." : "Sparar...",
     "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmail. Vänligen kontakta din administratör.",
@@ -63,13 +82,13 @@
     "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens setup gjordes",
     "Shared" : "Delad",
     "Shared with {recipients}" : "Delad med {recipients}",
-    "Share" : "Dela",
     "Error" : "Fel",
     "Error while sharing" : "Fel vid delning",
     "Error while unsharing" : "Fel när delning skulle avslutas",
     "Error while changing permissions" : "Fel vid ändring av rättigheter",
     "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
     "Shared with you by {owner}" : "Delad med dig av {owner}",
+    "Share" : "Dela",
     "Share link" : "Dela länk",
     "The public link will expire no later than {days} days after it is created" : "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
     "Link" : "Länk",
@@ -180,9 +199,8 @@
     "Search" : "Sök",
     "Server side authentication failed!" : "Servern misslyckades med autentisering!",
     "Please contact your administrator." : "Kontakta din administratör.",
-    "Forgot your password? Reset it!" : "Glömt ditt lösenord? Återställ det!",
-    "remember" : "kom ihåg",
     "Log in" : "Logga in",
+    "remember" : "kom ihåg",
     "Alternative Logins" : "Alternativa inloggningar",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej där,<br><br>ville bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Visa den!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Denna ownCloud instans är för närvarande i enanvändarläge",
@@ -193,8 +211,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i  config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Beroende på din konfiguartion, så finns det möjlighet att du som administratör kan använda knappen nedan för att verifiera på denna domän.",
     "Add \"%s\" as trusted domain" : "Lägg till \"%s\" som en trusted domain",
-    "%s will be updated to version %s." : "%s kommer att uppdateras till version %s.",
-    "The following apps will be disabled:" : "Följande appar kommer att inaktiveras:",
     "The theme %s has been disabled." : "Temat  %s har blivit inaktiverat.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Vänligen säkerställ att en säkerhetskopia har gjorts av databasen, konfigurations- och datamappen innan du fortsätter.",
     "Start update" : "Starta uppdateringen",
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
index dcafecd50a..c58dea8366 100644
--- a/core/l10n/ta_LK.js
+++ b/core/l10n/ta_LK.js
@@ -8,6 +8,13 @@ OC.L10N.register(
     "Thursday" : "வியாழக்கிழமை",
     "Friday" : "வெள்ளிக்கிழமை",
     "Saturday" : "சனிக்கிழமை",
+    "Sun." : "ஞாயிறு",
+    "Mon." : "திங்கள்",
+    "Tue." : "செவ்வாய்",
+    "Wed." : "புதன்",
+    "Thu." : "வியாழன்",
+    "Fri." : "வெள்ளி",
+    "Sat." : "சனி",
     "January" : "தை",
     "February" : "மாசி",
     "March" : "பங்குனி",
@@ -20,6 +27,18 @@ OC.L10N.register(
     "October" : "ஐப்பசி",
     "November" : "கார்த்திகை",
     "December" : "மார்கழி",
+    "Jan." : "தை",
+    "Feb." : "மாசி",
+    "Mar." : "பங்குனி",
+    "Apr." : "சித்திரை",
+    "May." : "வைகாசி",
+    "Jun." : "ஆனி",
+    "Jul." : "ஆடி",
+    "Aug." : "ஆவணி",
+    "Sep." : "புரட்டாதி",
+    "Oct." : "ஐப்பசி",
+    "Nov." : "கார்த்திகை",
+    "Dec." : "மார்கழி",
     "Settings" : "அமைப்புகள்",
     "Saving..." : "சேமிக்கப்படுகிறது...",
     "No" : "இல்லை",
@@ -27,13 +46,13 @@ OC.L10N.register(
     "Choose" : "தெரிவுசெய்க ",
     "Ok" : "சரி",
     "Cancel" : "இரத்து செய்க",
-    "Share" : "பகிர்வு",
     "Error" : "வழு",
     "Error while sharing" : "பகிரும் போதான வழு",
     "Error while unsharing" : "பகிராமல் உள்ளப்போதான வழு",
     "Error while changing permissions" : "அனுமதிகள் மாறும்போதான வழு",
     "Shared with you and the group {group} by {owner}" : "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
     "Shared with you by {owner}" : "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Share" : "பகிர்வு",
     "Password protect" : "கடவுச்சொல்லை பாதுகாத்தல்",
     "Password" : "கடவுச்சொல்",
     "Set expiration date" : "காலாவதி தேதியை குறிப்பிடுக",
@@ -74,7 +93,7 @@ OC.L10N.register(
     "Finish setup" : "அமைப்பை முடிக்க",
     "Log out" : "விடுபதிகை செய்க",
     "Search" : "தேடுதல்",
-    "remember" : "ஞாபகப்படுத்துக",
-    "Log in" : "புகுபதிகை"
+    "Log in" : "புகுபதிகை",
+    "remember" : "ஞாபகப்படுத்துக"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
index 86bef79211..60ff565dbf 100644
--- a/core/l10n/ta_LK.json
+++ b/core/l10n/ta_LK.json
@@ -6,6 +6,13 @@
     "Thursday" : "வியாழக்கிழமை",
     "Friday" : "வெள்ளிக்கிழமை",
     "Saturday" : "சனிக்கிழமை",
+    "Sun." : "ஞாயிறு",
+    "Mon." : "திங்கள்",
+    "Tue." : "செவ்வாய்",
+    "Wed." : "புதன்",
+    "Thu." : "வியாழன்",
+    "Fri." : "வெள்ளி",
+    "Sat." : "சனி",
     "January" : "தை",
     "February" : "மாசி",
     "March" : "பங்குனி",
@@ -18,6 +25,18 @@
     "October" : "ஐப்பசி",
     "November" : "கார்த்திகை",
     "December" : "மார்கழி",
+    "Jan." : "தை",
+    "Feb." : "மாசி",
+    "Mar." : "பங்குனி",
+    "Apr." : "சித்திரை",
+    "May." : "வைகாசி",
+    "Jun." : "ஆனி",
+    "Jul." : "ஆடி",
+    "Aug." : "ஆவணி",
+    "Sep." : "புரட்டாதி",
+    "Oct." : "ஐப்பசி",
+    "Nov." : "கார்த்திகை",
+    "Dec." : "மார்கழி",
     "Settings" : "அமைப்புகள்",
     "Saving..." : "சேமிக்கப்படுகிறது...",
     "No" : "இல்லை",
@@ -25,13 +44,13 @@
     "Choose" : "தெரிவுசெய்க ",
     "Ok" : "சரி",
     "Cancel" : "இரத்து செய்க",
-    "Share" : "பகிர்வு",
     "Error" : "வழு",
     "Error while sharing" : "பகிரும் போதான வழு",
     "Error while unsharing" : "பகிராமல் உள்ளப்போதான வழு",
     "Error while changing permissions" : "அனுமதிகள் மாறும்போதான வழு",
     "Shared with you and the group {group} by {owner}" : "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
     "Shared with you by {owner}" : "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Share" : "பகிர்வு",
     "Password protect" : "கடவுச்சொல்லை பாதுகாத்தல்",
     "Password" : "கடவுச்சொல்",
     "Set expiration date" : "காலாவதி தேதியை குறிப்பிடுக",
@@ -72,7 +91,7 @@
     "Finish setup" : "அமைப்பை முடிக்க",
     "Log out" : "விடுபதிகை செய்க",
     "Search" : "தேடுதல்",
-    "remember" : "ஞாபகப்படுத்துக",
-    "Log in" : "புகுபதிகை"
+    "Log in" : "புகுபதிகை",
+    "remember" : "ஞாபகப்படுத்துக"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index 9e56c2e84d..f72fa3ee38 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "ไม่สามารถส่งอีเมลไปยังผู้ใช้: %s",
+    "Preparing update" : "เตรียมอัพเดท",
     "Turned on maintenance mode" : "เปิดโหมดการบำรุงรักษา",
     "Turned off maintenance mode" : "ปิดโหมดการบำรุงรักษา",
     "Maintenance mode is kept active" : "โหมดการบำรุงรักษาจะถูกเก็บไว้ใช้งาน",
@@ -13,6 +14,7 @@ OC.L10N.register(
     "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:",
     "Following incompatible apps have been disabled: %s" : "แอพพลิเคชันต่อไปนี้เข้ากันไม่ได้มันจะถูกปิดการใช้งาน: %s",
     "Following apps have been disabled: %s" : "แอพฯดังต่อไปนี้ถูกปิดการใช้งาน: %s",
+    "Already up to date" : "มีอยู่แล้วถึงวันที่",
     "File is too big" : "ไฟล์มีขนาดใหญ่เกินไป",
     "Invalid file provided" : "ระบุไฟล์ไม่ถูกต้อง",
     "No image or file provided" : "ไม่มีรูปภาพหรือไฟล์ที่ระบุ",
@@ -29,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "วันพฤหัสบดี",
     "Friday" : "วันศุกร์",
     "Saturday" : "วันเสาร์",
+    "Sun." : "อา.",
+    "Mon." : "จ.",
+    "Tue." : "อ.",
+    "Wed." : "พ.",
+    "Thu." : "พฤ.",
+    "Fri." : "ศ.",
+    "Sat." : "ส.",
+    "Su" : "อา",
+    "Mo" : "จัน",
+    "Tu" : "อัง",
+    "We" : "พุธ",
+    "Th" : "พฤ",
+    "Fr" : "ศุก",
+    "Sa" : "เสา",
     "January" : "มกราคม",
     "February" : "กุมภาพันธ์",
     "March" : "มีนาคม",
@@ -41,6 +57,18 @@ OC.L10N.register(
     "October" : "ตุลาคม",
     "November" : "พฤศจิกายน",
     "December" : "ธันวาคม",
+    "Jan." : "ม.ค.",
+    "Feb." : "ก.พ.",
+    "Mar." : "มี.ค.",
+    "Apr." : "เม.ย.",
+    "May." : "พ.ค.",
+    "Jun." : "มิ.ย.",
+    "Jul." : "ก.ค.",
+    "Aug." : "ส.ค.",
+    "Sep." : "ก.ย.",
+    "Oct." : "ต.ค.",
+    "Nov." : "พ.ย.",
+    "Dec." : "ธ.ค.",
     "Settings" : "ตั้งค่า",
     "Saving..." : "กำลังบันทึกข้อมูล...",
     "Couldn't send reset email. Please contact your administrator." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่ กรุณาติดต่อผู้ดูแลระบบ",
@@ -71,18 +99,19 @@ OC.L10N.register(
     "So-so password" : "รหัสผ่านระดับปกติ",
     "Good password" : "รหัสผ่านระดับดี",
     "Strong password" : "รหัสผ่านระดับดีมาก",
-    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "เว็บเซิร์ฟเวอร์ของคุณยังไม่ถูกติดตั้งอย่างถูกต้องเพื่ออนุญาตให้ผสานข้อมูลให้ตรงกัน เนื่องจากอินเตอร์เฟซ WebDAV อาจเสียหาย",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "เว็บเซิร์ฟเวอร์ของคุณยังไม่ถูกติดตั้งอย่างถูกต้องเพื่ออนุญาตให้ประสานข้อมูลให้ตรงกัน เนื่องจากอินเตอร์เฟซ WebDAV อาจเสียหาย",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "เซิร์ฟเวอร์นี้ไม่มีการเชื่อมต่ออินเทอร์เน็ตซึ่งหมายความว่าบางส่วนของคุณสมบัติ เช่น การจัดเก็บข้อมูลภายนอก การแจ้งเตือนเกี่ยวกับการปรับปรุงหรือการติดตั้งแอพพลิเคชันของบุคคลที่สามจะไม่ทำงาน การเข้าถึงไฟล์จากระยะไกลและการส่งอีเมล์แจ้งเตือนอาจจะไม่ทำงาน เราขอแนะนำให้เปิดใช้งานการเชื่อมต่ออินเทอร์เน็ตสำหรับเซิร์ฟเวอร์นี้ถ้าคุณต้องการใช้งานคุณสมบัติทั้งหมด",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "ข้อมูลไดเรกทอรีและไฟล์ของคุณอาจจะสามารถเข้าถึงได้จากอินเทอร์เน็ต ขณะที่ htaccess ไฟล์ไม่ทำงาน เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ของคุณในทางที่ข้อมูลไดเรกทอรีไม่สามารถเข้าถึงได้หรือคุณย้ายข้อมูลไดเรกทอรีไปยังนอกเว็บเซิร์ฟเวอร์หรือเอกสาร",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "ไม่ได้ตั้งค่าหน่วยความจำแคช เพื่อเพิ่มประสิทธิภาพกรุณาตั้งค่า Memcache ของคุณ สามารถดูข้อมูลเพิ่มเติมได้ที่ <a href=\"{docLink}\">เอกสาร</a>",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ไม่สามารถอ่านโดย PHP ซึ่งมีผลด้านความปลอดภัยเป็นอย่างมาก สามารถดูข้อมูลเพิ่มเติมได้ที่ <a href=\"{docLink}\">เอกสาร</a>",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "PHP รุ่น ({version}) ของคุณ จะไม่ได้รับ <a href=\"{phpLink}\">การสนับสนุนโดย PHP</a> เราขอแนะนำให้คุณอัพเกรดรุ่นของ PHP เพื่อความปลอดภัย",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "การกำหนดค่าพร็อกซี่ไม่ถูกต้องหรือคุณกำลังเข้าถึง ownCloud จากพร็อกซี่ที่เชื่อถือได้ ถ้าคุณไม่ได้เข้าถึง ownCloud จากพร็อกซี่ที่เชื่อถือได้ นี้เป็นปัญหาด้านความปลอดภัย คุณอาจถูกโจมดีจากผู้ไม่หวังดี อ่านข้อมูลเพิ่มเติมได้ที่ <a href=\"{docLink}\">เอกสาร</a>",
     "Error occurred while checking server setup" : "เกิดข้อผิดพลาดขณะที่ทำการตรวจสอบการติดตั้งเซิร์ฟเวอร์",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" ไม่ได้กำหนดค่าส่วนหัว Http ให้เท่ากับ \"{expected}\" นี่คือระบบการรักษาความปลอดภัยที่มีศักยภาพหรือลดความเสี่ยงที่จะเกิดขึ้นเราขอแนะนำให้ปรับการตั้งค่านี้",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" ส่วนหัว HTTP ไม่ได้กำหนดค่าให้น้อยกว่า \"{seconds}\" วินาที เพื่อความปลอดภัยที่เพิ่มขึ้นเราขอแนะนำให้เปิดใช้งาน HSTS ที่อธิบายไว้ใน <a href=\"{docUrl}\">เคล็ดลับการรักษาความปลอดภัย</a> ของเรา",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "คุณกำลังเข้าถึงเว็บไซต์นี้ผ่านทาง HTTP เราขอแนะนำให้คุณกำหนดค่าเซิร์ฟเวอร์ของคุณที่จะต้องใช้ HTTPS แทนตามที่อธิบายไว้ใน <a href=\"{docUrl}\">เคล็ดลับการรักษาความปลอดภัย</a> ของเรา",
     "Shared" : "แชร์แล้ว",
     "Shared with {recipients}" : "แชร์กับ {recipients}",
-    "Share" : "แชร์",
     "Error" : "ข้อผิดพลาด",
     "Error while sharing" : "เกิดข้อผิดพลาดขณะกำลังแชร์ข้อมูล",
     "Error while unsharing" : "เกิดข้อผิดพลาดขณะกำลังยกเลิกการแชร์ข้อมูล",
@@ -91,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
     "Share with users or groups …" : "แชร์กับผู้ใช้หรือกลุ่ม ...",
     "Share with users, groups or remote users …" : "แชร์กับผู้ใช้กลุ่มหรือผู้ใช้ระยะไกล ...",
+    "Share" : "แชร์",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ",
     "Share link" : "แชร์ลิงค์",
     "The public link will expire no later than {days} days after it is created" : "ลิงค์สาธารณะจะหมดอายุภายใน {days} วัน หลังจากที่มันถูกสร้างขึ้น",
@@ -144,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "การอัพเดทสำเร็จ แต่มีคำเตือนอยู่",
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อย กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Couldn't reset password because the token is invalid" : "ไม่สามารถตั้งรหัสผ่านใหม่เพราะโทเค็นไม่ถูกต้อง",
+    "Couldn't reset password because the token is expired" : "ไม่สามารถตั้งค่ารหัสผ่านเพราะโทเค็นหมดอายุ",
     "Couldn't send reset email. Please make sure your username is correct." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่ กรุณาตรวจสอบชื่อผู้ใช้ของคุณให้ถูกต้อง",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่เพราะไม่มีที่อยู่อีเมลนี้ กรุณาติดต่อผู้ดูแลระบบ",
     "%s password reset" : "%s ตั้งรหัสผ่านใหม่",
@@ -205,7 +236,7 @@ OC.L10N.register(
     "Performance warning" : "การเตือนประสิทธิภาพการทำงาน",
     "SQLite will be used as database." : "SQLite จะถูกใช้เป็นฐานข้อมูล",
     "For larger installations we recommend to choose a different database backend." : "สำหรับการติดตั้งขนาดใหญ่เราขอแนะนำให้เลือกแบ็กเอนด์ฐานข้อมูลที่แตกต่างกัน",
-    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการผสานข้อมูลโดย SQLite",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการประสานข้อมูลโดย SQLite",
     "Finish setup" : "ติดตั้งเรียบร้อยแล้ว",
     "Finishing …" : "เสร็จสิ้น ...",
     "Need help?" : "ต้องการความช่วยเหลือ?",
@@ -217,9 +248,9 @@ OC.L10N.register(
     "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ",
     "An internal error occured." : "เกิดข้อผิดพลาดภายใน",
     "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ",
-    "Forgot your password? Reset it!" : "ลืมรหัสผ่าน?",
-    "remember" : "จดจำฉัน",
     "Log in" : "เข้าสู่ระบบ",
+    "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?",
+    "remember" : "จดจำฉัน",
     "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "นี่คุณ,<br><br>อยากให้คุณทราบว่า %s ได้แชร์ <strong>%s</strong> กับคุณ <br><a href=\"%s\">คลิกดูที่นี่</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ขณะนี้ ownCloud อยู่ในโหมดผู้ใช้คนเดียว",
@@ -230,8 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "กรุณาติดต่อผู้ดูแลระบบ หากคุณเป็นผู้ดูแลระบบโปรดกำหนดค่า \"trusted_domain\" โดยตั้งค่าใน config/config.php ยกตัวอย่างระบุการตั้งค่าใน config/config.sample.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "ทั้งนี้ขึ้นอยู่กับการกำหนดค่าของคุณ ผู้ดูแลระบบอาจสามารถใช้ปุ่มด้านล่างเพื่อกำหนดให้โดเมนนี้มีความน่าเชื่อถือ",
     "Add \"%s\" as trusted domain" : "ได้เพิ่ม \"%s\" เป็นโดเมนที่เชื่อถือ",
-    "%s will be updated to version %s." : "%s จะถูกอัพเดทให้เป็นรุ่น %s",
-    "The following apps will be disabled:" : "แอพพลิเคชันต่อไปนี้จะปิดการใช้งาน:",
+    "App update required" : "จำเป้นต้องอัพเดทแอพฯ",
+    "%s will be updated to version %s" : "%s จะถูกอัพเดทเป็นเวอร์ชัน %s",
+    "These apps will be updated:" : "แอพพลิเคชันเหล่านี้จะถูกอัพเดท:",
+    "These incompatible apps will be disabled:" : "แอพพลิเคชันเหล่านี้เข้ากันไม่ได้จะถูกปิดการใช้งาน:",
     "The theme %s has been disabled." : "ธีม %s จะถูกปิดการใช้งาน:",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "โปรดตรวจสอบฐานข้อมูล การตั้งค่าโฟลเดอร์และโฟลเดอร์ข้อมูลจะถูกสำรองไว้ก่อนดำเนินการ",
     "Start update" : "เริ่มต้นอัพเดท",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index 8dc55d8f0e..d808685898 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "ไม่สามารถส่งอีเมลไปยังผู้ใช้: %s",
+    "Preparing update" : "เตรียมอัพเดท",
     "Turned on maintenance mode" : "เปิดโหมดการบำรุงรักษา",
     "Turned off maintenance mode" : "ปิดโหมดการบำรุงรักษา",
     "Maintenance mode is kept active" : "โหมดการบำรุงรักษาจะถูกเก็บไว้ใช้งาน",
@@ -11,6 +12,7 @@
     "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:",
     "Following incompatible apps have been disabled: %s" : "แอพพลิเคชันต่อไปนี้เข้ากันไม่ได้มันจะถูกปิดการใช้งาน: %s",
     "Following apps have been disabled: %s" : "แอพฯดังต่อไปนี้ถูกปิดการใช้งาน: %s",
+    "Already up to date" : "มีอยู่แล้วถึงวันที่",
     "File is too big" : "ไฟล์มีขนาดใหญ่เกินไป",
     "Invalid file provided" : "ระบุไฟล์ไม่ถูกต้อง",
     "No image or file provided" : "ไม่มีรูปภาพหรือไฟล์ที่ระบุ",
@@ -27,6 +29,20 @@
     "Thursday" : "วันพฤหัสบดี",
     "Friday" : "วันศุกร์",
     "Saturday" : "วันเสาร์",
+    "Sun." : "อา.",
+    "Mon." : "จ.",
+    "Tue." : "อ.",
+    "Wed." : "พ.",
+    "Thu." : "พฤ.",
+    "Fri." : "ศ.",
+    "Sat." : "ส.",
+    "Su" : "อา",
+    "Mo" : "จัน",
+    "Tu" : "อัง",
+    "We" : "พุธ",
+    "Th" : "พฤ",
+    "Fr" : "ศุก",
+    "Sa" : "เสา",
     "January" : "มกราคม",
     "February" : "กุมภาพันธ์",
     "March" : "มีนาคม",
@@ -39,6 +55,18 @@
     "October" : "ตุลาคม",
     "November" : "พฤศจิกายน",
     "December" : "ธันวาคม",
+    "Jan." : "ม.ค.",
+    "Feb." : "ก.พ.",
+    "Mar." : "มี.ค.",
+    "Apr." : "เม.ย.",
+    "May." : "พ.ค.",
+    "Jun." : "มิ.ย.",
+    "Jul." : "ก.ค.",
+    "Aug." : "ส.ค.",
+    "Sep." : "ก.ย.",
+    "Oct." : "ต.ค.",
+    "Nov." : "พ.ย.",
+    "Dec." : "ธ.ค.",
     "Settings" : "ตั้งค่า",
     "Saving..." : "กำลังบันทึกข้อมูล...",
     "Couldn't send reset email. Please contact your administrator." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่ กรุณาติดต่อผู้ดูแลระบบ",
@@ -69,18 +97,19 @@
     "So-so password" : "รหัสผ่านระดับปกติ",
     "Good password" : "รหัสผ่านระดับดี",
     "Strong password" : "รหัสผ่านระดับดีมาก",
-    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "เว็บเซิร์ฟเวอร์ของคุณยังไม่ถูกติดตั้งอย่างถูกต้องเพื่ออนุญาตให้ผสานข้อมูลให้ตรงกัน เนื่องจากอินเตอร์เฟซ WebDAV อาจเสียหาย",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "เว็บเซิร์ฟเวอร์ของคุณยังไม่ถูกติดตั้งอย่างถูกต้องเพื่ออนุญาตให้ประสานข้อมูลให้ตรงกัน เนื่องจากอินเตอร์เฟซ WebDAV อาจเสียหาย",
     "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "เซิร์ฟเวอร์นี้ไม่มีการเชื่อมต่ออินเทอร์เน็ตซึ่งหมายความว่าบางส่วนของคุณสมบัติ เช่น การจัดเก็บข้อมูลภายนอก การแจ้งเตือนเกี่ยวกับการปรับปรุงหรือการติดตั้งแอพพลิเคชันของบุคคลที่สามจะไม่ทำงาน การเข้าถึงไฟล์จากระยะไกลและการส่งอีเมล์แจ้งเตือนอาจจะไม่ทำงาน เราขอแนะนำให้เปิดใช้งานการเชื่อมต่ออินเทอร์เน็ตสำหรับเซิร์ฟเวอร์นี้ถ้าคุณต้องการใช้งานคุณสมบัติทั้งหมด",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "ข้อมูลไดเรกทอรีและไฟล์ของคุณอาจจะสามารถเข้าถึงได้จากอินเทอร์เน็ต ขณะที่ htaccess ไฟล์ไม่ทำงาน เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ของคุณในทางที่ข้อมูลไดเรกทอรีไม่สามารถเข้าถึงได้หรือคุณย้ายข้อมูลไดเรกทอรีไปยังนอกเว็บเซิร์ฟเวอร์หรือเอกสาร",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "ไม่ได้ตั้งค่าหน่วยความจำแคช เพื่อเพิ่มประสิทธิภาพกรุณาตั้งค่า Memcache ของคุณ สามารถดูข้อมูลเพิ่มเติมได้ที่ <a href=\"{docLink}\">เอกสาร</a>",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom ไม่สามารถอ่านโดย PHP ซึ่งมีผลด้านความปลอดภัยเป็นอย่างมาก สามารถดูข้อมูลเพิ่มเติมได้ที่ <a href=\"{docLink}\">เอกสาร</a>",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "PHP รุ่น ({version}) ของคุณ จะไม่ได้รับ <a href=\"{phpLink}\">การสนับสนุนโดย PHP</a> เราขอแนะนำให้คุณอัพเกรดรุ่นของ PHP เพื่อความปลอดภัย",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "การกำหนดค่าพร็อกซี่ไม่ถูกต้องหรือคุณกำลังเข้าถึง ownCloud จากพร็อกซี่ที่เชื่อถือได้ ถ้าคุณไม่ได้เข้าถึง ownCloud จากพร็อกซี่ที่เชื่อถือได้ นี้เป็นปัญหาด้านความปลอดภัย คุณอาจถูกโจมดีจากผู้ไม่หวังดี อ่านข้อมูลเพิ่มเติมได้ที่ <a href=\"{docLink}\">เอกสาร</a>",
     "Error occurred while checking server setup" : "เกิดข้อผิดพลาดขณะที่ทำการตรวจสอบการติดตั้งเซิร์ฟเวอร์",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" ไม่ได้กำหนดค่าส่วนหัว Http ให้เท่ากับ \"{expected}\" นี่คือระบบการรักษาความปลอดภัยที่มีศักยภาพหรือลดความเสี่ยงที่จะเกิดขึ้นเราขอแนะนำให้ปรับการตั้งค่านี้",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" ส่วนหัว HTTP ไม่ได้กำหนดค่าให้น้อยกว่า \"{seconds}\" วินาที เพื่อความปลอดภัยที่เพิ่มขึ้นเราขอแนะนำให้เปิดใช้งาน HSTS ที่อธิบายไว้ใน <a href=\"{docUrl}\">เคล็ดลับการรักษาความปลอดภัย</a> ของเรา",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "คุณกำลังเข้าถึงเว็บไซต์นี้ผ่านทาง HTTP เราขอแนะนำให้คุณกำหนดค่าเซิร์ฟเวอร์ของคุณที่จะต้องใช้ HTTPS แทนตามที่อธิบายไว้ใน <a href=\"{docUrl}\">เคล็ดลับการรักษาความปลอดภัย</a> ของเรา",
     "Shared" : "แชร์แล้ว",
     "Shared with {recipients}" : "แชร์กับ {recipients}",
-    "Share" : "แชร์",
     "Error" : "ข้อผิดพลาด",
     "Error while sharing" : "เกิดข้อผิดพลาดขณะกำลังแชร์ข้อมูล",
     "Error while unsharing" : "เกิดข้อผิดพลาดขณะกำลังยกเลิกการแชร์ข้อมูล",
@@ -89,6 +118,7 @@
     "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
     "Share with users or groups …" : "แชร์กับผู้ใช้หรือกลุ่ม ...",
     "Share with users, groups or remote users …" : "แชร์กับผู้ใช้กลุ่มหรือผู้ใช้ระยะไกล ...",
+    "Share" : "แชร์",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "แชร์กับคนใน ownClouds อื่นๆ ที่ใช้ไวยากรณ์ username@example.com/owncloud ",
     "Share link" : "แชร์ลิงค์",
     "The public link will expire no later than {days} days after it is created" : "ลิงค์สาธารณะจะหมดอายุภายใน {days} วัน หลังจากที่มันถูกสร้างขึ้น",
@@ -142,6 +172,7 @@
     "The update was successful. There were warnings." : "การอัพเดทสำเร็จ แต่มีคำเตือนอยู่",
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อย กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Couldn't reset password because the token is invalid" : "ไม่สามารถตั้งรหัสผ่านใหม่เพราะโทเค็นไม่ถูกต้อง",
+    "Couldn't reset password because the token is expired" : "ไม่สามารถตั้งค่ารหัสผ่านเพราะโทเค็นหมดอายุ",
     "Couldn't send reset email. Please make sure your username is correct." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่ กรุณาตรวจสอบชื่อผู้ใช้ของคุณให้ถูกต้อง",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "ไม่สามารถส่งการตั้งค่าอีเมลใหม่เพราะไม่มีที่อยู่อีเมลนี้ กรุณาติดต่อผู้ดูแลระบบ",
     "%s password reset" : "%s ตั้งรหัสผ่านใหม่",
@@ -203,7 +234,7 @@
     "Performance warning" : "การเตือนประสิทธิภาพการทำงาน",
     "SQLite will be used as database." : "SQLite จะถูกใช้เป็นฐานข้อมูล",
     "For larger installations we recommend to choose a different database backend." : "สำหรับการติดตั้งขนาดใหญ่เราขอแนะนำให้เลือกแบ็กเอนด์ฐานข้อมูลที่แตกต่างกัน",
-    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการผสานข้อมูลโดย SQLite",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการประสานข้อมูลโดย SQLite",
     "Finish setup" : "ติดตั้งเรียบร้อยแล้ว",
     "Finishing …" : "เสร็จสิ้น ...",
     "Need help?" : "ต้องการความช่วยเหลือ?",
@@ -215,9 +246,9 @@
     "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ",
     "An internal error occured." : "เกิดข้อผิดพลาดภายใน",
     "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ",
-    "Forgot your password? Reset it!" : "ลืมรหัสผ่าน?",
-    "remember" : "จดจำฉัน",
     "Log in" : "เข้าสู่ระบบ",
+    "Wrong password. Reset it?" : "รหัสผ่านผิด ตั้งค่าใหม่?",
+    "remember" : "จดจำฉัน",
     "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "นี่คุณ,<br><br>อยากให้คุณทราบว่า %s ได้แชร์ <strong>%s</strong> กับคุณ <br><a href=\"%s\">คลิกดูที่นี่</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "ขณะนี้ ownCloud อยู่ในโหมดผู้ใช้คนเดียว",
@@ -228,8 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "กรุณาติดต่อผู้ดูแลระบบ หากคุณเป็นผู้ดูแลระบบโปรดกำหนดค่า \"trusted_domain\" โดยตั้งค่าใน config/config.php ยกตัวอย่างระบุการตั้งค่าใน config/config.sample.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "ทั้งนี้ขึ้นอยู่กับการกำหนดค่าของคุณ ผู้ดูแลระบบอาจสามารถใช้ปุ่มด้านล่างเพื่อกำหนดให้โดเมนนี้มีความน่าเชื่อถือ",
     "Add \"%s\" as trusted domain" : "ได้เพิ่ม \"%s\" เป็นโดเมนที่เชื่อถือ",
-    "%s will be updated to version %s." : "%s จะถูกอัพเดทให้เป็นรุ่น %s",
-    "The following apps will be disabled:" : "แอพพลิเคชันต่อไปนี้จะปิดการใช้งาน:",
+    "App update required" : "จำเป้นต้องอัพเดทแอพฯ",
+    "%s will be updated to version %s" : "%s จะถูกอัพเดทเป็นเวอร์ชัน %s",
+    "These apps will be updated:" : "แอพพลิเคชันเหล่านี้จะถูกอัพเดท:",
+    "These incompatible apps will be disabled:" : "แอพพลิเคชันเหล่านี้เข้ากันไม่ได้จะถูกปิดการใช้งาน:",
     "The theme %s has been disabled." : "ธีม %s จะถูกปิดการใช้งาน:",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "โปรดตรวจสอบฐานข้อมูล การตั้งค่าโฟลเดอร์และโฟลเดอร์ข้อมูลจะถูกสำรองไว้ก่อนดำเนินการ",
     "Start update" : "เริ่มต้นอัพเดท",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index f61553d893..c250f91989 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "Şu kullanıcılara posta gönderilemedi: %s",
+    "Preparing update" : "Güncelleme hazırlanıyor",
     "Turned on maintenance mode" : "Bakım kipi etkinleştirildi",
     "Turned off maintenance mode" : "Bakım kipi kapatıldı",
     "Maintenance mode is kept active" : "Bakım kipi etkin tutuldu",
@@ -13,6 +14,8 @@ OC.L10N.register(
     "Repair error: " : "Onarım hatası:",
     "Following incompatible apps have been disabled: %s" : "Aşağıdaki uyumsuz uygulamalar devre dışı bırakıldı: %s",
     "Following apps have been disabled: %s" : "Aşağıdaki uygulamalar devre dışı bırakıldı: %s",
+    "Already up to date" : "Zaten güncel",
+    "File is too big" : "Dosya çok büyük",
     "Invalid file provided" : "Geçersiz dosya sağlandı",
     "No image or file provided" : "Resim veya dosya belirtilmedi",
     "Unknown filetype" : "Bilinmeyen dosya türü",
@@ -28,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "Perşembe",
     "Friday" : "Cuma",
     "Saturday" : "Cumartesi",
+    "Sun." : "Paz.",
+    "Mon." : "Pzt.",
+    "Tue." : "Sal.",
+    "Wed." : "Çar.",
+    "Thu." : "Per.",
+    "Fri." : "Cum.",
+    "Sat." : "Cmt.",
+    "Su" : "Pa",
+    "Mo" : "Pt",
+    "Tu" : "Sa",
+    "We" : "Ça",
+    "Th" : "Pe",
+    "Fr" : "Cu",
+    "Sa" : "Ct",
     "January" : "Ocak",
     "February" : "Şubat",
     "March" : "Mart",
@@ -40,6 +57,18 @@ OC.L10N.register(
     "October" : "Ekim",
     "November" : "Kasım",
     "December" : "Aralık",
+    "Jan." : "Oca.",
+    "Feb." : "Şbt.",
+    "Mar." : "Mar.",
+    "Apr." : "Nis",
+    "May." : "May.",
+    "Jun." : "Haz.",
+    "Jul." : "Tem.",
+    "Aug." : "Ağu.",
+    "Sep." : "Eyl.",
+    "Oct." : "Eki.",
+    "Nov." : "Kas.",
+    "Dec." : "Ara.",
     "Settings" : "Ayarlar",
     "Saving..." : "Kaydediliyor...",
     "Couldn't send reset email. Please contact your administrator." : "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
@@ -75,13 +104,14 @@ OC.L10N.register(
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "data dizininiz ve dosyalarınız büyük ihtimalle İnternet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu belge dizini dışına almanızı şiddetle tavsiye ederiz.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Hafıza önbelleği ayarlanmamış. Performansın artması için mümkünse lütfen bir memcache ayarlayın. Detaylı bilgiye <a href=\"{docLink}\">belgelendirmemizden</a> ulaşabilirsiniz.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Güvenlik sebepleri ile şiddetle kaçınılması gereken /dev/urandom PHP tarafından okunamıyor. Daha fazla bilgi <a href=\"{docLink}\">belgelendirmemizde</a> bulunabilir.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Kullandığınız PHP sürümü ({version}) artık <a href=\"{phpLink}\">PHP tarafından desteklenmiyor</a>. PHP tarafından sağlanan performans ve güvenlik güncellemelerinden faydalanmak için PHP sürümünüzü güncellemenizi öneririz.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Ters vekil sunucu başlık yapılandırması hatalı veya ownCloud'a güvenilen bir vekil sunucusundan erişiyorsunuz. ownCloud'a güvenilen bir vekil sunucusundan erişmiyorsanız bu bir güvenlik problemidir ve bir saldırganın IP adresinizi taklit etmesine izin verebilir. Ayrıntılı bilgiyi <a href=\"{docLink}\">belgelendirmemizde</a> bulabilirsiniz.",
     "Error occurred while checking server setup" : "Sunucu yapılandırması denetlenirken hata oluştu",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP başlığı \"{expected}\" ile eşleşmek üzere yapılandırılmamış. Bu muhtemel bir güvenlik veya gizlilik riski olduğundan bu ayarı düzeltmenizi öneririz.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP başlığı en az \"{seconds}\" saniye olarak ayarlanmış. İyileştirilmiş güvenlik için <a href=\"{docUrl}\">güvenlik ipuçlarımızda</a> belirtilen HSTS etkinleştirmesini öneririz.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Bu siteye HTTP aracılığıyla erişiyorsunuz. Sunucunuzu <a href=\"{docUrl}\">güvenlik ipuçlarımızda</a> gösterildiği şekilde HTTPS kullanımını zorlamak üzere yapılandırmanızı şiddetle öneririz.",
     "Shared" : "Paylaşılan",
     "Shared with {recipients}" : "{recipients} ile paylaşılmış",
-    "Share" : "Paylaş",
     "Error" : "Hata",
     "Error while sharing" : "Paylaşım sırasında hata",
     "Error while unsharing" : "Paylaşım iptal edilirken hata",
@@ -90,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşıldı",
     "Share with users or groups …" : "Kullanıcı ve gruplarla paylaş...",
     "Share with users, groups or remote users …" : "Kullanıcılar, gruplar veya uzak kullanıcılarla paylaş ...",
+    "Share" : "Paylaş",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş",
     "Share link" : "Paylaşma bağlantısı",
     "The public link will expire no later than {days} days after it is created" : "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
@@ -143,6 +174,7 @@ OC.L10N.register(
     "The update was successful. There were warnings." : "Güncelleme başarılı. Uyarılar mevcut.",
     "The update was successful. Redirecting you to ownCloud now." : "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.",
     "Couldn't reset password because the token is invalid" : "Belirteç geçersiz olduğundan parola sıfırlanamadı",
+    "Couldn't reset password because the token is expired" : "Jeton zaman aşımına uğradığından parola sıfırlanamadı",
     "Couldn't send reset email. Please make sure your username is correct." : "Sıfırlama e-postası gönderilemedi. Lütfen kullanıcı adınızın doğru olduğundan emin olun.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Sıfırlama e-postası, bu kullanıcı için bir e-posta adresi olmadığından gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "%s password reset" : "%s parola sıfırlama",
@@ -216,9 +248,9 @@ OC.L10N.register(
     "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
     "An internal error occured." : "Dahili bir hata oluştu.",
     "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.",
-    "Forgot your password? Reset it!" : "Parolanızı mı unuttunuz? Sıfırlayın!",
-    "remember" : "hatırla",
     "Log in" : "Giriş yap",
+    "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?",
+    "remember" : "hatırla",
     "Alternative Logins" : "Alternatif Girişler",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Merhaba, <br><br>%s kullanıcısının sizinle <strong>%s</strong> paylaşımında bulunduğunu bildirmek istedik.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Bu ownCloud örneği şu anda tek kullanıcı kipinde.",
@@ -229,8 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Yapılandırmanıza bağlı olarak, bir yönetici olarak bu alan adına güvenmek için aşağıdaki düğmeyi de kullanabilirsiniz.",
     "Add \"%s\" as trusted domain" : "\"%s\" alan adını güvenilir olarak ekle",
-    "%s will be updated to version %s." : "%s, %s sürümüne güncellenecek.",
-    "The following apps will be disabled:" : "Aşağıdaki uygulamalar devre dışı bırakılacak:",
+    "App update required" : "Uygulama güncellemesi gerekli",
+    "%s will be updated to version %s" : "%s, %s sürümüne güncellenecek",
+    "These apps will be updated:" : "Bu uygulamalar güncellenecek:",
+    "These incompatible apps will be disabled:" : "Bu uyumsuz uygulamalar kapatılacaklar:",
     "The theme %s has been disabled." : "%s teması devre dışı bırakıldı.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Devam etmeden önce lütfen veritabanının, yapılandırma ve veri klasörlerinin yedeklenmiş olduğundan emin olun.",
     "Start update" : "Güncellemeyi başlat",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index 01a813a77a..6fa7aa63c1 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "Şu kullanıcılara posta gönderilemedi: %s",
+    "Preparing update" : "Güncelleme hazırlanıyor",
     "Turned on maintenance mode" : "Bakım kipi etkinleştirildi",
     "Turned off maintenance mode" : "Bakım kipi kapatıldı",
     "Maintenance mode is kept active" : "Bakım kipi etkin tutuldu",
@@ -11,6 +12,8 @@
     "Repair error: " : "Onarım hatası:",
     "Following incompatible apps have been disabled: %s" : "Aşağıdaki uyumsuz uygulamalar devre dışı bırakıldı: %s",
     "Following apps have been disabled: %s" : "Aşağıdaki uygulamalar devre dışı bırakıldı: %s",
+    "Already up to date" : "Zaten güncel",
+    "File is too big" : "Dosya çok büyük",
     "Invalid file provided" : "Geçersiz dosya sağlandı",
     "No image or file provided" : "Resim veya dosya belirtilmedi",
     "Unknown filetype" : "Bilinmeyen dosya türü",
@@ -26,6 +29,20 @@
     "Thursday" : "Perşembe",
     "Friday" : "Cuma",
     "Saturday" : "Cumartesi",
+    "Sun." : "Paz.",
+    "Mon." : "Pzt.",
+    "Tue." : "Sal.",
+    "Wed." : "Çar.",
+    "Thu." : "Per.",
+    "Fri." : "Cum.",
+    "Sat." : "Cmt.",
+    "Su" : "Pa",
+    "Mo" : "Pt",
+    "Tu" : "Sa",
+    "We" : "Ça",
+    "Th" : "Pe",
+    "Fr" : "Cu",
+    "Sa" : "Ct",
     "January" : "Ocak",
     "February" : "Şubat",
     "March" : "Mart",
@@ -38,6 +55,18 @@
     "October" : "Ekim",
     "November" : "Kasım",
     "December" : "Aralık",
+    "Jan." : "Oca.",
+    "Feb." : "Şbt.",
+    "Mar." : "Mar.",
+    "Apr." : "Nis",
+    "May." : "May.",
+    "Jun." : "Haz.",
+    "Jul." : "Tem.",
+    "Aug." : "Ağu.",
+    "Sep." : "Eyl.",
+    "Oct." : "Eki.",
+    "Nov." : "Kas.",
+    "Dec." : "Ara.",
     "Settings" : "Ayarlar",
     "Saving..." : "Kaydediliyor...",
     "Couldn't send reset email. Please contact your administrator." : "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
@@ -73,13 +102,14 @@
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "data dizininiz ve dosyalarınız büyük ihtimalle İnternet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu belge dizini dışına almanızı şiddetle tavsiye ederiz.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Hafıza önbelleği ayarlanmamış. Performansın artması için mümkünse lütfen bir memcache ayarlayın. Detaylı bilgiye <a href=\"{docLink}\">belgelendirmemizden</a> ulaşabilirsiniz.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Güvenlik sebepleri ile şiddetle kaçınılması gereken /dev/urandom PHP tarafından okunamıyor. Daha fazla bilgi <a href=\"{docLink}\">belgelendirmemizde</a> bulunabilir.",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "Kullandığınız PHP sürümü ({version}) artık <a href=\"{phpLink}\">PHP tarafından desteklenmiyor</a>. PHP tarafından sağlanan performans ve güvenlik güncellemelerinden faydalanmak için PHP sürümünüzü güncellemenizi öneririz.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "Ters vekil sunucu başlık yapılandırması hatalı veya ownCloud'a güvenilen bir vekil sunucusundan erişiyorsunuz. ownCloud'a güvenilen bir vekil sunucusundan erişmiyorsanız bu bir güvenlik problemidir ve bir saldırganın IP adresinizi taklit etmesine izin verebilir. Ayrıntılı bilgiyi <a href=\"{docLink}\">belgelendirmemizde</a> bulabilirsiniz.",
     "Error occurred while checking server setup" : "Sunucu yapılandırması denetlenirken hata oluştu",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP başlığı \"{expected}\" ile eşleşmek üzere yapılandırılmamış. Bu muhtemel bir güvenlik veya gizlilik riski olduğundan bu ayarı düzeltmenizi öneririz.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP başlığı en az \"{seconds}\" saniye olarak ayarlanmış. İyileştirilmiş güvenlik için <a href=\"{docUrl}\">güvenlik ipuçlarımızda</a> belirtilen HSTS etkinleştirmesini öneririz.",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "Bu siteye HTTP aracılığıyla erişiyorsunuz. Sunucunuzu <a href=\"{docUrl}\">güvenlik ipuçlarımızda</a> gösterildiği şekilde HTTPS kullanımını zorlamak üzere yapılandırmanızı şiddetle öneririz.",
     "Shared" : "Paylaşılan",
     "Shared with {recipients}" : "{recipients} ile paylaşılmış",
-    "Share" : "Paylaş",
     "Error" : "Hata",
     "Error while sharing" : "Paylaşım sırasında hata",
     "Error while unsharing" : "Paylaşım iptal edilirken hata",
@@ -88,6 +118,7 @@
     "Shared with you by {owner}" : "{owner} tarafından sizinle paylaşıldı",
     "Share with users or groups …" : "Kullanıcı ve gruplarla paylaş...",
     "Share with users, groups or remote users …" : "Kullanıcılar, gruplar veya uzak kullanıcılarla paylaş ...",
+    "Share" : "Paylaş",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "kullanıcı@example.com/owncloud şeklinde diğer ownCloud kullanan diğer kullanıcılarla paylaş",
     "Share link" : "Paylaşma bağlantısı",
     "The public link will expire no later than {days} days after it is created" : "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
@@ -141,6 +172,7 @@
     "The update was successful. There were warnings." : "Güncelleme başarılı. Uyarılar mevcut.",
     "The update was successful. Redirecting you to ownCloud now." : "Güncelleme başarılı. Şimdi ownCloud'a yönlendiriliyorsunuz.",
     "Couldn't reset password because the token is invalid" : "Belirteç geçersiz olduğundan parola sıfırlanamadı",
+    "Couldn't reset password because the token is expired" : "Jeton zaman aşımına uğradığından parola sıfırlanamadı",
     "Couldn't send reset email. Please make sure your username is correct." : "Sıfırlama e-postası gönderilemedi. Lütfen kullanıcı adınızın doğru olduğundan emin olun.",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Sıfırlama e-postası, bu kullanıcı için bir e-posta adresi olmadığından gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "%s password reset" : "%s parola sıfırlama",
@@ -214,9 +246,9 @@
     "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
     "An internal error occured." : "Dahili bir hata oluştu.",
     "Please try again or contact your administrator." : "Lütfen yeniden deneyin veya yöneticinizle iletişim kurun.",
-    "Forgot your password? Reset it!" : "Parolanızı mı unuttunuz? Sıfırlayın!",
-    "remember" : "hatırla",
     "Log in" : "Giriş yap",
+    "Wrong password. Reset it?" : "Hatalı parola. Sıfırlansın mı?",
+    "remember" : "hatırla",
     "Alternative Logins" : "Alternatif Girişler",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Merhaba, <br><br>%s kullanıcısının sizinle <strong>%s</strong> paylaşımında bulunduğunu bildirmek istedik.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Bu ownCloud örneği şu anda tek kullanıcı kipinde.",
@@ -227,8 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Yapılandırmanıza bağlı olarak, bir yönetici olarak bu alan adına güvenmek için aşağıdaki düğmeyi de kullanabilirsiniz.",
     "Add \"%s\" as trusted domain" : "\"%s\" alan adını güvenilir olarak ekle",
-    "%s will be updated to version %s." : "%s, %s sürümüne güncellenecek.",
-    "The following apps will be disabled:" : "Aşağıdaki uygulamalar devre dışı bırakılacak:",
+    "App update required" : "Uygulama güncellemesi gerekli",
+    "%s will be updated to version %s" : "%s, %s sürümüne güncellenecek",
+    "These apps will be updated:" : "Bu uygulamalar güncellenecek:",
+    "These incompatible apps will be disabled:" : "Bu uyumsuz uygulamalar kapatılacaklar:",
     "The theme %s has been disabled." : "%s teması devre dışı bırakıldı.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Devam etmeden önce lütfen veritabanının, yapılandırma ve veri klasörlerinin yedeklenmiş olduğundan emin olun.",
     "Start update" : "Güncellemeyi başlat",
diff --git a/core/l10n/ug.js b/core/l10n/ug.js
index cced7f3177..092a1a4c18 100644
--- a/core/l10n/ug.js
+++ b/core/l10n/ug.js
@@ -8,6 +8,13 @@ OC.L10N.register(
     "Thursday" : "پەيشەنبە",
     "Friday" : "جۈمە",
     "Saturday" : "شەنبە",
+    "Sun." : "يەك",
+    "Mon." : "دۈش",
+    "Tue." : "سەي",
+    "Wed." : "چار",
+    "Thu." : "پەي",
+    "Fri." : "جۈم",
+    "Sat." : "شەن",
     "January" : "قەھرىتان",
     "February" : "ھۇت",
     "March" : "نەۋرۇز",
@@ -20,14 +27,26 @@ OC.L10N.register(
     "October" : "ئوغۇز",
     "November" : "ئوغلاق",
     "December" : "كۆنەك",
+    "Jan." : "قەھرىتان",
+    "Feb." : "ھۇت",
+    "Mar." : "نەۋرۇز",
+    "Apr." : "ئۇمۇت",
+    "May." : "باھار",
+    "Jun." : "سەپەر",
+    "Jul." : "چىللە",
+    "Aug." : "تومۇز",
+    "Sep." : "مىزان",
+    "Oct." : "ئوغۇز",
+    "Nov." : "ئوغلاق",
+    "Dec." : "كۆنەك",
     "Settings" : "تەڭشەكلەر",
     "Saving..." : "ساقلاۋاتىدۇ…",
     "No" : "ياق",
     "Yes" : "ھەئە",
     "Ok" : "جەزملە",
     "Cancel" : "ۋاز كەچ",
-    "Share" : "ھەمبەھىر",
     "Error" : "خاتالىق",
+    "Share" : "ھەمبەھىر",
     "Password" : "ئىم",
     "Send" : "يوللا",
     "group" : "گۇرۇپپا",
diff --git a/core/l10n/ug.json b/core/l10n/ug.json
index 686a70c2de..dff656d766 100644
--- a/core/l10n/ug.json
+++ b/core/l10n/ug.json
@@ -6,6 +6,13 @@
     "Thursday" : "پەيشەنبە",
     "Friday" : "جۈمە",
     "Saturday" : "شەنبە",
+    "Sun." : "يەك",
+    "Mon." : "دۈش",
+    "Tue." : "سەي",
+    "Wed." : "چار",
+    "Thu." : "پەي",
+    "Fri." : "جۈم",
+    "Sat." : "شەن",
     "January" : "قەھرىتان",
     "February" : "ھۇت",
     "March" : "نەۋرۇز",
@@ -18,14 +25,26 @@
     "October" : "ئوغۇز",
     "November" : "ئوغلاق",
     "December" : "كۆنەك",
+    "Jan." : "قەھرىتان",
+    "Feb." : "ھۇت",
+    "Mar." : "نەۋرۇز",
+    "Apr." : "ئۇمۇت",
+    "May." : "باھار",
+    "Jun." : "سەپەر",
+    "Jul." : "چىللە",
+    "Aug." : "تومۇز",
+    "Sep." : "مىزان",
+    "Oct." : "ئوغۇز",
+    "Nov." : "ئوغلاق",
+    "Dec." : "كۆنەك",
     "Settings" : "تەڭشەكلەر",
     "Saving..." : "ساقلاۋاتىدۇ…",
     "No" : "ياق",
     "Yes" : "ھەئە",
     "Ok" : "جەزملە",
     "Cancel" : "ۋاز كەچ",
-    "Share" : "ھەمبەھىر",
     "Error" : "خاتالىق",
+    "Share" : "ھەمبەھىر",
     "Password" : "ئىم",
     "Send" : "يوللا",
     "group" : "گۇرۇپپا",
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index 2792ace687..e73f854f5e 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -26,6 +26,13 @@ OC.L10N.register(
     "Thursday" : "Четвер",
     "Friday" : "П'ятниця",
     "Saturday" : "Субота",
+    "Sun." : "Нед.",
+    "Mon." : "Пн.",
+    "Tue." : "Вт.",
+    "Wed." : "Ср.",
+    "Thu." : "Чт.",
+    "Fri." : "Пт.",
+    "Sat." : "Сб.",
     "January" : "Січень",
     "February" : "Лютий",
     "March" : "Березень",
@@ -38,6 +45,18 @@ OC.L10N.register(
     "October" : "Жовтень",
     "November" : "Листопад",
     "December" : "Грудень",
+    "Jan." : "Січ.",
+    "Feb." : "Лют.",
+    "Mar." : "Бер.",
+    "Apr." : "Кві.",
+    "May." : "Тра.",
+    "Jun." : "Чер.",
+    "Jul." : "Лип.",
+    "Aug." : "Сер.",
+    "Sep." : "Вер.",
+    "Oct." : "Жов.",
+    "Nov." : "Лис.",
+    "Dec." : "Гру.",
     "Settings" : "Налаштування",
     "Saving..." : "Збереження...",
     "Couldn't send reset email. Please contact your administrator." : "Не можу надіслати email для скидання. Будь ласка, зверніться до вашого адміністратора.",
@@ -77,7 +96,6 @@ OC.L10N.register(
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP заголовок \"{header}\" не налаштований як \"{expected}\". Це потенційний ризик для безпеки чи приватності і ми радимо виправити це налаштування.",
     "Shared" : "Опубліковано",
     "Shared with {recipients}" : "Опубліковано для {recipients}",
-    "Share" : "Поділитися",
     "Error" : "Помилка",
     "Error while sharing" : "Помилка під час публікації",
     "Error while unsharing" : "Помилка під час відміни публікації",
@@ -86,6 +104,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "{owner} опублікував для Вас",
     "Share with users or groups …" : "Поширити серед користувачів або груп ...",
     "Share with users, groups or remote users …" : "Поширити серед локальних чи віддалених користувачів або груп ...",
+    "Share" : "Поділитися",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud",
     "Share link" : "Поділитись посиланням",
     "The public link will expire no later than {days} days after it is created" : "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
@@ -210,9 +229,8 @@ OC.L10N.register(
     "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.",
     "An internal error occured." : "Виникла внутрішня помилка.",
     "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.",
-    "Forgot your password? Reset it!" : "Забули ваш пароль? Скиньте його!",
-    "remember" : "запам'ятати",
     "Log in" : "Увійти",
+    "remember" : "запам'ятати",
     "Alternative Logins" : "Альтернативні імена користувача",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто повідомляємо вам, що %s поділився »%s« з вами.<br><a href=\"%s\">Перегляньте!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Сервер ownCloud в даний час працює в однокористувацькому режимі.",
@@ -223,8 +241,6 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходиться в файлі config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.",
     "Add \"%s\" as trusted domain" : "Додати \"%s\" як довірений домен",
-    "%s will be updated to version %s." : "%s буде оновлено до версії %s.",
-    "The following apps will be disabled:" : "Наступні додатки будуть вимкнені:",
     "The theme %s has been disabled." : "Тему %s було вимкнено.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продовженням переконайтеся, що ви зробили резервну копію бази даних, каталогу конфігурації та каталогу з даними.",
     "Start update" : "Почати оновлення",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index 9604468f0e..09326dcf44 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -24,6 +24,13 @@
     "Thursday" : "Четвер",
     "Friday" : "П'ятниця",
     "Saturday" : "Субота",
+    "Sun." : "Нед.",
+    "Mon." : "Пн.",
+    "Tue." : "Вт.",
+    "Wed." : "Ср.",
+    "Thu." : "Чт.",
+    "Fri." : "Пт.",
+    "Sat." : "Сб.",
     "January" : "Січень",
     "February" : "Лютий",
     "March" : "Березень",
@@ -36,6 +43,18 @@
     "October" : "Жовтень",
     "November" : "Листопад",
     "December" : "Грудень",
+    "Jan." : "Січ.",
+    "Feb." : "Лют.",
+    "Mar." : "Бер.",
+    "Apr." : "Кві.",
+    "May." : "Тра.",
+    "Jun." : "Чер.",
+    "Jul." : "Лип.",
+    "Aug." : "Сер.",
+    "Sep." : "Вер.",
+    "Oct." : "Жов.",
+    "Nov." : "Лис.",
+    "Dec." : "Гру.",
     "Settings" : "Налаштування",
     "Saving..." : "Збереження...",
     "Couldn't send reset email. Please contact your administrator." : "Не можу надіслати email для скидання. Будь ласка, зверніться до вашого адміністратора.",
@@ -75,7 +94,6 @@
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "HTTP заголовок \"{header}\" не налаштований як \"{expected}\". Це потенційний ризик для безпеки чи приватності і ми радимо виправити це налаштування.",
     "Shared" : "Опубліковано",
     "Shared with {recipients}" : "Опубліковано для {recipients}",
-    "Share" : "Поділитися",
     "Error" : "Помилка",
     "Error while sharing" : "Помилка під час публікації",
     "Error while unsharing" : "Помилка під час відміни публікації",
@@ -84,6 +102,7 @@
     "Shared with you by {owner}" : "{owner} опублікував для Вас",
     "Share with users or groups …" : "Поширити серед користувачів або груп ...",
     "Share with users, groups or remote users …" : "Поширити серед локальних чи віддалених користувачів або груп ...",
+    "Share" : "Поділитися",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud",
     "Share link" : "Поділитись посиланням",
     "The public link will expire no later than {days} days after it is created" : "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
@@ -208,9 +227,8 @@
     "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.",
     "An internal error occured." : "Виникла внутрішня помилка.",
     "Please try again or contact your administrator." : "Будь ласка, спробуйте ще раз або зверніться до адміністратора.",
-    "Forgot your password? Reset it!" : "Забули ваш пароль? Скиньте його!",
-    "remember" : "запам'ятати",
     "Log in" : "Увійти",
+    "remember" : "запам'ятати",
     "Alternative Logins" : "Альтернативні імена користувача",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто повідомляємо вам, що %s поділився »%s« з вами.<br><a href=\"%s\">Перегляньте!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Сервер ownCloud в даний час працює в однокористувацькому режимі.",
@@ -221,8 +239,6 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходиться в файлі config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.",
     "Add \"%s\" as trusted domain" : "Додати \"%s\" як довірений домен",
-    "%s will be updated to version %s." : "%s буде оновлено до версії %s.",
-    "The following apps will be disabled:" : "Наступні додатки будуть вимкнені:",
     "The theme %s has been disabled." : "Тему %s було вимкнено.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продовженням переконайтеся, що ви зробили резервну копію бази даних, каталогу конфігурації та каталогу з даними.",
     "Start update" : "Почати оновлення",
diff --git a/core/l10n/ur.js b/core/l10n/ur.js
deleted file mode 100644
index 442326e9ad..0000000000
--- a/core/l10n/ur.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "Error" : "خرابی"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ur.json b/core/l10n/ur.json
deleted file mode 100644
index 1c1fc3d16c..0000000000
--- a/core/l10n/ur.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
index b0304997ac..bae6b15686 100644
--- a/core/l10n/ur_PK.js
+++ b/core/l10n/ur_PK.js
@@ -48,13 +48,13 @@ OC.L10N.register(
     "Good password" : "اچھا پاسورڈ",
     "Strong password" : "مضبوط پاسورڈ",
     "Shared" : "اشتراک شدہ",
-    "Share" : "اشتراک",
     "Error" : "خرابی",
     "Error while sharing" : "اشتراک کے دوران خرابی ",
     "Error while unsharing" : "اشترک ختم کرنے کے دوران خرابی",
     "Error while changing permissions" : "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
     "Shared with you and the group {group} by {owner}" : "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
     "Shared with you by {owner}" : "اشتراک شدہ آپ سے{مالک}",
+    "Share" : "اشتراک",
     "Share link" : "اشتراک لنک",
     "Password protect" : "محفوظ پاسورڈ",
     "Password" : "پاسورڈ",
@@ -111,7 +111,6 @@ OC.L10N.register(
     "Log out" : "لاگ آؤٹ",
     "Search" : "تلاش",
     "remember" : "یاد رکھیں",
-    "Log in" : "لاگ ان",
     "Alternative Logins" : "متبادل لاگ ان ",
     "Thank you for your patience." : "آپ کے صبر کا شکریہ"
 },
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
index fe8fece808..b2166dfa3b 100644
--- a/core/l10n/ur_PK.json
+++ b/core/l10n/ur_PK.json
@@ -46,13 +46,13 @@
     "Good password" : "اچھا پاسورڈ",
     "Strong password" : "مضبوط پاسورڈ",
     "Shared" : "اشتراک شدہ",
-    "Share" : "اشتراک",
     "Error" : "خرابی",
     "Error while sharing" : "اشتراک کے دوران خرابی ",
     "Error while unsharing" : "اشترک ختم کرنے کے دوران خرابی",
     "Error while changing permissions" : "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
     "Shared with you and the group {group} by {owner}" : "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
     "Shared with you by {owner}" : "اشتراک شدہ آپ سے{مالک}",
+    "Share" : "اشتراک",
     "Share link" : "اشتراک لنک",
     "Password protect" : "محفوظ پاسورڈ",
     "Password" : "پاسورڈ",
@@ -109,7 +109,6 @@
     "Log out" : "لاگ آؤٹ",
     "Search" : "تلاش",
     "remember" : "یاد رکھیں",
-    "Log in" : "لاگ ان",
     "Alternative Logins" : "متبادل لاگ ان ",
     "Thank you for your patience." : "آپ کے صبر کا شکریہ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
index 5caf47cfd1..229a99b2c2 100644
--- a/core/l10n/vi.js
+++ b/core/l10n/vi.js
@@ -17,6 +17,13 @@ OC.L10N.register(
     "Thursday" : "Thứ 5",
     "Friday" : "Thứ ",
     "Saturday" : "Thứ 7",
+    "Sun." : "Chủ nhật",
+    "Mon." : "Thứ hai",
+    "Tue." : "Thứ ba",
+    "Wed." : "Thứ tư",
+    "Thu." : "Thứ năm",
+    "Fri." : "Thứ sáu",
+    "Sat." : "Thứ bảy",
     "January" : "Tháng 1",
     "February" : "Tháng 2",
     "March" : "Tháng 3",
@@ -29,6 +36,18 @@ OC.L10N.register(
     "October" : "Tháng 10",
     "November" : "Tháng 11",
     "December" : "Tháng 12",
+    "Jan." : "Tháng 1",
+    "Feb." : "Tháng 2",
+    "Mar." : "Tháng 3",
+    "Apr." : "Tháng 4",
+    "May." : "Tháng 5",
+    "Jun." : "Tháng 6",
+    "Jul." : "Tháng 7",
+    "Aug." : "Tháng 8",
+    "Sep." : "Tháng 9",
+    "Oct." : "Tháng 10",
+    "Nov." : "Tháng 11",
+    "Dec." : "Tháng 12",
     "Settings" : "Cài đặt",
     "Saving..." : "Đang lưu...",
     "No" : "Không",
@@ -48,13 +67,13 @@ OC.L10N.register(
     "({count} selected)" : "({count} được chọn)",
     "Error loading file exists template" : "Lỗi khi tải tập tin mẫu đã tồn tại",
     "Shared" : "Được chia sẻ",
-    "Share" : "Chia sẻ",
     "Error" : "Lỗi",
     "Error while sharing" : "Lỗi trong quá trình chia sẻ",
     "Error while unsharing" : "Lỗi trong quá trình gỡ chia sẻ",
     "Error while changing permissions" : "Lỗi trong quá trình phân quyền",
     "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
     "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
+    "Share" : "Chia sẻ",
     "Share link" : "Chia sẻ liên kết",
     "Password protect" : "Mật khẩu bảo vệ",
     "Password" : "Mật khẩu",
@@ -122,8 +141,8 @@ OC.L10N.register(
     "Search" : "Tìm kiếm",
     "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!",
     "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.",
-    "remember" : "ghi nhớ",
     "Log in" : "Đăng nhập",
+    "remember" : "ghi nhớ",
     "Alternative Logins" : "Đăng nhập khác",
     "This ownCloud instance is currently in single user mode." : "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.",
     "This means only administrators can use the instance." : "Điều này có nghĩa chỉ có người quản trị có thể sử dụng trong trường hợp này.",
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
index 10603d28a9..e2f6e5a7ec 100644
--- a/core/l10n/vi.json
+++ b/core/l10n/vi.json
@@ -15,6 +15,13 @@
     "Thursday" : "Thứ 5",
     "Friday" : "Thứ ",
     "Saturday" : "Thứ 7",
+    "Sun." : "Chủ nhật",
+    "Mon." : "Thứ hai",
+    "Tue." : "Thứ ba",
+    "Wed." : "Thứ tư",
+    "Thu." : "Thứ năm",
+    "Fri." : "Thứ sáu",
+    "Sat." : "Thứ bảy",
     "January" : "Tháng 1",
     "February" : "Tháng 2",
     "March" : "Tháng 3",
@@ -27,6 +34,18 @@
     "October" : "Tháng 10",
     "November" : "Tháng 11",
     "December" : "Tháng 12",
+    "Jan." : "Tháng 1",
+    "Feb." : "Tháng 2",
+    "Mar." : "Tháng 3",
+    "Apr." : "Tháng 4",
+    "May." : "Tháng 5",
+    "Jun." : "Tháng 6",
+    "Jul." : "Tháng 7",
+    "Aug." : "Tháng 8",
+    "Sep." : "Tháng 9",
+    "Oct." : "Tháng 10",
+    "Nov." : "Tháng 11",
+    "Dec." : "Tháng 12",
     "Settings" : "Cài đặt",
     "Saving..." : "Đang lưu...",
     "No" : "Không",
@@ -46,13 +65,13 @@
     "({count} selected)" : "({count} được chọn)",
     "Error loading file exists template" : "Lỗi khi tải tập tin mẫu đã tồn tại",
     "Shared" : "Được chia sẻ",
-    "Share" : "Chia sẻ",
     "Error" : "Lỗi",
     "Error while sharing" : "Lỗi trong quá trình chia sẻ",
     "Error while unsharing" : "Lỗi trong quá trình gỡ chia sẻ",
     "Error while changing permissions" : "Lỗi trong quá trình phân quyền",
     "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
     "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
+    "Share" : "Chia sẻ",
     "Share link" : "Chia sẻ liên kết",
     "Password protect" : "Mật khẩu bảo vệ",
     "Password" : "Mật khẩu",
@@ -120,8 +139,8 @@
     "Search" : "Tìm kiếm",
     "Server side authentication failed!" : "Xác thực phía máy chủ không thành công!",
     "Please contact your administrator." : "Vui lòng liên hệ với quản trị viên.",
-    "remember" : "ghi nhớ",
     "Log in" : "Đăng nhập",
+    "remember" : "ghi nhớ",
     "Alternative Logins" : "Đăng nhập khác",
     "This ownCloud instance is currently in single user mode." : "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.",
     "This means only administrators can use the instance." : "Điều này có nghĩa chỉ có người quản trị có thể sử dụng trong trường hợp này.",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 38efcae369..e8f87ff590 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "无法发送邮件到用户: %s ",
+    "Preparing update" : "正在准备更新",
     "Turned on maintenance mode" : "启用维护模式",
     "Turned off maintenance mode" : "关闭维护模式",
     "Maintenance mode is kept active" : "维护模式已被启用",
@@ -12,6 +13,9 @@ OC.L10N.register(
     "Repair warning: " : "修复警告：",
     "Repair error: " : "修复错误：",
     "Following incompatible apps have been disabled: %s" : "下列不兼容应用已经被禁用：%s",
+    "Following apps have been disabled: %s" : "下列应用已经被禁用：%s",
+    "Already up to date" : "已经是最新",
+    "File is too big" : "文件太大",
     "Invalid file provided" : "提供了无效文件",
     "No image or file provided" : "没有提供图片或文件",
     "Unknown filetype" : "未知的文件类型",
@@ -27,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "星期四",
     "Friday" : "星期五",
     "Saturday" : "星期六",
+    "Sun." : "日",
+    "Mon." : "周一",
+    "Tue." : "周二",
+    "Wed." : "周三",
+    "Thu." : "周四",
+    "Fri." : "周五",
+    "Sat." : "周六",
+    "Su" : "Su",
+    "Mo" : "Mo",
+    "Tu" : "Tu",
+    "We" : "We",
+    "Th" : "Th",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
     "January" : "一月",
     "February" : "二月",
     "March" : "三月",
@@ -39,6 +57,18 @@ OC.L10N.register(
     "October" : "十月",
     "November" : "十一月",
     "December" : "十二月",
+    "Jan." : "一月",
+    "Feb." : "二月",
+    "Mar." : "三月",
+    "Apr." : "四月",
+    "May." : "五月",
+    "Jun." : "六月",
+    "Jul." : "七月",
+    "Aug." : "八月",
+    "Sep." : "九月",
+    "Oct." : "十月",
+    "Nov." : "十一月",
+    "Dec." : "十二月",
     "Settings" : "设置",
     "Saving..." : "保存中...",
     "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。",
@@ -70,17 +100,18 @@ OC.L10N.register(
     "Good password" : "较强的密码",
     "Strong password" : "强密码",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "由于 WebDAV 接口似乎被破坏，因此你的网页服务器没有正确地设置来允许文件同步。",
-    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "该服务器没有工作在互联网连接，这意味着像挂载外部存储，第三方应用的更新或者安装的通知将不会工作。远程文件访问和邮件通知的发送也可能不会工作。如果你想拥有所有功能，我们建议你为服务器打开互联网连接。",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "你的数据目录和你的文件可能从互联网被访问到。.htaccess 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a href=\"{docLink}\">文档</a> 。",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom 无法被 PHP 读取，处于安全原因，这是强烈不推荐的。请查看<a href=\"{docLink}\">文档</a>了解详情。",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "你的 PHP 版本 ({version}) 不再被 <a href=\"{phpLink}\"> PHP </a>支持。我们建议您升级您的PHP版本，以便获得 PHP 性能和安全提升。",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "反向代理头配置不正确，或者您正从一个受信任的代理访问ownCloud。如果你不是通过受信任的代理访问 ownCloud，这将引发一个安全问题，可能由于 ownCloud IP 地址可见导致欺骗攻击。更多信息可以查看我们的 <a href=\"{docLink}\">文档</a>。",
     "Error occurred while checking server setup" : "当检查服务器启动时出错",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 头部没有配置和 \"{expected}\" 的一样。这是一个潜在的安全或者隐私风险，我们调整这项设置。",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP 严格传输安全（Strict-Transport-Security）报头未配置到至少“{seconds}”秒。处于增强安全性考虑，我们推荐按照<a href=\"{docUrl}\">安全提示</a>启用 HSTS。",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "您正在通过 HTTP 访问该站点，我们强烈建议您按照<a href=\"{docUrl}\">安全提示</a>配置服务器强制使用 HTTPS。",
     "Shared" : "已共享",
     "Shared with {recipients}" : "由{recipients}分享",
-    "Share" : "分享",
     "Error" : "错误",
     "Error while sharing" : "共享时出错",
     "Error while unsharing" : "取消共享时出错",
@@ -89,6 +120,7 @@ OC.L10N.register(
     "Shared with you by {owner}" : "{owner} 与您共享",
     "Share with users or groups …" : "分享给其他用户或组 ...",
     "Share with users, groups or remote users …" : "分享给其他用户、组或远程用户 ...",
+    "Share" : "分享",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "使用语法 username@example.com/owncloud 分享给其他 ownCloud 上的用户",
     "Share link" : "分享链接",
     "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
@@ -139,8 +171,10 @@ OC.L10N.register(
     "Updating {productName} to version {version}, this may take a while." : "更新 {productName} 到版本 {version}，这可能需要一些时间。",
     "Please reload the page." : "请重新加载页面。",
     "The update was unsuccessful. " : "升级未成功",
+    "The update was successful. There were warnings." : "更新成功。有警告。",
     "The update was successful. Redirecting you to ownCloud now." : "更新成功。正在重定向至 ownCloud。",
     "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码",
+    "Couldn't reset password because the token is expired" : "无法重设密码，因为令牌已过期",
     "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件，请检查您的用户名是否正确。",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
     "%s password reset" : "重置 %s 的密码",
@@ -214,9 +248,9 @@ OC.L10N.register(
     "Please contact your administrator." : "请联系你的管理员。",
     "An internal error occured." : "发生了内部错误。",
     "Please try again or contact your administrator." : "请重试或联系管理员。",
-    "Forgot your password? Reset it!" : "忘记密码？立即重置！",
-    "remember" : "记住",
     "Log in" : "登录",
+    "Wrong password. Reset it?" : "密码错误。要重置么？",
+    "remember" : "记住",
     "Alternative Logins" : "其他登录方式",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<br><a href=\"%s\">现在查看！</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "当前ownCloud实例运行在单用户模式下。",
@@ -227,8 +261,10 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "请联系你的系统管理员。如果你是系统管理员，配置config/config.php文件中参数\"trusted_domain\" 设置。可以在config/config.sample.php文件中找到例子。",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "基于你的配置，作为系统管理员，你可能还能点击下面的按钮来信任这个域。",
     "Add \"%s\" as trusted domain" : "添加 \"%s\"为信任域",
-    "%s will be updated to version %s." : "%s 将会更新到版本 %s。",
-    "The following apps will be disabled:" : "以下应用将会被禁用：",
+    "App update required" : "必须的应用更新",
+    "%s will be updated to version %s" : "%s 将会更新至版本 %s",
+    "These apps will be updated:" : "以下应用将被更新：",
+    "These incompatible apps will be disabled:" : "这些不兼容的应用程序将被禁用：",
     "The theme %s has been disabled." : "%s 主题已被禁用。",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
     "Start update" : "开始更新",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 93b5f8b4ae..7bed1beaa9 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "无法发送邮件到用户: %s ",
+    "Preparing update" : "正在准备更新",
     "Turned on maintenance mode" : "启用维护模式",
     "Turned off maintenance mode" : "关闭维护模式",
     "Maintenance mode is kept active" : "维护模式已被启用",
@@ -10,6 +11,9 @@
     "Repair warning: " : "修复警告：",
     "Repair error: " : "修复错误：",
     "Following incompatible apps have been disabled: %s" : "下列不兼容应用已经被禁用：%s",
+    "Following apps have been disabled: %s" : "下列应用已经被禁用：%s",
+    "Already up to date" : "已经是最新",
+    "File is too big" : "文件太大",
     "Invalid file provided" : "提供了无效文件",
     "No image or file provided" : "没有提供图片或文件",
     "Unknown filetype" : "未知的文件类型",
@@ -25,6 +29,20 @@
     "Thursday" : "星期四",
     "Friday" : "星期五",
     "Saturday" : "星期六",
+    "Sun." : "日",
+    "Mon." : "周一",
+    "Tue." : "周二",
+    "Wed." : "周三",
+    "Thu." : "周四",
+    "Fri." : "周五",
+    "Sat." : "周六",
+    "Su" : "Su",
+    "Mo" : "Mo",
+    "Tu" : "Tu",
+    "We" : "We",
+    "Th" : "Th",
+    "Fr" : "Fr",
+    "Sa" : "Sa",
     "January" : "一月",
     "February" : "二月",
     "March" : "三月",
@@ -37,6 +55,18 @@
     "October" : "十月",
     "November" : "十一月",
     "December" : "十二月",
+    "Jan." : "一月",
+    "Feb." : "二月",
+    "Mar." : "三月",
+    "Apr." : "四月",
+    "May." : "五月",
+    "Jun." : "六月",
+    "Jul." : "七月",
+    "Aug." : "八月",
+    "Sep." : "九月",
+    "Oct." : "十月",
+    "Nov." : "十一月",
+    "Dec." : "十二月",
     "Settings" : "设置",
     "Saving..." : "保存中...",
     "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。",
@@ -68,17 +98,18 @@
     "Good password" : "较强的密码",
     "Strong password" : "强密码",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "由于 WebDAV 接口似乎被破坏，因此你的网页服务器没有正确地设置来允许文件同步。",
-    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "该服务器没有工作在互联网连接，这意味着像挂载外部存储，第三方应用的更新或者安装的通知将不会工作。远程文件访问和邮件通知的发送也可能不会工作。如果你想拥有所有功能，我们建议你为服务器打开互联网连接。",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
     "Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root." : "你的数据目录和你的文件可能从互联网被访问到。.htaccess 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a href=\"{docLink}\">文档</a> 。",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "/dev/urandom 无法被 PHP 读取，处于安全原因，这是强烈不推荐的。请查看<a href=\"{docLink}\">文档</a>了解详情。",
+    "Your PHP version ({version}) is no longer <a href=\"{phpLink}\">supported by PHP</a>. We encourage you to upgrade your PHP version to take advantage of performance and security updates provided by PHP." : "你的 PHP 版本 ({version}) 不再被 <a href=\"{phpLink}\"> PHP </a>支持。我们建议您升级您的PHP版本，以便获得 PHP 性能和安全提升。",
+    "The reverse proxy headers configuration is incorrect, or you are accessing ownCloud from a trusted proxy. If you are not accessing ownCloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to ownCloud. Further information can be found in our <a href=\"{docLink}\">documentation</a>." : "反向代理头配置不正确，或者您正从一个受信任的代理访问ownCloud。如果你不是通过受信任的代理访问 ownCloud，这将引发一个安全问题，可能由于 ownCloud IP 地址可见导致欺骗攻击。更多信息可以查看我们的 <a href=\"{docLink}\">文档</a>。",
     "Error occurred while checking server setup" : "当检查服务器启动时出错",
     "The \"{header}\" HTTP header is not configured to equal to \"{expected}\". This is a potential security or privacy risk and we recommend adjusting this setting." : "\"{header}\" HTTP 头部没有配置和 \"{expected}\" 的一样。这是一个潜在的安全或者隐私风险，我们调整这项设置。",
     "The \"Strict-Transport-Security\" HTTP header is not configured to least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "HTTP 严格传输安全（Strict-Transport-Security）报头未配置到至少“{seconds}”秒。处于增强安全性考虑，我们推荐按照<a href=\"{docUrl}\">安全提示</a>启用 HSTS。",
     "You are accessing this site via HTTP. We strongly suggest you configure your server to require using HTTPS instead as described in our <a href=\"{docUrl}\">security tips</a>." : "您正在通过 HTTP 访问该站点，我们强烈建议您按照<a href=\"{docUrl}\">安全提示</a>配置服务器强制使用 HTTPS。",
     "Shared" : "已共享",
     "Shared with {recipients}" : "由{recipients}分享",
-    "Share" : "分享",
     "Error" : "错误",
     "Error while sharing" : "共享时出错",
     "Error while unsharing" : "取消共享时出错",
@@ -87,6 +118,7 @@
     "Shared with you by {owner}" : "{owner} 与您共享",
     "Share with users or groups …" : "分享给其他用户或组 ...",
     "Share with users, groups or remote users …" : "分享给其他用户、组或远程用户 ...",
+    "Share" : "分享",
     "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "使用语法 username@example.com/owncloud 分享给其他 ownCloud 上的用户",
     "Share link" : "分享链接",
     "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
@@ -137,8 +169,10 @@
     "Updating {productName} to version {version}, this may take a while." : "更新 {productName} 到版本 {version}，这可能需要一些时间。",
     "Please reload the page." : "请重新加载页面。",
     "The update was unsuccessful. " : "升级未成功",
+    "The update was successful. There were warnings." : "更新成功。有警告。",
     "The update was successful. Redirecting you to ownCloud now." : "更新成功。正在重定向至 ownCloud。",
     "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码",
+    "Couldn't reset password because the token is expired" : "无法重设密码，因为令牌已过期",
     "Couldn't send reset email. Please make sure your username is correct." : "无法发送重置邮件，请检查您的用户名是否正确。",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
     "%s password reset" : "重置 %s 的密码",
@@ -212,9 +246,9 @@
     "Please contact your administrator." : "请联系你的管理员。",
     "An internal error occured." : "发生了内部错误。",
     "Please try again or contact your administrator." : "请重试或联系管理员。",
-    "Forgot your password? Reset it!" : "忘记密码？立即重置！",
-    "remember" : "记住",
     "Log in" : "登录",
+    "Wrong password. Reset it?" : "密码错误。要重置么？",
+    "remember" : "记住",
     "Alternative Logins" : "其他登录方式",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<br><a href=\"%s\">现在查看！</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "当前ownCloud实例运行在单用户模式下。",
@@ -225,8 +259,10 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "请联系你的系统管理员。如果你是系统管理员，配置config/config.php文件中参数\"trusted_domain\" 设置。可以在config/config.sample.php文件中找到例子。",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "基于你的配置，作为系统管理员，你可能还能点击下面的按钮来信任这个域。",
     "Add \"%s\" as trusted domain" : "添加 \"%s\"为信任域",
-    "%s will be updated to version %s." : "%s 将会更新到版本 %s。",
-    "The following apps will be disabled:" : "以下应用将会被禁用：",
+    "App update required" : "必须的应用更新",
+    "%s will be updated to version %s" : "%s 将会更新至版本 %s",
+    "These apps will be updated:" : "以下应用将被更新：",
+    "These incompatible apps will be disabled:" : "这些不兼容的应用程序将被禁用：",
     "The theme %s has been disabled." : "%s 主题已被禁用。",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
     "Start update" : "开始更新",
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
index ab567c72ec..2766bd3000 100644
--- a/core/l10n/zh_HK.js
+++ b/core/l10n/zh_HK.js
@@ -28,13 +28,13 @@ OC.L10N.register(
     "Cancel" : "取消",
     "Continue" : "繼續",
     "Shared" : "已分享",
-    "Share" : "分享",
     "Error" : "錯誤",
     "Error while sharing" : "分享時發生錯誤",
     "Error while unsharing" : "取消分享時發生錯誤",
     "Error while changing permissions" : "更改權限時發生錯誤",
     "Shared with you and the group {group} by {owner}" : "{owner}與你及群組的分享",
     "Shared with you by {owner}" : "{owner}與你的分享",
+    "Share" : "分享",
     "Share link" : "分享連結",
     "Password protect" : "密碼保護",
     "Password" : "密碼",
@@ -68,7 +68,7 @@ OC.L10N.register(
     "Database name" : "資料庫名稱",
     "Log out" : "登出",
     "Search" : "尋找",
-    "remember" : "記住",
-    "Log in" : "登入"
+    "Log in" : "登入",
+    "remember" : "記住"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
index 09a4bd74f4..0029a47794 100644
--- a/core/l10n/zh_HK.json
+++ b/core/l10n/zh_HK.json
@@ -26,13 +26,13 @@
     "Cancel" : "取消",
     "Continue" : "繼續",
     "Shared" : "已分享",
-    "Share" : "分享",
     "Error" : "錯誤",
     "Error while sharing" : "分享時發生錯誤",
     "Error while unsharing" : "取消分享時發生錯誤",
     "Error while changing permissions" : "更改權限時發生錯誤",
     "Shared with you and the group {group} by {owner}" : "{owner}與你及群組的分享",
     "Shared with you by {owner}" : "{owner}與你的分享",
+    "Share" : "分享",
     "Share link" : "分享連結",
     "Password protect" : "密碼保護",
     "Password" : "密碼",
@@ -66,7 +66,7 @@
     "Database name" : "資料庫名稱",
     "Log out" : "登出",
     "Search" : "尋找",
-    "remember" : "記住",
-    "Log in" : "登入"
+    "Log in" : "登入",
+    "remember" : "記住"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index 42c1aebcfd..beab7ca0e1 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -2,17 +2,28 @@ OC.L10N.register(
     "core",
     {
     "Couldn't send mail to following users: %s " : "無法寄送郵件給這些使用者：%s",
+    "Preparing update" : "準備更新",
     "Turned on maintenance mode" : "已啓用維護模式",
     "Turned off maintenance mode" : "已停用維護模式",
+    "Maintenance mode is kept active" : "維護模式維持在開啟狀態",
     "Updated database" : "已更新資料庫",
     "Checked database schema update" : "已檢查資料庫格式更新",
     "Checked database schema update for apps" : "已檢查應用程式的資料庫格式更新",
     "Updated \"%s\" to %s" : "已更新 %s 到 %s",
+    "Repair warning: " : "修復警告：",
+    "Repair error: " : "修復錯誤",
+    "Following incompatible apps have been disabled: %s" : "以下不相容的應用程式已經被停用：%s",
+    "Following apps have been disabled: %s" : "以下應用程式已經被停用：%s",
+    "Already up to date" : "已經是最新版",
+    "File is too big" : "檔案太大",
+    "Invalid file provided" : "提供的檔案無效",
     "No image or file provided" : "未提供圖片或檔案",
     "Unknown filetype" : "未知的檔案類型",
     "Invalid image" : "無效的圖片",
     "No temporary profile picture available, try again" : "沒有臨時用的大頭貼，請再試一次",
     "No crop data provided" : "未設定剪裁",
+    "No valid crop data provided" : "未提供有效的剪裁設定",
+    "Crop is not square" : "剪裁設定不是正方形",
     "Sunday" : "週日",
     "Monday" : "週一",
     "Tuesday" : "週二",
@@ -20,6 +31,20 @@ OC.L10N.register(
     "Thursday" : "週四",
     "Friday" : "週五",
     "Saturday" : "週六",
+    "Sun." : "日",
+    "Mon." : "一",
+    "Tue." : "二",
+    "Wed." : "三",
+    "Thu." : "四",
+    "Fri." : "五",
+    "Sat." : "六",
+    "Su" : "日",
+    "Mo" : "一",
+    "Tu" : "二",
+    "We" : "三",
+    "Th" : "四",
+    "Fr" : "五",
+    "Sa" : "六",
     "January" : "一月",
     "February" : "二月",
     "March" : "三月",
@@ -32,6 +57,18 @@ OC.L10N.register(
     "October" : "十月",
     "November" : "十一月",
     "December" : "十二月",
+    "Jan." : "一月",
+    "Feb." : "二月",
+    "Mar." : "三月",
+    "Apr." : "四月",
+    "May." : "五月",
+    "Jun." : "六月",
+    "Jul." : "七月",
+    "Aug." : "八月",
+    "Sep." : "九月",
+    "Oct." : "十月",
+    "Nov." : "十一月",
+    "Dec." : "十二月",
     "Settings" : "設定",
     "Saving..." : "儲存中...",
     "Couldn't send reset email. Please contact your administrator." : "無法寄送重設 email ，請聯絡系統管理員",
@@ -62,16 +99,18 @@ OC.L10N.register(
     "So-so password" : "普通的密碼",
     "Good password" : "好的密碼",
     "Strong password" : "很強的密碼",
-    "Error occurred while checking server setup" : "檢查伺服器配置時發生錯誤",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "您的網頁伺服器無法提供檔案同步功能，因為 WebDAV 界面有問題",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "伺服器沒有網際網路連線，有些功能，像是外部儲存、更新版通知將無法運作。從遠端存取資料或是寄送 email 通知可能也無法運作。建議您設定好網際網路連線以使用所有功能。",
+    "Error occurred while checking server setup" : "檢查伺服器設定時發生錯誤",
     "Shared" : "已分享",
     "Shared with {recipients}" : "與 {recipients} 分享",
-    "Share" : "分享",
     "Error" : "錯誤",
     "Error while sharing" : "分享時發生錯誤",
     "Error while unsharing" : "取消分享時發生錯誤",
     "Error while changing permissions" : "修改權限時發生錯誤",
     "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
     "Shared with you by {owner}" : "{owner} 已經和您分享",
+    "Share" : "分享",
     "Share link" : "分享連結",
     "The public link will expire no later than {days} days after it is created" : "這個公開連結會在 {days} 天內失效",
     "Password protect" : "密碼保護",
@@ -82,8 +121,10 @@ OC.L10N.register(
     "Set expiration date" : "指定到期日",
     "Expiration" : "過期",
     "Expiration date" : "到期日",
+    "An error occured. Please try again" : "發生錯誤，請重試",
     "Adding user..." : "新增使用者……",
     "group" : "群組",
+    "remote" : "遠端",
     "Resharing is not allowed" : "不允許重新分享",
     "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
     "Unshare" : "取消分享",
@@ -92,6 +133,7 @@ OC.L10N.register(
     "can edit" : "可編輯",
     "access control" : "存取控制",
     "create" : "建立",
+    "change" : "更動",
     "delete" : "刪除",
     "Password protected" : "受密碼保護",
     "Error unsetting expiration date" : "取消到期日設定失敗",
@@ -108,8 +150,11 @@ OC.L10N.register(
     "No tags selected for deletion." : "沒有選擇要刪除的標籤",
     "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候",
     "Please reload the page." : "請重新整理頁面",
+    "The update was unsuccessful. " : "更新失敗",
+    "The update was successful. There were warnings." : "更新成功，有警告訊息",
     "The update was successful. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。",
     "Couldn't reset password because the token is invalid" : "無法重設密碼因為 token 無效",
+    "Couldn't reset password because the token is expired" : "無法重設密碼，因為 token 過期",
     "Couldn't send reset email. Please make sure your username is correct." : "無法寄送重設 email ，請確認您的帳號輸入正確",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員",
     "%s password reset" : "%s 密碼重設",
@@ -167,9 +212,10 @@ OC.L10N.register(
     "Search" : "搜尋",
     "Server side authentication failed!" : "伺服器端認證失敗！",
     "Please contact your administrator." : "請聯絡系統管理員。",
-    "Forgot your password? Reset it!" : "忘了密碼？重設它！",
+    "An internal error occured." : "發生內部錯誤",
+    "Please try again or contact your administrator." : "請重試或聯絡系統管理員",
+    "Wrong password. Reset it?" : "密碼錯誤，重設密碼？",
     "remember" : "記住",
-    "Log in" : "登入",
     "Alternative Logins" : "其他登入方法",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "這個 ownCloud 伺服器目前運作於單一使用者模式",
@@ -180,12 +226,15 @@ OC.L10N.register(
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域",
     "Add \"%s\" as trusted domain" : "將 %s 加入到信任的網域",
-    "%s will be updated to version %s." : "%s 將會被升級到版本 %s",
-    "The following apps will be disabled:" : "這些應用程式會被停用：",
+    "App update required" : "需要更新應用程式",
+    "%s will be updated to version %s" : "%s 將會更新至版本 %s",
+    "These apps will be updated:" : "將會更新這些應用程式",
+    "These incompatible apps will be disabled:" : "將會停用這些不相容的應用程式",
     "The theme %s has been disabled." : "主題 %s 已經被停用",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在繼續之前，請備份資料庫、config 目錄及資料目錄",
     "Start update" : "開始升級",
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "在大型安裝上，為了避免升級請求逾時，你也可以在安裝目錄執行下列指令：",
+    "This %s instance is currently in maintenance mode, which may take a while." : "這個 %s 安裝目前處於維護模式，需要一段時間恢復。",
     "This page will refresh itself when the %s instance is available again." : "%s 安裝恢復可用之後，本頁會自動重新整理"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index c2af58eafa..81af556d8f 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -1,16 +1,27 @@
 { "translations": {
     "Couldn't send mail to following users: %s " : "無法寄送郵件給這些使用者：%s",
+    "Preparing update" : "準備更新",
     "Turned on maintenance mode" : "已啓用維護模式",
     "Turned off maintenance mode" : "已停用維護模式",
+    "Maintenance mode is kept active" : "維護模式維持在開啟狀態",
     "Updated database" : "已更新資料庫",
     "Checked database schema update" : "已檢查資料庫格式更新",
     "Checked database schema update for apps" : "已檢查應用程式的資料庫格式更新",
     "Updated \"%s\" to %s" : "已更新 %s 到 %s",
+    "Repair warning: " : "修復警告：",
+    "Repair error: " : "修復錯誤",
+    "Following incompatible apps have been disabled: %s" : "以下不相容的應用程式已經被停用：%s",
+    "Following apps have been disabled: %s" : "以下應用程式已經被停用：%s",
+    "Already up to date" : "已經是最新版",
+    "File is too big" : "檔案太大",
+    "Invalid file provided" : "提供的檔案無效",
     "No image or file provided" : "未提供圖片或檔案",
     "Unknown filetype" : "未知的檔案類型",
     "Invalid image" : "無效的圖片",
     "No temporary profile picture available, try again" : "沒有臨時用的大頭貼，請再試一次",
     "No crop data provided" : "未設定剪裁",
+    "No valid crop data provided" : "未提供有效的剪裁設定",
+    "Crop is not square" : "剪裁設定不是正方形",
     "Sunday" : "週日",
     "Monday" : "週一",
     "Tuesday" : "週二",
@@ -18,6 +29,20 @@
     "Thursday" : "週四",
     "Friday" : "週五",
     "Saturday" : "週六",
+    "Sun." : "日",
+    "Mon." : "一",
+    "Tue." : "二",
+    "Wed." : "三",
+    "Thu." : "四",
+    "Fri." : "五",
+    "Sat." : "六",
+    "Su" : "日",
+    "Mo" : "一",
+    "Tu" : "二",
+    "We" : "三",
+    "Th" : "四",
+    "Fr" : "五",
+    "Sa" : "六",
     "January" : "一月",
     "February" : "二月",
     "March" : "三月",
@@ -30,6 +55,18 @@
     "October" : "十月",
     "November" : "十一月",
     "December" : "十二月",
+    "Jan." : "一月",
+    "Feb." : "二月",
+    "Mar." : "三月",
+    "Apr." : "四月",
+    "May." : "五月",
+    "Jun." : "六月",
+    "Jul." : "七月",
+    "Aug." : "八月",
+    "Sep." : "九月",
+    "Oct." : "十月",
+    "Nov." : "十一月",
+    "Dec." : "十二月",
     "Settings" : "設定",
     "Saving..." : "儲存中...",
     "Couldn't send reset email. Please contact your administrator." : "無法寄送重設 email ，請聯絡系統管理員",
@@ -60,16 +97,18 @@
     "So-so password" : "普通的密碼",
     "Good password" : "好的密碼",
     "Strong password" : "很強的密碼",
-    "Error occurred while checking server setup" : "檢查伺服器配置時發生錯誤",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "您的網頁伺服器無法提供檔案同步功能，因為 WebDAV 界面有問題",
+    "This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features." : "伺服器沒有網際網路連線，有些功能，像是外部儲存、更新版通知將無法運作。從遠端存取資料或是寄送 email 通知可能也無法運作。建議您設定好網際網路連線以使用所有功能。",
+    "Error occurred while checking server setup" : "檢查伺服器設定時發生錯誤",
     "Shared" : "已分享",
     "Shared with {recipients}" : "與 {recipients} 分享",
-    "Share" : "分享",
     "Error" : "錯誤",
     "Error while sharing" : "分享時發生錯誤",
     "Error while unsharing" : "取消分享時發生錯誤",
     "Error while changing permissions" : "修改權限時發生錯誤",
     "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
     "Shared with you by {owner}" : "{owner} 已經和您分享",
+    "Share" : "分享",
     "Share link" : "分享連結",
     "The public link will expire no later than {days} days after it is created" : "這個公開連結會在 {days} 天內失效",
     "Password protect" : "密碼保護",
@@ -80,8 +119,10 @@
     "Set expiration date" : "指定到期日",
     "Expiration" : "過期",
     "Expiration date" : "到期日",
+    "An error occured. Please try again" : "發生錯誤，請重試",
     "Adding user..." : "新增使用者……",
     "group" : "群組",
+    "remote" : "遠端",
     "Resharing is not allowed" : "不允許重新分享",
     "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
     "Unshare" : "取消分享",
@@ -90,6 +131,7 @@
     "can edit" : "可編輯",
     "access control" : "存取控制",
     "create" : "建立",
+    "change" : "更動",
     "delete" : "刪除",
     "Password protected" : "受密碼保護",
     "Error unsetting expiration date" : "取消到期日設定失敗",
@@ -106,8 +148,11 @@
     "No tags selected for deletion." : "沒有選擇要刪除的標籤",
     "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候",
     "Please reload the page." : "請重新整理頁面",
+    "The update was unsuccessful. " : "更新失敗",
+    "The update was successful. There were warnings." : "更新成功，有警告訊息",
     "The update was successful. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。",
     "Couldn't reset password because the token is invalid" : "無法重設密碼因為 token 無效",
+    "Couldn't reset password because the token is expired" : "無法重設密碼，因為 token 過期",
     "Couldn't send reset email. Please make sure your username is correct." : "無法寄送重設 email ，請確認您的帳號輸入正確",
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員",
     "%s password reset" : "%s 密碼重設",
@@ -165,9 +210,10 @@
     "Search" : "搜尋",
     "Server side authentication failed!" : "伺服器端認證失敗！",
     "Please contact your administrator." : "請聯絡系統管理員。",
-    "Forgot your password? Reset it!" : "忘了密碼？重設它！",
+    "An internal error occured." : "發生內部錯誤",
+    "Please try again or contact your administrator." : "請重試或聯絡系統管理員",
+    "Wrong password. Reset it?" : "密碼錯誤，重設密碼？",
     "remember" : "記住",
-    "Log in" : "登入",
     "Alternative Logins" : "其他登入方法",
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "這個 ownCloud 伺服器目前運作於單一使用者模式",
@@ -178,12 +224,15 @@
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域",
     "Add \"%s\" as trusted domain" : "將 %s 加入到信任的網域",
-    "%s will be updated to version %s." : "%s 將會被升級到版本 %s",
-    "The following apps will be disabled:" : "這些應用程式會被停用：",
+    "App update required" : "需要更新應用程式",
+    "%s will be updated to version %s" : "%s 將會更新至版本 %s",
+    "These apps will be updated:" : "將會更新這些應用程式",
+    "These incompatible apps will be disabled:" : "將會停用這些不相容的應用程式",
     "The theme %s has been disabled." : "主題 %s 已經被停用",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在繼續之前，請備份資料庫、config 目錄及資料目錄",
     "Start update" : "開始升級",
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "在大型安裝上，為了避免升級請求逾時，你也可以在安裝目錄執行下列指令：",
+    "This %s instance is currently in maintenance mode, which may take a while." : "這個 %s 安裝目前處於維護模式，需要一段時間恢復。",
     "This page will refresh itself when the %s instance is available again." : "%s 安裝恢復可用之後，本頁會自動重新整理"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index 4c5e58c7b6..7d983bd7e3 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -28,6 +28,7 @@ namespace OC\Core\LostPassword\Controller;
 
 use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
 use \OCP\IURLGenerator;
 use \OCP\IRequest;
 use \OCP\IL10N;
@@ -66,6 +67,8 @@ class LostController extends Controller {
 	protected $secureRandom;
 	/** @var IMailer */
 	protected $mailer;
+	/** @var ITimeFactory */
+	protected $timeFactory;
 
 	/**
 	 * @param string $appName
@@ -79,6 +82,7 @@ class LostController extends Controller {
 	 * @param string $from
 	 * @param string $isDataEncrypted
 	 * @param IMailer $mailer
+	 * @param ITimeFactory $timeFactory
 	 */
 	public function __construct($appName,
 								IRequest $request,
@@ -90,7 +94,8 @@ class LostController extends Controller {
 								ISecureRandom $secureRandom,
 								$from,
 								$isDataEncrypted,
-								IMailer $mailer) {
+								IMailer $mailer,
+								ITimeFactory $timeFactory) {
 		parent::__construct($appName, $request);
 		$this->urlGenerator = $urlGenerator;
 		$this->userManager = $userManager;
@@ -101,6 +106,7 @@ class LostController extends Controller {
 		$this->isDataEncrypted = $isDataEncrypted;
 		$this->config = $config;
 		$this->mailer = $mailer;
+		$this->timeFactory = $timeFactory;
 	}
 
 	/**
@@ -173,7 +179,17 @@ class LostController extends Controller {
 		try {
 			$user = $this->userManager->get($userId);
 
-			if (!StringUtils::equals($this->config->getUserValue($userId, 'owncloud', 'lostpassword', null), $token)) {
+			$splittedToken = explode(':', $this->config->getUserValue($userId, 'owncloud', 'lostpassword', null));
+			if(count($splittedToken) !== 2) {
+				throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
+			}
+
+			if ($splittedToken[0] < ($this->timeFactory->getTime() - 60*60*12) ||
+				$user->getLastLogin() > $splittedToken[0]) {
+				throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is expired'));
+			}
+
+			if (!StringUtils::equals($splittedToken[1], $token)) {
 				throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
 			}
 
@@ -216,12 +232,12 @@ class LostController extends Controller {
 			ISecureRandom::CHAR_DIGITS.
 			ISecureRandom::CHAR_LOWER.
 			ISecureRandom::CHAR_UPPER);
-		$this->config->setUserValue($user, 'owncloud', 'lostpassword', $token);
+		$this->config->setUserValue($user, 'owncloud', 'lostpassword', $this->timeFactory->getTime() .':'. $token);
 
 		$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user, 'token' => $token));
 
 		$tmpl = new \OC_Template('core/lostpassword', 'email');
-		$tmpl->assign('link', $link, false);
+		$tmpl->assign('link', $link);
 		$msg = $tmpl->fetchPage();
 
 		try {
diff --git a/core/register_command.php b/core/register_command.php
index 9c13c0967f..d3c04ad067 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -57,11 +57,30 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
 	$application->add(new OC\Core\Command\Encryption\ListModules(\OC::$server->getEncryptionManager()));
 	$application->add(new OC\Core\Command\Encryption\SetDefaultModule(\OC::$server->getEncryptionManager()));
 	$application->add(new OC\Core\Command\Encryption\Status(\OC::$server->getEncryptionManager()));
+	$application->add(new OC\Core\Command\Encryption\EncryptAll(\OC::$server->getEncryptionManager(), \OC::$server->getAppManager(), \OC::$server->getConfig(), new \Symfony\Component\Console\Helper\QuestionHelper()));
 
 	$application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Log\OwnCloud(\OC::$server->getConfig()));
 
-	$application->add(new OC\Core\Command\Maintenance\MimeTypesJS());
+	$view = new \OC\Files\View();
+	$util = new \OC\Encryption\Util(
+		$view,
+		\OC::$server->getUserManager(),
+		\OC::$server->getGroupManager(),
+		\OC::$server->getConfig()
+	);
+	$application->add(new OC\Core\Command\Encryption\ChangeKeyStorageRoot(
+			$view,
+			\OC::$server->getUserManager(),
+			\OC::$server->getConfig(),
+			$util,
+			new \Symfony\Component\Console\Helper\QuestionHelper()
+		)
+	);
+	$application->add(new OC\Core\Command\Encryption\ShowKeyStorageRoot($util));
+
+	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateDB(\OC::$server->getMimeTypeDetector(), \OC::$server->getMimeTypeLoader()));
+	$application->add(new OC\Core\Command\Maintenance\Mimetype\UpdateJS(\OC::$server->getMimeTypeDetector()));
 	$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Maintenance\Repair(new \OC\Repair(\OC\Repair::getRepairSteps()), \OC::$server->getConfig()));
 	$application->add(new OC\Core\Command\Maintenance\SingleUser(\OC::$server->getConfig()));
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 8db55e4bda..716cb1af6a 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -53,7 +53,7 @@ script('core', [
 			<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
 			<img class="svg" id="adminpass-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt="">
 			<input type="checkbox" id="show" name="show">
-			<label for="show"></label>
+			<label for="show" class="svg"></label>
 			<div class="strengthify-wrapper"></div>
 		</p>
 	</fieldset>
@@ -149,7 +149,7 @@ script('core', [
 		</fieldset>
 		<?php endif; ?>
 	<?php endif; ?>
-	
+
 	<div class="icon-loading-dark float-spinner">&nbsp;</div>
 
 	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 43d692c036..b01820a05b 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -8,6 +8,7 @@
 		<?php p($theme->getTitle()); ?>
 		</title>
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="referrer" content="never">
 		<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
 		<meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>">
 		<link rel="shortcut icon" type="image/png" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>">
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 0fd7521271..56b762d326 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -8,6 +8,7 @@
 		<?php p($theme->getTitle()); ?>
 		</title>
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="referrer" content="never">
 		<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0">
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
 		<meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>">
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2f93a30ba6..0910047032 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -15,6 +15,7 @@
 			?>
 		</title>
 		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="referrer" content="never">
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
 		<meta name="apple-mobile-web-app-capable" content="yes">
@@ -100,7 +101,7 @@
 					<?php p($l->t('Search'));?>
 				</label>
 				<input id="searchbox" class="svg" type="search" name="query"
-					value="<?php if(isset($_POST['query'])) {p($_POST['query']);};?>"
+					value=""
 					autocomplete="off" tabindex="5">
 			</form>
 		</div></header>
diff --git a/core/templates/login.php b/core/templates/login.php
index f942e02dc8..513988876e 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -3,7 +3,8 @@
 vendor_script('jsTimezoneDetect/jstz');
 script('core', [
 	'visitortimezone',
-	'lostpassword'
+	'lostpassword',
+	'login'
 ]);
 ?>
 
@@ -56,19 +57,22 @@ script('core', [
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 		</p>
 
+		<input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/>
+
 		<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
 		<a id="lost-password" class="warning" href="">
 			<?php p($l->t('Wrong password. Reset it?')); ?>
 		</a>
 		<?php endif; ?>
 		<?php if ($_['rememberLoginAllowed'] === true) : ?>
-		<input type="checkbox" name="remember_login" value="1" id="remember_login">
-		<label for="remember_login"><?php p($l->t('remember')); ?></label>
+		<div class="remember-login-container">
+			<input type="checkbox" name="remember_login" value="1" id="remember_login">
+			<label for="remember_login"><?php p($l->t('remember')); ?></label>
+		</div>
 		<?php endif; ?>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
 		<input type="hidden" name="timezone" id="timezone"/>
 		<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>">
-		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>" disabled="disabled"/>
 	</fieldset>
 </form>
 <?php if (!empty($_['alt_login'])) { ?>
diff --git a/cron.php b/cron.php
index 987c7dbca7..ed2a20a1e1 100644
--- a/cron.php
+++ b/cron.php
@@ -52,7 +52,10 @@ try {
 	\OC::$server->getSession()->close();
 
 	// initialize a dummy memory session
-	\OC::$server->setSession(new \OC\Session\Memory(''));
+	$session = new \OC\Session\Memory('');
+	$cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
+	$session = $cryptoWrapper->wrapSession($session);
+	\OC::$server->setSession($session);
 
 	$logger = \OC::$server->getLogger();
 
diff --git a/db_structure.xml b/db_structure.xml
index 870c0ab018..6efcf497cf 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -104,8 +104,8 @@
 
 			<field>
 				<name>available</name>
-				<type>boolean</type>
-				<default>true</default>
+				<type>integer</type>
+				<default>1</default>
 				<notnull>true</notnull>
 			</field>
 
@@ -1192,5 +1192,78 @@
 
 	</table>
 
+	<table>
+
+		<!--
+		Table for storing transactional file locking
+		-->
+		<name>*dbprefix*file_locks</name>
+
+		<declaration>
+
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>4</length>
+				<autoincrement>1</autoincrement>
+			</field>
+
+			<field>
+				<name>lock</name>
+				<type>integer</type>
+				<default>0</default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<field>
+				<name>key</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
+			<field>
+				<name>ttl</name>
+				<type>integer</type>
+				<default>-1</default>
+				<notnull>true</notnull>
+				<length>4</length>
+			</field>
+
+			<index>
+				<primary>true</primary>
+				<unique>true</unique>
+				<name>lock_id_index</name>
+				<field>
+					<name>id</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
+			<index>
+				<unique>true</unique>
+				<name>lock_key_index</name>
+				<field>
+					<name>key</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
+			<index>
+				<name>lock_ttl_index</name>
+				<field>
+					<name>ttl</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
+		</declaration>
+
+	</table>
+
 
 </database>
diff --git a/l10n/.tx/config b/l10n/.tx/config
index 1d766d3463..875e1324db 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -14,7 +14,7 @@ source_file = templates/files.pot
 source_lang = en
 type = PO
 
-[owncloud.settings]
+[owncloud.settings-1]
 file_filter = <lang>/settings.po
 source_file = templates/settings.pot
 source_lang = en
diff --git a/l10n/rm-old.sh b/l10n/rm-old.sh
new file mode 100644
index 0000000000..30e4509db2
--- /dev/null
+++ b/l10n/rm-old.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+lang=(ach ady af_ZA ak am_ET ar ast az bal be bg_BG bn_BD bn_IN bs ca cs_CZ cy_GB da de de_AT de_DE el en_GB en@pirate eo es es_AR es_CL es_MX et_EE eu fa fi_FI fil fr fy_NL gl gu he hi hr hu_HU hy ia id io is it ja jv ka_GE km kn ko ku_IQ la lb lo lt_LT lv mg mk ml ml_IN mn mr ms_MY mt_MT my_MM nb_NO nds ne nl nn_NO nqo oc or_IN pa pl pt_BR pt_PT ro ru si_LK sk_SK sl sq sr sr@latin su sv sw_KE ta_IN ta_LK te tg_TJ th_TH tl_PH tr tzl tzm ug uk ur_PK uz vi yo zh_CN zh_HK zh_TW)
+
+ignore=""
+
+for fignore in "${lang[@]}"; do
+  ignore=${ignore}"-not -name ${fignore}.js -not -name ${fignore}.json "
+done
+
+
+find ../lib/l10n -type f $ignore -delete
+find ../settings/l10n -type f $ignore -delete
+find ../core/l10n -type f $ignore -delete
+find ../apps/files/l10n -type f $ignore -delete
+find ../apps/encryption/l10n -type f $ignore -delete
+find ../apps/files_external/l10n -type f $ignore -delete
+find ../apps/files_sharing/l10n -type f $ignore -delete
+find ../apps/files_trashbin/l10n -type f $ignore -delete
+find ../apps/files_versions/l10n -type f $ignore -delete
+find ../apps/user_ldap/l10n -type f $ignore -delete
+find ../apps/user_webdavauth/l10n -type f $ignore -delete
+
+
diff --git a/lib/autoloader.php b/lib/autoloader.php
index 23285f61e7..41a040b3f5 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -27,6 +27,8 @@
 
 namespace OC;
 
+use \OCP\AutoloadNotAllowedException;
+
 class Autoloader {
 	private $useGlobalClassPath = true;
 
@@ -34,12 +36,33 @@ class Autoloader {
 
 	private $classPaths = array();
 
+	private $validRoots = [];
+
 	/**
 	 * Optional low-latency memory cache for class to path mapping.
+	 *
 	 * @var \OC\Memcache\Cache
 	 */
 	protected $memoryCache;
 
+	/**
+	 * Autoloader constructor.
+	 *
+	 * @param string[] $validRoots
+	 */
+	public function __construct(array $validRoots) {
+		$this->validRoots = $validRoots;
+	}
+
+	/**
+	 * Add a path to the list of valid php roots for auto loading
+	 *
+	 * @param string $root
+	 */
+	public function addValidRoot($root) {
+		$this->validRoots[] = stream_resolve_include_path($root);
+	}
+
 	/**
 	 * disable the usage of the global classpath \OC::$CLASSPATH
 	 */
@@ -102,6 +125,15 @@ class Autoloader {
 		return $paths;
 	}
 
+	protected function isValidPath($fullPath) {
+		foreach ($this->validRoots as $root) {
+			if (substr($fullPath, 0, strlen($root) + 1) === $root . '/') {
+				return true;
+			}
+		}
+		throw new AutoloadNotAllowedException($fullPath);
+	}
+
 	/**
 	 * Load the specified class
 	 *
@@ -119,7 +151,7 @@ class Autoloader {
 			$pathsToRequire = array();
 			foreach ($this->findClass($class) as $path) {
 				$fullPath = stream_resolve_include_path($path);
-				if ($fullPath) {
+				if ($fullPath && $this->isValidPath($fullPath)) {
 					$pathsToRequire[] = $fullPath;
 				}
 			}
@@ -138,6 +170,7 @@ class Autoloader {
 
 	/**
 	 * Sets the optional low-latency cache for class to path mapping.
+	 *
 	 * @param \OC\Memcache\Cache $memoryCache Instance of memory cache.
 	 */
 	public function setMemoryCache(\OC\Memcache\Cache $memoryCache = null) {
diff --git a/lib/base.php b/lib/base.php
index 42e1d7f858..f5ba05ded7 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -115,9 +115,6 @@ class OC {
 	 * the app path list is empty or contains an invalid path
 	 */
 	public static function initPaths() {
-		// calculate the root directories
-		OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
-
 		// ensure we can find OC_Config
 		set_include_path(
 			OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
@@ -134,18 +131,7 @@ class OC {
 		OC_Config::$object = new \OC\Config(self::$configDir);
 
 		OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
-		/**
-		 * FIXME: The following line is required because of a cyclic dependency
-		 *        on IRequest.
-		 */
-		$params = [
-			'server' => [
-				'SCRIPT_NAME' => $_SERVER['SCRIPT_NAME'],
-				'SCRIPT_FILENAME' => $_SERVER['SCRIPT_FILENAME'],
-			],
-		];
-		$fakeRequest = new \OC\AppFramework\Http\Request($params, null, new \OC\AllConfig(new \OC\SystemConfig()));
-		$scriptName = $fakeRequest->getScriptName();
+		$scriptName = $_SERVER['SCRIPT_NAME'];
 		if (substr($scriptName, -1) == '/') {
 			$scriptName .= 'index.php';
 			//make sure suburi follows the same rules as scriptName
@@ -463,13 +449,15 @@ class OC {
 			$useCustomSession = false;
 			$session = self::$server->getSession();
 			OC_Hook::emit('OC', 'initSession', array('session' => &$session, 'sessionName' => &$sessionName, 'useCustomSession' => &$useCustomSession));
-			if($useCustomSession) {
-				// use the session reference as the new Session
-				self::$server->setSession($session);
-			} else {
+			if (!$useCustomSession) {
 				// set the session name to the instance id - which is unique
-				self::$server->setSession(new \OC\Session\Internal($sessionName));
+				$session = new \OC\Session\Internal($sessionName);
 			}
+
+			$cryptoWrapper = \OC::$server->getSessionCryptoWrapper();
+			$session = $cryptoWrapper->wrapSession($session);
+			self::$server->setSession($session);
+
 			// if session cant be started break with http 500 error
 		} catch (Exception $e) {
 			\OCP\Util::logException('base', $e);
@@ -528,10 +516,21 @@ class OC {
 	}
 
 	public static function init() {
+		// calculate the root directories
+		OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
+
 		// register autoloader
 		$loaderStart = microtime(true);
 		require_once __DIR__ . '/autoloader.php';
-		self::$loader = new \OC\Autoloader();
+		self::$loader = new \OC\Autoloader([
+			OC::$SERVERROOT . '/lib',
+			OC::$SERVERROOT . '/core',
+			OC::$SERVERROOT . '/settings',
+			OC::$SERVERROOT . '/ocs',
+			OC::$SERVERROOT . '/ocs-provider',
+			OC::$SERVERROOT . '/3rdparty',
+			OC::$SERVERROOT . '/tests',
+		]);
 		spl_autoload_register(array(self::$loader, 'load'));
 		$loaderEnd = microtime(true);
 
@@ -542,7 +541,7 @@ class OC {
 			// setup 3rdparty autoloader
 			$vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
 			if (!file_exists($vendorAutoLoad)) {
-				throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty".');
+				throw new \RuntimeException('Composer autoloader not found, unable to continue. Check the folder "3rdparty". Running "git submodule update --init" will initialize the git submodule that handles the subfolder "3rdparty".');
 			}
 			require_once $vendorAutoLoad;
 
@@ -591,7 +590,7 @@ class OC {
 		if (!defined('PHPUNIT_RUN')) {
 			$logger = \OC::$server->getLogger();
 			OC\Log\ErrorHandler::setLogger($logger);
-			if (defined('DEBUG') and DEBUG) {
+			if (\OC::$server->getConfig()->getSystemValue('debug', false)) {
 				OC\Log\ErrorHandler::register(true);
 				set_exception_handler(array('OC_Template', 'printExceptionErrorPage'));
 			} else {
@@ -672,7 +671,7 @@ class OC {
 
 		self::registerCacheHooks();
 		self::registerFilesystemHooks();
-		if (\OC::$server->getSystemConfig()->getValue('enable_previews', true)) {
+		if ($systemConfig->getValue('enable_previews', true)) {
 			self::registerPreviewHooks();
 		}	
 		self::registerShareHooks();
@@ -1049,7 +1048,7 @@ class OC {
 			return false;
 		}
 
-		if (defined("DEBUG") && DEBUG) {
+		if (\OC::$server->getConfig()->getSystemValue('debug', false)) {
 			\OCP\Util::writeLog('core', 'Trying to login from cookie', \OCP\Util::DEBUG);
 		}
 
@@ -1102,11 +1101,12 @@ class OC {
 
 			self::cleanupLoginTokens($userId);
 			if (!empty($_POST["remember_login"])) {
-				if (defined("DEBUG") && DEBUG) {
+				$config = self::$server->getConfig();
+				if ($config->getSystemValue('debug', false)) {
 					self::$server->getLogger()->debug('Setting remember login to cookie', array('app' => 'core'));
 				}
 				$token = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(32);
-				self::$server->getConfig()->setUserValue($userId, 'login_token', $token, time());
+				$config->setUserValue($userId, 'login_token', $token, time());
 				OC_User::setMagicInCookie($userId, $token);
 			} else {
 				OC_User::unsetMagicInCookie();
@@ -1116,27 +1116,8 @@ class OC {
 		}
 		return true;
 	}
+
 }
 
-if (!function_exists('get_temp_dir')) {
-	/**
-	 * Get the temporary dir to store uploaded data
-	 * @return null|string Path to the temporary directory or null
-	 */
-	function get_temp_dir() {
-		if ($temp = ini_get('upload_tmp_dir')) return $temp;
-		if ($temp = getenv('TMP')) return $temp;
-		if ($temp = getenv('TEMP')) return $temp;
-		if ($temp = getenv('TMPDIR')) return $temp;
-		$temp = tempnam(__FILE__, '');
-		if (file_exists($temp)) {
-			unlink($temp);
-			return dirname($temp);
-		}
-		if ($temp = sys_get_temp_dir()) return $temp;
-
-		return null;
-	}
-}
 
 OC::init();
diff --git a/lib/l10n/ca@valencia.js b/lib/l10n/ca@valencia.js
deleted file mode 100644
index a12702211c..0000000000
--- a/lib/l10n/ca@valencia.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ca@valencia.json b/lib/l10n/ca@valencia.json
deleted file mode 100644
index b994fa289e..0000000000
--- a/lib/l10n/ca@valencia.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js
index 8885ecd6e1..65ff43b4f2 100644
--- a/lib/l10n/cs_CZ.js
+++ b/lib/l10n/cs_CZ.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Nelze přečíst soubor",
     "App directory already exists" : "Adresář aplikace již existuje",
     "Can't create app folder. Please fix permissions. %s" : "Nelze vytvořit složku aplikace. Opravte práva souborů. %s",
+    "Archive does not contain a directory named %s" : "Archiv neobsahuje adresář pojmenovaný %s",
     "No source specified when installing app" : "Nebyl zadán zdroj při instalaci aplikace",
     "No href specified when installing app from http" : "Nebyl zadán odkaz pro instalaci aplikace z HTTP",
     "No path specified when installing app from local file" : "Nebyla zadána cesta pro instalaci aplikace z místního souboru",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Sdílení položky %s selhalo, protože uživatel %s neexistuje",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Sdílení položky %s selhalo, protože uživatel %s není členem žádné skupiny společné s uživatelem %s",
     "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena",
+    "Sharing %s failed, because this item is already shared with user %s" : "Sdílení položky %s selhalo, protože ta je již s uživatelem %s sdílena",
     "Sharing %s failed, because the group %s does not exist" : "Sdílení položky %s selhalo, protože skupina %s neexistuje",
     "Sharing %s failed, because %s is not a member of the group %s" : "Sdílení položky %s selhalo, protože uživatel %s není členem skupiny %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Pro vytvoření veřejného odkazu je nutné zadat heslo, jsou povoleny pouze chráněné odkazy",
diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json
index c5f50a7384..501210dd0f 100644
--- a/lib/l10n/cs_CZ.json
+++ b/lib/l10n/cs_CZ.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Nelze přečíst soubor",
     "App directory already exists" : "Adresář aplikace již existuje",
     "Can't create app folder. Please fix permissions. %s" : "Nelze vytvořit složku aplikace. Opravte práva souborů. %s",
+    "Archive does not contain a directory named %s" : "Archiv neobsahuje adresář pojmenovaný %s",
     "No source specified when installing app" : "Nebyl zadán zdroj při instalaci aplikace",
     "No href specified when installing app from http" : "Nebyl zadán odkaz pro instalaci aplikace z HTTP",
     "No path specified when installing app from local file" : "Nebyla zadána cesta pro instalaci aplikace z místního souboru",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Sdílení položky %s selhalo, protože uživatel %s neexistuje",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Sdílení položky %s selhalo, protože uživatel %s není členem žádné skupiny společné s uživatelem %s",
     "Sharing %s failed, because this item is already shared with %s" : "Sdílení položky %s selhalo, protože položka již je s uživatelem %s sdílena",
+    "Sharing %s failed, because this item is already shared with user %s" : "Sdílení položky %s selhalo, protože ta je již s uživatelem %s sdílena",
     "Sharing %s failed, because the group %s does not exist" : "Sdílení položky %s selhalo, protože skupina %s neexistuje",
     "Sharing %s failed, because %s is not a member of the group %s" : "Sdílení položky %s selhalo, protože uživatel %s není členem skupiny %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Pro vytvoření veřejného odkazu je nutné zadat heslo, jsou povoleny pouze chráněné odkazy",
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index 877f97ad8b..285e9ac55d 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Kan ikke læse filen",
     "App directory already exists" : "App-mappe findes allerede",
     "Can't create app folder. Please fix permissions. %s" : "Kan ikke oprette app-mappe. Ret tilladelser. %s",
+    "Archive does not contain a directory named %s" : "Arkivet indeholder ike en mappe kaldet %s",
     "No source specified when installing app" : "Ingen kilde angivet under installation af app",
     "No href specified when installing app from http" : "Ingen href angivet under installation af app via http",
     "No path specified when installing app from local file" : "Ingen sti angivet under installation af app fra lokal fil",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Der skete en fejl ved deling af %s, brugeren %s eksistere ikke",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Der skete en fejl ved deling af %s, brugeren %s er ikke medlem af nogle grupper som %s er medlem af",
     "Sharing %s failed, because this item is already shared with %s" : "Der skete en fejl ved deling af %s, objektet er allerede delt med %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Deling af %s mislykkedes, fordi dette element allerede er delt med brugeren %s",
     "Sharing %s failed, because the group %s does not exist" : "Der skete en fejl ved deling af %s, gruppen %s eksistere ikke",
     "Sharing %s failed, because %s is not a member of the group %s" : "Der skete en fejl ved deling af %s, fordi %s ikke er medlem af gruppen %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Du skal angive et kodeord for at oprette et offentligt link - kun beskyttede links er tilladt",
@@ -130,7 +132,7 @@ OC.L10N.register(
     "PHP setting \"%s\" is not set to \"%s\"." : "PHP-indstillingen \"%s\" er ikke angivet til \"%s\".",
     "Adjusting this setting in php.ini will make ownCloud run again" : "Justeres denne indstilling i php.ini, så vil ownCloud kunne køre igen",
     "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload er angivet til \"%s\", i stedet for den forventede værdi \"0\"",
-    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "For at rette dette problem, så angiv\n<code>mbstring.func_overload</code> til <code>0</code> i din php.ini",
+    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "For at rette dette problem, angiv\n<code>mbstring.func_overload</code> til <code>0</code> i din php.ini",
     "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP er tilsyneladende sat op til at fjerne indlejrede doc-blokke. Dette vil gøre adskillige kerneprogrammer utilgængelige.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
     "PHP modules have been installed, but they are still listed as missing?" : "Der er installeret PHP-moduler, men de fremstår stadig som fraværende?",
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index bf5429d002..1b9ed30459 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Kan ikke læse filen",
     "App directory already exists" : "App-mappe findes allerede",
     "Can't create app folder. Please fix permissions. %s" : "Kan ikke oprette app-mappe. Ret tilladelser. %s",
+    "Archive does not contain a directory named %s" : "Arkivet indeholder ike en mappe kaldet %s",
     "No source specified when installing app" : "Ingen kilde angivet under installation af app",
     "No href specified when installing app from http" : "Ingen href angivet under installation af app via http",
     "No path specified when installing app from local file" : "Ingen sti angivet under installation af app fra lokal fil",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Der skete en fejl ved deling af %s, brugeren %s eksistere ikke",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Der skete en fejl ved deling af %s, brugeren %s er ikke medlem af nogle grupper som %s er medlem af",
     "Sharing %s failed, because this item is already shared with %s" : "Der skete en fejl ved deling af %s, objektet er allerede delt med %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Deling af %s mislykkedes, fordi dette element allerede er delt med brugeren %s",
     "Sharing %s failed, because the group %s does not exist" : "Der skete en fejl ved deling af %s, gruppen %s eksistere ikke",
     "Sharing %s failed, because %s is not a member of the group %s" : "Der skete en fejl ved deling af %s, fordi %s ikke er medlem af gruppen %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Du skal angive et kodeord for at oprette et offentligt link - kun beskyttede links er tilladt",
@@ -128,7 +130,7 @@
     "PHP setting \"%s\" is not set to \"%s\"." : "PHP-indstillingen \"%s\" er ikke angivet til \"%s\".",
     "Adjusting this setting in php.ini will make ownCloud run again" : "Justeres denne indstilling i php.ini, så vil ownCloud kunne køre igen",
     "mbstring.func_overload is set to \"%s\" instead of the expected value \"0\"" : "mbstring.func_overload er angivet til \"%s\", i stedet for den forventede værdi \"0\"",
-    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "For at rette dette problem, så angiv\n<code>mbstring.func_overload</code> til <code>0</code> i din php.ini",
+    "To fix this issue set <code>mbstring.func_overload</code> to <code>0</code> in your php.ini" : "For at rette dette problem, angiv\n<code>mbstring.func_overload</code> til <code>0</code> i din php.ini",
     "PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible." : "PHP er tilsyneladende sat op til at fjerne indlejrede doc-blokke. Dette vil gøre adskillige kerneprogrammer utilgængelige.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
     "PHP modules have been installed, but they are still listed as missing?" : "Der er installeret PHP-moduler, men de fremstår stadig som fraværende?",
diff --git a/lib/l10n/de_CH.js b/lib/l10n/de_CH.js
deleted file mode 100644
index d0d4be0f4e..0000000000
--- a/lib/l10n/de_CH.js
+++ /dev/null
@@ -1,40 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "Help" : "Hilfe",
-    "Personal" : "Persönlich",
-    "Settings" : "Einstellungen",
-    "Users" : "Benutzer",
-    "Admin" : "Administrator",
-    "No app name specified" : "Kein App-Name spezifiziert",
-    "web services under your control" : "Web-Services unter Ihrer Kontrolle",
-    "App directory already exists" : "Anwendungsverzeichnis existiert bereits",
-    "App can't be installed because of not allowed code in the App" : "Anwendung kann wegen nicht erlaubten Codes nicht installiert werden",
-    "Application is not enabled" : "Die Anwendung ist nicht aktiviert",
-    "Authentication error" : "Authentifizierungs-Fehler",
-    "Token expired. Please reload page." : "Token abgelaufen. Bitte laden Sie die Seite neu.",
-    "%s enter the database username." : "%s geben Sie den Datenbank-Benutzernamen an.",
-    "%s enter the database name." : "%s geben Sie den Datenbank-Namen an.",
-    "%s you may not use dots in the database name" : "%s Der Datenbank-Name darf keine Punkte enthalten",
-    "MS SQL username and/or password not valid: %s" : "MS SQL Benutzername und/oder Passwort ungültig: %s",
-    "You need to enter either an existing account or the administrator." : "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-    "DB Error: \"%s\"" : "DB Fehler: \"%s\"",
-    "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"",
-    "Oracle connection could not be established" : "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
-    "Oracle username and/or password not valid" : "Oracle Benutzername und/oder Passwort ungültig",
-    "Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL Benutzername und/oder Passwort ungültig",
-    "Set an admin username." : "Setze Administrator Benutzername.",
-    "Set an admin password." : "Setze Administrator Passwort",
-    "%s shared »%s« with you" : "%s teilt »%s« mit Ihnen",
-    "Could not find category \"%s\"" : "Die Kategorie «%s» konnte nicht gefunden werden.",
-    "seconds ago" : "Gerade eben",
-    "today" : "Heute",
-    "yesterday" : "Gestern",
-    "last month" : "Letzten Monat",
-    "last year" : "Letztes Jahr",
-    "years ago" : "Vor  Jahren",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/de_CH.json b/lib/l10n/de_CH.json
deleted file mode 100644
index 26ab7e1b20..0000000000
--- a/lib/l10n/de_CH.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{ "translations": {
-    "Help" : "Hilfe",
-    "Personal" : "Persönlich",
-    "Settings" : "Einstellungen",
-    "Users" : "Benutzer",
-    "Admin" : "Administrator",
-    "No app name specified" : "Kein App-Name spezifiziert",
-    "web services under your control" : "Web-Services unter Ihrer Kontrolle",
-    "App directory already exists" : "Anwendungsverzeichnis existiert bereits",
-    "App can't be installed because of not allowed code in the App" : "Anwendung kann wegen nicht erlaubten Codes nicht installiert werden",
-    "Application is not enabled" : "Die Anwendung ist nicht aktiviert",
-    "Authentication error" : "Authentifizierungs-Fehler",
-    "Token expired. Please reload page." : "Token abgelaufen. Bitte laden Sie die Seite neu.",
-    "%s enter the database username." : "%s geben Sie den Datenbank-Benutzernamen an.",
-    "%s enter the database name." : "%s geben Sie den Datenbank-Namen an.",
-    "%s you may not use dots in the database name" : "%s Der Datenbank-Name darf keine Punkte enthalten",
-    "MS SQL username and/or password not valid: %s" : "MS SQL Benutzername und/oder Passwort ungültig: %s",
-    "You need to enter either an existing account or the administrator." : "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-    "DB Error: \"%s\"" : "DB Fehler: \"%s\"",
-    "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"",
-    "Oracle connection could not be established" : "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
-    "Oracle username and/or password not valid" : "Oracle Benutzername und/oder Passwort ungültig",
-    "Offending command was: \"%s\", name: %s, password: %s" : "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
-    "PostgreSQL username and/or password not valid" : "PostgreSQL Benutzername und/oder Passwort ungültig",
-    "Set an admin username." : "Setze Administrator Benutzername.",
-    "Set an admin password." : "Setze Administrator Passwort",
-    "%s shared »%s« with you" : "%s teilt »%s« mit Ihnen",
-    "Could not find category \"%s\"" : "Die Kategorie «%s» konnte nicht gefunden werden.",
-    "seconds ago" : "Gerade eben",
-    "today" : "Heute",
-    "yesterday" : "Gestern",
-    "last month" : "Letzten Monat",
-    "last year" : "Letztes Jahr",
-    "years ago" : "Vor  Jahren",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/el.js b/lib/l10n/el.js
index 2e47db3047..ee9ad8efd4 100644
--- a/lib/l10n/el.js
+++ b/lib/l10n/el.js
@@ -46,6 +46,7 @@ OC.L10N.register(
     "Can't read file" : "Αδυναμία ανάγνωσης αρχείου",
     "App directory already exists" : "Ο κατάλογος εφαρμογών υπάρχει ήδη",
     "Can't create app folder. Please fix permissions. %s" : "Δεν είναι δυνατόν να δημιουργηθεί ο φάκελος εφαρμογής. Παρακαλώ διορθώστε τις άδειες πρόσβασης. %s",
+    "Archive does not contain a directory named %s" : "Το αρχείο δεν περιέχει κατάλογο με το όνομα %s",
     "No source specified when installing app" : "Δεν προσδιορίστηκε πηγή κατά την εγκατάσταση της εφαρμογής",
     "No href specified when installing app from http" : "Δεν προσδιορίστηκε href κατά την εγκατάσταση της εφαρμογής μέσω http ",
     "No path specified when installing app from local file" : "Δεν προσδιορίστηκε μονοπάτι κατά την εγκατάσταση εφαρμογής από τοπικό αρχείο",
@@ -87,6 +88,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν υπάρχει",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος καμίας ομάδας στην οποία ο χρήστης %s είναι μέλος",
     "Sharing %s failed, because this item is already shared with %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο ήδη με τον χρήστη %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Αποτυχία διαμοιρασμού με %s, διότι αυτό το αντικείμενο διαμοιράζεται ήδη με τον χρήστη %s",
     "Sharing %s failed, because the group %s does not exist" : "Ο διαμοιρασμός του %s απέτυχε, γιατί η ομάδα χρηστών %s δεν υπάρχει",
     "Sharing %s failed, because %s is not a member of the group %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος της ομάδας %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Πρέπει να εισάγετε έναν κωδικό για να δημιουργήσετε έναν δημόσιο σύνδεσμο. Μόνο προστατευμένοι σύνδεσμοι επιτρέπονται",
diff --git a/lib/l10n/el.json b/lib/l10n/el.json
index 7b0b9b149a..d0235598f7 100644
--- a/lib/l10n/el.json
+++ b/lib/l10n/el.json
@@ -44,6 +44,7 @@
     "Can't read file" : "Αδυναμία ανάγνωσης αρχείου",
     "App directory already exists" : "Ο κατάλογος εφαρμογών υπάρχει ήδη",
     "Can't create app folder. Please fix permissions. %s" : "Δεν είναι δυνατόν να δημιουργηθεί ο φάκελος εφαρμογής. Παρακαλώ διορθώστε τις άδειες πρόσβασης. %s",
+    "Archive does not contain a directory named %s" : "Το αρχείο δεν περιέχει κατάλογο με το όνομα %s",
     "No source specified when installing app" : "Δεν προσδιορίστηκε πηγή κατά την εγκατάσταση της εφαρμογής",
     "No href specified when installing app from http" : "Δεν προσδιορίστηκε href κατά την εγκατάσταση της εφαρμογής μέσω http ",
     "No path specified when installing app from local file" : "Δεν προσδιορίστηκε μονοπάτι κατά την εγκατάσταση εφαρμογής από τοπικό αρχείο",
@@ -85,6 +86,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν υπάρχει",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος καμίας ομάδας στην οποία ο χρήστης %s είναι μέλος",
     "Sharing %s failed, because this item is already shared with %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο ήδη με τον χρήστη %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Αποτυχία διαμοιρασμού με %s, διότι αυτό το αντικείμενο διαμοιράζεται ήδη με τον χρήστη %s",
     "Sharing %s failed, because the group %s does not exist" : "Ο διαμοιρασμός του %s απέτυχε, γιατί η ομάδα χρηστών %s δεν υπάρχει",
     "Sharing %s failed, because %s is not a member of the group %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s δεν είναι μέλος της ομάδας %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Πρέπει να εισάγετε έναν κωδικό για να δημιουργήσετε έναν δημόσιο σύνδεσμο. Μόνο προστατευμένοι σύνδεσμοι επιτρέπονται",
diff --git a/lib/l10n/en_NZ.js b/lib/l10n/en_NZ.js
deleted file mode 100644
index a12702211c..0000000000
--- a/lib/l10n/en_NZ.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/en_NZ.json b/lib/l10n/en_NZ.json
deleted file mode 100644
index b994fa289e..0000000000
--- a/lib/l10n/en_NZ.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index d071dc624e..3f1d751fc1 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "No se puede leer archivo",
     "App directory already exists" : "El directorio de la aplicación ya existe",
     "Can't create app folder. Please fix permissions. %s" : "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
+    "Archive does not contain a directory named %s" : "El archivo no contiene un directorio llamado %s",
     "No source specified when installing app" : "No se ha especificado origen cuando se ha instalado la aplicación",
     "No href specified when installing app from http" : "No href especificado cuando se ha instalado la aplicación",
     "No path specified when installing app from local file" : "Ninguna ruta especificada al instalar la aplicación desde el fichero local",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Se ha fallado al compartir %s, ya que el usuario %s no existe",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Se ha fallado al compartir %s, ya que el usuario %s no es miembro de ningún grupo del que %s sea miembro",
     "Sharing %s failed, because this item is already shared with %s" : "Se falló al compartir %s, ya que este elemento ya está compartido con %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Compartiendo %s falló, porque este objeto ya se comparte con el usuario %s",
     "Sharing %s failed, because the group %s does not exist" : "Se falló al compartir %s, ya que el grupo %s no existe",
     "Sharing %s failed, because %s is not a member of the group %s" : "Se falló al compartir %s, ya que %s no es miembro del grupo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Es necesario definir una contraseña para crear un enlace publico. Solo los enlaces protegidos están permitidos",
@@ -115,7 +117,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
     "The username is already being used" : "El nombre de usuario ya está en uso",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "No están instalados los drivers de BBDD  (sqlite, mysql, o postgresql)",
-    "Microsoft Windows Platform is not supported" : "Plataforma Microsoft Windows no está soportada",
+    "Microsoft Windows Platform is not supported" : "La plataforma Microsoft Windows no está soportada",
     "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Ejecutar el servidor ownCloud en la plataforma Microsoft Windows no está soportada. Sugerimos que utilice un servidor Linux en una máquina virtual si no posee opción de migrar de servidor. Encuentre paquetes de Linux así como implementar máquinas virtuales en <a href=\"%s\">%s</a>. Para migrar instalaciones actuales hacia Linux puede encontrar algunos consejos y un script de migración en <a href=\"%s\">nuestra documentación</a>.",
     "Cannot write into \"config\" directory" : "No se puede escribir el el directorio de configuración",
     "Cannot write into \"apps\" directory" : "No se puede escribir en el directorio de \"apps\"",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index 28655f2c92..75b8060b81 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -47,6 +47,7 @@
     "Can't read file" : "No se puede leer archivo",
     "App directory already exists" : "El directorio de la aplicación ya existe",
     "Can't create app folder. Please fix permissions. %s" : "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
+    "Archive does not contain a directory named %s" : "El archivo no contiene un directorio llamado %s",
     "No source specified when installing app" : "No se ha especificado origen cuando se ha instalado la aplicación",
     "No href specified when installing app from http" : "No href especificado cuando se ha instalado la aplicación",
     "No path specified when installing app from local file" : "Ninguna ruta especificada al instalar la aplicación desde el fichero local",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Se ha fallado al compartir %s, ya que el usuario %s no existe",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Se ha fallado al compartir %s, ya que el usuario %s no es miembro de ningún grupo del que %s sea miembro",
     "Sharing %s failed, because this item is already shared with %s" : "Se falló al compartir %s, ya que este elemento ya está compartido con %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Compartiendo %s falló, porque este objeto ya se comparte con el usuario %s",
     "Sharing %s failed, because the group %s does not exist" : "Se falló al compartir %s, ya que el grupo %s no existe",
     "Sharing %s failed, because %s is not a member of the group %s" : "Se falló al compartir %s, ya que %s no es miembro del grupo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Es necesario definir una contraseña para crear un enlace publico. Solo los enlaces protegidos están permitidos",
@@ -113,7 +115,7 @@
     "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
     "The username is already being used" : "El nombre de usuario ya está en uso",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "No están instalados los drivers de BBDD  (sqlite, mysql, o postgresql)",
-    "Microsoft Windows Platform is not supported" : "Plataforma Microsoft Windows no está soportada",
+    "Microsoft Windows Platform is not supported" : "La plataforma Microsoft Windows no está soportada",
     "Running ownCloud Server on the Microsoft Windows platform is not supported. We suggest you use a Linux server in a virtual machine if you have no option for migrating the server itself. Find Linux packages as well as easy to deploy virtual machine images on <a href=\"%s\">%s</a>. For migrating existing installations to Linux you can find some tips and a migration script in <a href=\"%s\">our documentation</a>." : "Ejecutar el servidor ownCloud en la plataforma Microsoft Windows no está soportada. Sugerimos que utilice un servidor Linux en una máquina virtual si no posee opción de migrar de servidor. Encuentre paquetes de Linux así como implementar máquinas virtuales en <a href=\"%s\">%s</a>. Para migrar instalaciones actuales hacia Linux puede encontrar algunos consejos y un script de migración en <a href=\"%s\">nuestra documentación</a>.",
     "Cannot write into \"config\" directory" : "No se puede escribir el el directorio de configuración",
     "Cannot write into \"apps\" directory" : "No se puede escribir en el directorio de \"apps\"",
diff --git a/lib/l10n/es_BO.js b/lib/l10n/es_BO.js
deleted file mode 100644
index a12702211c..0000000000
--- a/lib/l10n/es_BO.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_BO.json b/lib/l10n/es_BO.json
deleted file mode 100644
index b994fa289e..0000000000
--- a/lib/l10n/es_BO.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_CO.js b/lib/l10n/es_CO.js
deleted file mode 100644
index a12702211c..0000000000
--- a/lib/l10n/es_CO.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_CO.json b/lib/l10n/es_CO.json
deleted file mode 100644
index b994fa289e..0000000000
--- a/lib/l10n/es_CO.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_CR.js b/lib/l10n/es_CR.js
deleted file mode 100644
index a12702211c..0000000000
--- a/lib/l10n/es_CR.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_CR.json b/lib/l10n/es_CR.json
deleted file mode 100644
index b994fa289e..0000000000
--- a/lib/l10n/es_CR.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_EC.js b/lib/l10n/es_EC.js
deleted file mode 100644
index a12702211c..0000000000
--- a/lib/l10n/es_EC.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_EC.json b/lib/l10n/es_EC.json
deleted file mode 100644
index b994fa289e..0000000000
--- a/lib/l10n/es_EC.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_PE.js b/lib/l10n/es_PE.js
deleted file mode 100644
index a12702211c..0000000000
--- a/lib/l10n/es_PE.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_PE.json b/lib/l10n/es_PE.json
deleted file mode 100644
index b994fa289e..0000000000
--- a/lib/l10n/es_PE.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_PY.js b/lib/l10n/es_PY.js
deleted file mode 100644
index a12702211c..0000000000
--- a/lib/l10n/es_PY.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_PY.json b/lib/l10n/es_PY.json
deleted file mode 100644
index b994fa289e..0000000000
--- a/lib/l10n/es_PY.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_US.js b/lib/l10n/es_US.js
deleted file mode 100644
index a12702211c..0000000000
--- a/lib/l10n/es_US.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_US.json b/lib/l10n/es_US.json
deleted file mode 100644
index b994fa289e..0000000000
--- a/lib/l10n/es_US.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/es_UY.js b/lib/l10n/es_UY.js
deleted file mode 100644
index a12702211c..0000000000
--- a/lib/l10n/es_UY.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_UY.json b/lib/l10n/es_UY.json
deleted file mode 100644
index b994fa289e..0000000000
--- a/lib/l10n/es_UY.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/eu_ES.js b/lib/l10n/eu_ES.js
deleted file mode 100644
index f547910d4a..0000000000
--- a/lib/l10n/eu_ES.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "Personal" : "Pertsonala"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/eu_ES.json b/lib/l10n/eu_ES.json
deleted file mode 100644
index 711c235ddc..0000000000
--- a/lib/l10n/eu_ES.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Personal" : "Pertsonala"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/fi.js b/lib/l10n/fi.js
deleted file mode 100644
index f134642533..0000000000
--- a/lib/l10n/fi.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "Help" : "Apua",
-    "Settings" : "Asetukset"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/fi.json b/lib/l10n/fi.json
deleted file mode 100644
index b556f7f181..0000000000
--- a/lib/l10n/fi.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Help" : "Apua",
-    "Settings" : "Asetukset"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js
index 3a06e5e4f6..6960162e0a 100644
--- a/lib/l10n/fi_FI.js
+++ b/lib/l10n/fi_FI.js
@@ -47,6 +47,7 @@ OC.L10N.register(
     "Can't read file" : "Tiedostoa ei voi lukea",
     "App directory already exists" : "Sovelluskansio on jo olemassa",
     "Can't create app folder. Please fix permissions. %s" : "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s",
+    "Archive does not contain a directory named %s" : "Arkisto ei sisällä kansiota nimeltä %s",
     "No source specified when installing app" : "Lähdettä ei määritelty sovellusta asennettaessa",
     "No href specified when installing app from http" : "Href-määritettä ei asetettu asennettaessa sovellusta http:n yli",
     "No path specified when installing app from local file" : "Polkua ei määritelty sovellusta asennettaessa paikallisesta tiedostosta",
@@ -81,6 +82,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s is the item owner" : "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on kohteen omistaja",
     "Sharing %s failed, because the user %s does not exist" : "Kohteen %s jakaminen epäonnistui, koska käyttäjää %s ei ole olemassa",
     "Sharing %s failed, because this item is already shared with %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
+    "Sharing %s failed, because this item is already shared with user %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
     "Sharing %s failed, because the group %s does not exist" : "Kohteen %s jakaminen epäonnistui, koska ryhmää %s ei ole olemassa",
     "Sharing %s failed, because %s is not a member of the group %s" : "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s ei ole ryhmän %s jäsen",
     "You need to provide a password to create a public link, only protected links are allowed" : "Anna salasana luodaksesi julkisen linkin. Vain suojatut linkit ovat sallittuja",
diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json
index 27fe774588..7d23189b35 100644
--- a/lib/l10n/fi_FI.json
+++ b/lib/l10n/fi_FI.json
@@ -45,6 +45,7 @@
     "Can't read file" : "Tiedostoa ei voi lukea",
     "App directory already exists" : "Sovelluskansio on jo olemassa",
     "Can't create app folder. Please fix permissions. %s" : "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s",
+    "Archive does not contain a directory named %s" : "Arkisto ei sisällä kansiota nimeltä %s",
     "No source specified when installing app" : "Lähdettä ei määritelty sovellusta asennettaessa",
     "No href specified when installing app from http" : "Href-määritettä ei asetettu asennettaessa sovellusta http:n yli",
     "No path specified when installing app from local file" : "Polkua ei määritelty sovellusta asennettaessa paikallisesta tiedostosta",
@@ -79,6 +80,7 @@
     "Sharing %s failed, because the user %s is the item owner" : "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on kohteen omistaja",
     "Sharing %s failed, because the user %s does not exist" : "Kohteen %s jakaminen epäonnistui, koska käyttäjää %s ei ole olemassa",
     "Sharing %s failed, because this item is already shared with %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
+    "Sharing %s failed, because this item is already shared with user %s" : "Kohteen %s jakaminen epäonnistui, koska kohde on jo jaettu käyttäjän %s kanssa",
     "Sharing %s failed, because the group %s does not exist" : "Kohteen %s jakaminen epäonnistui, koska ryhmää %s ei ole olemassa",
     "Sharing %s failed, because %s is not a member of the group %s" : "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s ei ole ryhmän %s jäsen",
     "You need to provide a password to create a public link, only protected links are allowed" : "Anna salasana luodaksesi julkisen linkin. Vain suojatut linkit ovat sallittuja",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index 8e7de3462a..d0abd693e0 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Can't read file" : "Impossible de lire le fichier",
     "App directory already exists" : "Le dossier de l'application existe déjà",
     "Can't create app folder. Please fix permissions. %s" : "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s",
+    "Archive does not contain a directory named %s" : "Le fichier archive ne contient pas de répertoire %s",
     "No source specified when installing app" : "Aucune source spécifiée pour installer l'application",
     "No href specified when installing app from http" : "Aucun href spécifié pour installer l'application par http",
     "No path specified when installing app from local file" : "Aucun chemin spécifié pour installer l'application depuis un fichier local",
@@ -89,6 +90,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Le partage de %s a échoué car l'utilisateur %s n'existe pas",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Le partage de %s a échoué car l'utilisateur %s n'est membre d'aucun groupe auquel %s appartient",
     "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet objet est déjà partagé avec %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Le partage de %s a échoué car cet élément est déjà partagé avec l'utilisateur %s",
     "Sharing %s failed, because the group %s does not exist" : "Le partage de %s a échoué car le groupe %s n'existe pas",
     "Sharing %s failed, because %s is not a member of the group %s" : "Le partage de %s a échoué car %s n'est pas membre du groupe %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Vous devez fournir un mot de passe pour créer un lien public, seuls les liens protégés sont autorisées.",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 25bcf5b17e..d0a90797df 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -46,6 +46,7 @@
     "Can't read file" : "Impossible de lire le fichier",
     "App directory already exists" : "Le dossier de l'application existe déjà",
     "Can't create app folder. Please fix permissions. %s" : "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s",
+    "Archive does not contain a directory named %s" : "Le fichier archive ne contient pas de répertoire %s",
     "No source specified when installing app" : "Aucune source spécifiée pour installer l'application",
     "No href specified when installing app from http" : "Aucun href spécifié pour installer l'application par http",
     "No path specified when installing app from local file" : "Aucun chemin spécifié pour installer l'application depuis un fichier local",
@@ -87,6 +88,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Le partage de %s a échoué car l'utilisateur %s n'existe pas",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Le partage de %s a échoué car l'utilisateur %s n'est membre d'aucun groupe auquel %s appartient",
     "Sharing %s failed, because this item is already shared with %s" : "Le partage de %s a échoué car cet objet est déjà partagé avec %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Le partage de %s a échoué car cet élément est déjà partagé avec l'utilisateur %s",
     "Sharing %s failed, because the group %s does not exist" : "Le partage de %s a échoué car le groupe %s n'existe pas",
     "Sharing %s failed, because %s is not a member of the group %s" : "Le partage de %s a échoué car %s n'est pas membre du groupe %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Vous devez fournir un mot de passe pour créer un lien public, seuls les liens protégés sont autorisées.",
diff --git a/lib/l10n/fr_CA.js b/lib/l10n/fr_CA.js
deleted file mode 100644
index 9408adc0dc..0000000000
--- a/lib/l10n/fr_CA.js
+++ /dev/null
@@ -1,10 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},
-"nplurals=2; plural=(n > 1);");
diff --git a/lib/l10n/fr_CA.json b/lib/l10n/fr_CA.json
deleted file mode 100644
index 2a227e468c..0000000000
--- a/lib/l10n/fr_CA.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{ "translations": {
-    "_%n day ago_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""],
-    "_%n year ago_::_%n years ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n minute ago_::_%n minutes ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/hi_IN.js b/lib/l10n/hi_IN.js
deleted file mode 100644
index da0dcc6bdd..0000000000
--- a/lib/l10n/hi_IN.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n minute ago_::_%n minutes ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n day go_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/hi_IN.json b/lib/l10n/hi_IN.json
deleted file mode 100644
index 4286553dd0..0000000000
--- a/lib/l10n/hi_IN.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n minute ago_::_%n minutes ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n day go_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/hu_HU.js b/lib/l10n/hu_HU.js
index 6c0d797441..e7287ccd5a 100644
--- a/lib/l10n/hu_HU.js
+++ b/lib/l10n/hu_HU.js
@@ -8,6 +8,11 @@ OC.L10N.register(
     "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!",
     "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ázis nem támogatott: %s",
+    "The library %s is not available." : "A könyvtár %s nem áll rendelkezésre.",
+    "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.",
     "Help" : "Súgó",
     "Personal" : "Személyes",
     "Users" : "Felhasználók",
@@ -18,12 +23,20 @@ OC.L10N.register(
     "Invalid image" : "Hibás kép",
     "today" : "ma",
     "yesterday" : "tegnap",
+    "_%n day ago_::_%n days ago_" : ["%n napja","%n napja"],
     "last month" : "múlt hónapban",
     "_%n month ago_::_%n months ago_" : ["%n hónappal ezelőtt","%n hónappal ezelőtt"],
     "last year" : "tavaly",
+    "_%n year ago_::_%n years ago_" : ["%n éve","%n éve"],
     "_%n hour ago_::_%n hours ago_" : ["%n órával ezelőtt","%n órával ezelőtt"],
     "seconds ago" : "pár másodperce",
     "web services under your control" : "webszolgáltatások saját kézben",
+    "Empty filename is not allowed" : "Üres fájlnév nem engedétlyezett",
+    "Dot files are not allowed" : "Pontozott fájlok nem engedétlyezettek",
+    "4-byte characters are not supported in file names" : "4-byte karakterek nem támogatottak a fájl nevekben.",
+    "File name is a reserved word" : "A fajl neve egy rezervált szó",
+    "File name is too long" : "A fájlnév túl hosszú!",
+    "Can't read file" : "Nem olvasható a fájl",
     "App directory already exists" : "Az alkalmazás mappája már létezik",
     "Can't create app folder. Please fix permissions. %s" : "Nem lehetett létrehozni az alkalmazás mappáját. Kérem ellenőrizze a jogosultságokat. %s",
     "No source specified when installing app" : "Az alkalmazás telepítéséhez nincs forrás megadva",
@@ -57,6 +70,7 @@ OC.L10N.register(
     "Set an admin password." : "Állítson be egy jelszót az adminisztrációhoz.",
     "Can't create or write into the data directory %s" : "Nem sikerült  létrehozni vagy irni  a \"data\" könyvtárba %s",
     "%s shared »%s« with you" : "%s megosztotta Önnel ezt:  »%s«",
+    "%s via %s" : "%s über %s",
     "Sharing %s failed, because the file does not exist" : "%s megosztása sikertelen, mert a fájl nem létezik",
     "You are not allowed to share %s" : "Önnek nincs jogosultsága %s megosztására",
     "Sharing %s failed, because the user %s is the item owner" : "%s megosztása nem sikerült, mert %s felhasználó az állomány tulajdonosa",
@@ -86,6 +100,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Érvényes jelszót kell megadnia",
     "The username is already being used" : "Ez a bejelentkezési név már foglalt",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Nincs telepítve adatbázis-meghajtóprogram (sqlite, mysql vagy postgresql).",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows platform nem támogatott",
     "Cannot write into \"config\" directory" : "Nem írható a \"config\" könyvtár",
     "Cannot write into \"apps\" directory" : "Nem írható az \"apps\" könyvtár",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek az app könyvtárra%s, vagy letiltjuk a config fájlban az appstore használatát.",
diff --git a/lib/l10n/hu_HU.json b/lib/l10n/hu_HU.json
index 1c717e6a4c..8620c13e2a 100644
--- a/lib/l10n/hu_HU.json
+++ b/lib/l10n/hu_HU.json
@@ -6,6 +6,11 @@
     "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!",
     "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ázis nem támogatott: %s",
+    "The library %s is not available." : "A könyvtár %s nem áll rendelkezésre.",
+    "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.",
     "Help" : "Súgó",
     "Personal" : "Személyes",
     "Users" : "Felhasználók",
@@ -16,12 +21,20 @@
     "Invalid image" : "Hibás kép",
     "today" : "ma",
     "yesterday" : "tegnap",
+    "_%n day ago_::_%n days ago_" : ["%n napja","%n napja"],
     "last month" : "múlt hónapban",
     "_%n month ago_::_%n months ago_" : ["%n hónappal ezelőtt","%n hónappal ezelőtt"],
     "last year" : "tavaly",
+    "_%n year ago_::_%n years ago_" : ["%n éve","%n éve"],
     "_%n hour ago_::_%n hours ago_" : ["%n órával ezelőtt","%n órával ezelőtt"],
     "seconds ago" : "pár másodperce",
     "web services under your control" : "webszolgáltatások saját kézben",
+    "Empty filename is not allowed" : "Üres fájlnév nem engedétlyezett",
+    "Dot files are not allowed" : "Pontozott fájlok nem engedétlyezettek",
+    "4-byte characters are not supported in file names" : "4-byte karakterek nem támogatottak a fájl nevekben.",
+    "File name is a reserved word" : "A fajl neve egy rezervált szó",
+    "File name is too long" : "A fájlnév túl hosszú!",
+    "Can't read file" : "Nem olvasható a fájl",
     "App directory already exists" : "Az alkalmazás mappája már létezik",
     "Can't create app folder. Please fix permissions. %s" : "Nem lehetett létrehozni az alkalmazás mappáját. Kérem ellenőrizze a jogosultságokat. %s",
     "No source specified when installing app" : "Az alkalmazás telepítéséhez nincs forrás megadva",
@@ -55,6 +68,7 @@
     "Set an admin password." : "Állítson be egy jelszót az adminisztrációhoz.",
     "Can't create or write into the data directory %s" : "Nem sikerült  létrehozni vagy irni  a \"data\" könyvtárba %s",
     "%s shared »%s« with you" : "%s megosztotta Önnel ezt:  »%s«",
+    "%s via %s" : "%s über %s",
     "Sharing %s failed, because the file does not exist" : "%s megosztása sikertelen, mert a fájl nem létezik",
     "You are not allowed to share %s" : "Önnek nincs jogosultsága %s megosztására",
     "Sharing %s failed, because the user %s is the item owner" : "%s megosztása nem sikerült, mert %s felhasználó az állomány tulajdonosa",
@@ -84,6 +98,7 @@
     "A valid password must be provided" : "Érvényes jelszót kell megadnia",
     "The username is already being used" : "Ez a bejelentkezési név már foglalt",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Nincs telepítve adatbázis-meghajtóprogram (sqlite, mysql vagy postgresql).",
+    "Microsoft Windows Platform is not supported" : "Microsoft Windows platform nem támogatott",
     "Cannot write into \"config\" directory" : "Nem írható a \"config\" könyvtár",
     "Cannot write into \"apps\" directory" : "Nem írható az \"apps\" könyvtár",
     "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek az app könyvtárra%s, vagy letiltjuk a config fájlban az appstore használatát.",
diff --git a/lib/l10n/id.js b/lib/l10n/id.js
index 432ea5c019..0de6a4124f 100644
--- a/lib/l10n/id.js
+++ b/lib/l10n/id.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Tidak dapat membaca berkas",
     "App directory already exists" : "Direktori Apl sudah ada",
     "Can't create app folder. Please fix permissions. %s" : "Tidak dapat membuat folder apl. Silakan perbaiki perizinan. %s",
+    "Archive does not contain a directory named %s" : "Arsip tidak berisi direktori yang bernama %s",
     "No source specified when installing app" : "Tidak ada sumber yang ditentukan saat menginstal apl",
     "No href specified when installing app from http" : "Href tidak ditentukan saat menginstal apl dari http",
     "No path specified when installing app from local file" : "Lokasi tidak ditentukan saat menginstal apl dari berkas lokal",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Gagal membagikan %s, karena pengguna %s tidak ada",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Gagal membagikan %s, karena pengguna %s bukan merupakan anggota dari grup yang %s ikuti",
     "Sharing %s failed, because this item is already shared with %s" : "Gagal membagkan %s, karena item ini sudah dibagikan dengan %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Berbagi %s gagal karena item ini sudah dibagikan dengan pengguna %s",
     "Sharing %s failed, because the group %s does not exist" : "Gagal membagikan %s, karena grup %s tidak ada",
     "Sharing %s failed, because %s is not a member of the group %s" : "Gagal membagikan %s, karena %s bukan anggota dari grup %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Anda perlu memberikan sandi untuk membuat tautan publik, hanya tautan yang terlindungi yang diizinkan",
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
index 6aeffa363d..e1b3a9f93b 100644
--- a/lib/l10n/id.json
+++ b/lib/l10n/id.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Tidak dapat membaca berkas",
     "App directory already exists" : "Direktori Apl sudah ada",
     "Can't create app folder. Please fix permissions. %s" : "Tidak dapat membuat folder apl. Silakan perbaiki perizinan. %s",
+    "Archive does not contain a directory named %s" : "Arsip tidak berisi direktori yang bernama %s",
     "No source specified when installing app" : "Tidak ada sumber yang ditentukan saat menginstal apl",
     "No href specified when installing app from http" : "Href tidak ditentukan saat menginstal apl dari http",
     "No path specified when installing app from local file" : "Lokasi tidak ditentukan saat menginstal apl dari berkas lokal",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Gagal membagikan %s, karena pengguna %s tidak ada",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Gagal membagikan %s, karena pengguna %s bukan merupakan anggota dari grup yang %s ikuti",
     "Sharing %s failed, because this item is already shared with %s" : "Gagal membagkan %s, karena item ini sudah dibagikan dengan %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Berbagi %s gagal karena item ini sudah dibagikan dengan pengguna %s",
     "Sharing %s failed, because the group %s does not exist" : "Gagal membagikan %s, karena grup %s tidak ada",
     "Sharing %s failed, because %s is not a member of the group %s" : "Gagal membagikan %s, karena %s bukan anggota dari grup %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Anda perlu memberikan sandi untuk membuat tautan publik, hanya tautan yang terlindungi yang diizinkan",
diff --git a/lib/l10n/is.js b/lib/l10n/is.js
index c55116fde0..7661ee829f 100644
--- a/lib/l10n/is.js
+++ b/lib/l10n/is.js
@@ -5,6 +5,8 @@ OC.L10N.register(
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Admin" : "Stjórnun",
+    "Unknown filetype" : "Óþekkt skráartegund",
+    "Invalid image" : "Ógild mynd",
     "today" : "í dag",
     "yesterday" : "í gær",
     "last month" : "síðasta mánuði",
@@ -16,4 +18,4 @@ OC.L10N.register(
     "Token expired. Please reload page." : "Auðkenning útrunnin. Vinsamlegast skráðu þig aftur inn.",
     "Could not find category \"%s\"" : "Fann ekki flokkinn \"%s\""
 },
-"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);");
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/lib/l10n/is.json b/lib/l10n/is.json
index a7ed67ae97..81fec382eb 100644
--- a/lib/l10n/is.json
+++ b/lib/l10n/is.json
@@ -3,6 +3,8 @@
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Admin" : "Stjórnun",
+    "Unknown filetype" : "Óþekkt skráartegund",
+    "Invalid image" : "Ógild mynd",
     "today" : "í dag",
     "yesterday" : "í gær",
     "last month" : "síðasta mánuði",
@@ -13,5 +15,5 @@
     "Authentication error" : "Villa við auðkenningu",
     "Token expired. Please reload page." : "Auðkenning útrunnin. Vinsamlegast skráðu þig aftur inn.",
     "Could not find category \"%s\"" : "Fann ekki flokkinn \"%s\""
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/lib/l10n/it.js b/lib/l10n/it.js
index df79ffed2e..d0cf725013 100644
--- a/lib/l10n/it.js
+++ b/lib/l10n/it.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Impossibile leggere il file",
     "App directory already exists" : "La cartella dell'applicazione esiste già",
     "Can't create app folder. Please fix permissions. %s" : "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s",
+    "Archive does not contain a directory named %s" : "L'archivio non contiene una cartella con nome %s",
     "No source specified when installing app" : "Nessuna fonte specificata durante l'installazione dell'applicazione",
     "No href specified when installing app from http" : "Nessun href specificato durante l'installazione dell'applicazione da http",
     "No path specified when installing app from local file" : "Nessun percorso specificato durante l'installazione dell'applicazione da file locale",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Condivisione di %s non riuscita, poiché l'utente %s non esiste",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Condivisione di %s non riuscita, poiché l'utente %s non appartiene ad alcun gruppo di cui %s è membro",
     "Sharing %s failed, because this item is already shared with %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con l'utente %s",
     "Sharing %s failed, because the group %s does not exist" : "Condivisione di %s non riuscita, poiché il gruppo %s non esiste",
     "Sharing %s failed, because %s is not a member of the group %s" : "Condivisione di %s non riuscita, poiché %s non appartiene al gruppo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Devi fornire una password per creare un collegamento pubblico, sono consentiti solo i collegamenti protetti",
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
index 8f5681d596..81038c0e42 100644
--- a/lib/l10n/it.json
+++ b/lib/l10n/it.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Impossibile leggere il file",
     "App directory already exists" : "La cartella dell'applicazione esiste già",
     "Can't create app folder. Please fix permissions. %s" : "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s",
+    "Archive does not contain a directory named %s" : "L'archivio non contiene una cartella con nome %s",
     "No source specified when installing app" : "Nessuna fonte specificata durante l'installazione dell'applicazione",
     "No href specified when installing app from http" : "Nessun href specificato durante l'installazione dell'applicazione da http",
     "No path specified when installing app from local file" : "Nessun percorso specificato durante l'installazione dell'applicazione da file locale",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Condivisione di %s non riuscita, poiché l'utente %s non esiste",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Condivisione di %s non riuscita, poiché l'utente %s non appartiene ad alcun gruppo di cui %s è membro",
     "Sharing %s failed, because this item is already shared with %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con l'utente %s",
     "Sharing %s failed, because the group %s does not exist" : "Condivisione di %s non riuscita, poiché il gruppo %s non esiste",
     "Sharing %s failed, because %s is not a member of the group %s" : "Condivisione di %s non riuscita, poiché %s non appartiene al gruppo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Devi fornire una password per creare un collegamento pubblico, sono consentiti solo i collegamenti protetti",
diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js
index a2ec230d59..bb143bdd52 100644
--- a/lib/l10n/ko.js
+++ b/lib/l10n/ko.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "파일을 읽을 수 없음",
     "App directory already exists" : "앱 디렉터리가 이미 존재합니다.",
     "Can't create app folder. Please fix permissions. %s" : "앱 폴더를 만들 수 없습니다. 권한을 수정하십시오. %s",
+    "Archive does not contain a directory named %s" : "압축 파일에 디렉터리 %s이(가) 없습니다",
     "No source specified when installing app" : "앱을 설치할 때 소스가 지정되지 않았습니다.",
     "No href specified when installing app from http" : "http에서 앱을 설치할 때 href가 지정되지 않았습니다.",
     "No path specified when installing app from local file" : "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다.",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "%s을(를) 공유할 수 없습니다. 사용자 %s이(가) 존재하지 않습니다",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s을(를) 공유할 수 없습니다. 사용자 %s 님은 %s 님이 회원인 어떠한 그룹에도 속해 있지 않습니다",
     "Sharing %s failed, because this item is already shared with %s" : "%s을(를) 공유할 수 없습니다. 이미 %s 님과 공유되어 있습니다",
+    "Sharing %s failed, because this item is already shared with user %s" : "%s을(를) 공유할 수 없습니다. 이 항목을 이미 %s 님과 공유하고 있습니다",
     "Sharing %s failed, because the group %s does not exist" : "%s을(를) 공유할 수 없습니다. 그룹 %s이(가) 존재하지 않습니다",
     "Sharing %s failed, because %s is not a member of the group %s" : "%s을(를) 공유할 수 없습니다. %s 님이 그룹 %s의 구성원이 아닙니다",
     "You need to provide a password to create a public link, only protected links are allowed" : "공개 링크를 만들려면 암호를 입력해야 합니다. 보호된 링크만 사용 가능합니다",
diff --git a/lib/l10n/ko.json b/lib/l10n/ko.json
index fa52b9a8f0..8fea07402c 100644
--- a/lib/l10n/ko.json
+++ b/lib/l10n/ko.json
@@ -47,6 +47,7 @@
     "Can't read file" : "파일을 읽을 수 없음",
     "App directory already exists" : "앱 디렉터리가 이미 존재합니다.",
     "Can't create app folder. Please fix permissions. %s" : "앱 폴더를 만들 수 없습니다. 권한을 수정하십시오. %s",
+    "Archive does not contain a directory named %s" : "압축 파일에 디렉터리 %s이(가) 없습니다",
     "No source specified when installing app" : "앱을 설치할 때 소스가 지정되지 않았습니다.",
     "No href specified when installing app from http" : "http에서 앱을 설치할 때 href가 지정되지 않았습니다.",
     "No path specified when installing app from local file" : "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다.",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "%s을(를) 공유할 수 없습니다. 사용자 %s이(가) 존재하지 않습니다",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s을(를) 공유할 수 없습니다. 사용자 %s 님은 %s 님이 회원인 어떠한 그룹에도 속해 있지 않습니다",
     "Sharing %s failed, because this item is already shared with %s" : "%s을(를) 공유할 수 없습니다. 이미 %s 님과 공유되어 있습니다",
+    "Sharing %s failed, because this item is already shared with user %s" : "%s을(를) 공유할 수 없습니다. 이 항목을 이미 %s 님과 공유하고 있습니다",
     "Sharing %s failed, because the group %s does not exist" : "%s을(를) 공유할 수 없습니다. 그룹 %s이(가) 존재하지 않습니다",
     "Sharing %s failed, because %s is not a member of the group %s" : "%s을(를) 공유할 수 없습니다. %s 님이 그룹 %s의 구성원이 아닙니다",
     "You need to provide a password to create a public link, only protected links are allowed" : "공개 링크를 만들려면 암호를 입력해야 합니다. 보호된 링크만 사용 가능합니다",
diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js
index d09fa5ca6e..af629c5ef3 100644
--- a/lib/l10n/nb_NO.js
+++ b/lib/l10n/nb_NO.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Kan ikke lese fil",
     "App directory already exists" : "App-mappe finnes allerede",
     "Can't create app folder. Please fix permissions. %s" : "Kan ikke opprette app-mappe.  Vennligst ordne opp i tillatelser. %s",
+    "Archive does not contain a directory named %s" : "Arkivet inneholder ikke en mappe med navn %s",
     "No source specified when installing app" : "Ingen kilde spesifisert ved installering av app",
     "No href specified when installing app from http" : "Ingen href spesifisert ved installering av app fra http",
     "No path specified when installing app from local file" : "Ingen sti spesifisert ved installering av app fra lokal fil",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Deling av %s feilet, fordi brukeren %s ikke finnes",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Deling av %s feilet, fordi brukeren %s ikke er medlem av noen grupper som %s er medlem av",
     "Sharing %s failed, because this item is already shared with %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med bruker %s",
     "Sharing %s failed, because the group %s does not exist" : "Deling av %s feilet, fordi gruppen %s ikke finnes",
     "Sharing %s failed, because %s is not a member of the group %s" : "Deling av %s feilet, fordi %s ikke er medlem av gruppen %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Du må oppgi et passord for å lage en offentlig lenke. Bare beskyttede lenker er tillatt",
diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json
index 665ae86696..29f9e7f136 100644
--- a/lib/l10n/nb_NO.json
+++ b/lib/l10n/nb_NO.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Kan ikke lese fil",
     "App directory already exists" : "App-mappe finnes allerede",
     "Can't create app folder. Please fix permissions. %s" : "Kan ikke opprette app-mappe.  Vennligst ordne opp i tillatelser. %s",
+    "Archive does not contain a directory named %s" : "Arkivet inneholder ikke en mappe med navn %s",
     "No source specified when installing app" : "Ingen kilde spesifisert ved installering av app",
     "No href specified when installing app from http" : "Ingen href spesifisert ved installering av app fra http",
     "No path specified when installing app from local file" : "Ingen sti spesifisert ved installering av app fra lokal fil",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Deling av %s feilet, fordi brukeren %s ikke finnes",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Deling av %s feilet, fordi brukeren %s ikke er medlem av noen grupper som %s er medlem av",
     "Sharing %s failed, because this item is already shared with %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Deling av %s feilet, fordi dette elementet allerede er delt med bruker %s",
     "Sharing %s failed, because the group %s does not exist" : "Deling av %s feilet, fordi gruppen %s ikke finnes",
     "Sharing %s failed, because %s is not a member of the group %s" : "Deling av %s feilet, fordi %s ikke er medlem av gruppen %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Du må oppgi et passord for å lage en offentlig lenke. Bare beskyttede lenker er tillatt",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index c7a68c9000..5abae786d3 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Kan bestand niet lezen",
     "App directory already exists" : "App directory bestaat al",
     "Can't create app folder. Please fix permissions. %s" : "Kan de app map niet aanmaken, Herstel de permissies. %s",
+    "Archive does not contain a directory named %s" : "Archief bevat geen directory genaamd %s",
     "No source specified when installing app" : "Geen bron opgegeven bij installatie van de app",
     "No href specified when installing app from http" : "Geen href opgegeven bij installeren van de app vanaf http",
     "No path specified when installing app from local file" : "Geen pad opgegeven bij installeren van de app vanaf een lokaal bestand",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Delen van %s is mislukt, omdat gebruiker %s niet bestaat",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Delen van %s is mislukt, omdat gebruiker %s geen lid is van een groep waar %s lid van is",
     "Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met gebruiker %s",
     "Sharing %s failed, because the group %s does not exist" : "Delen van %s is mislukt, omdat groep %s niet bestaat",
     "Sharing %s failed, because %s is not a member of the group %s" : "Delen van %s is mislukt, omdat %s geen lid is van groep %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "U moet een wachtwoord verstrekken om een openbare koppeling te maken, alleen beschermde links zijn toegestaan",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 560e20fbd4..4e4eaf8b52 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Kan bestand niet lezen",
     "App directory already exists" : "App directory bestaat al",
     "Can't create app folder. Please fix permissions. %s" : "Kan de app map niet aanmaken, Herstel de permissies. %s",
+    "Archive does not contain a directory named %s" : "Archief bevat geen directory genaamd %s",
     "No source specified when installing app" : "Geen bron opgegeven bij installatie van de app",
     "No href specified when installing app from http" : "Geen href opgegeven bij installeren van de app vanaf http",
     "No path specified when installing app from local file" : "Geen pad opgegeven bij installeren van de app vanaf een lokaal bestand",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Delen van %s is mislukt, omdat gebruiker %s niet bestaat",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Delen van %s is mislukt, omdat gebruiker %s geen lid is van een groep waar %s lid van is",
     "Sharing %s failed, because this item is already shared with %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Delen van %s is mislukt, omdat het object al wordt gedeeld met gebruiker %s",
     "Sharing %s failed, because the group %s does not exist" : "Delen van %s is mislukt, omdat groep %s niet bestaat",
     "Sharing %s failed, because %s is not a member of the group %s" : "Delen van %s is mislukt, omdat %s geen lid is van groep %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "U moet een wachtwoord verstrekken om een openbare koppeling te maken, alleen beschermde links zijn toegestaan",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index d348ac705f..402a7cbc51 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Não é possível ler arquivo",
     "App directory already exists" : "Diretório App  já existe",
     "Can't create app folder. Please fix permissions. %s" : "Não é possível criar pasta app. Corrija as permissões. %s",
+    "Archive does not contain a directory named %s" : "O arquivo não contém um diretório chamado %s",
     "No source specified when installing app" : "Nenhuma fonte foi especificada enquanto instalava o aplicativo",
     "No href specified when installing app from http" : "Nenhuma href foi especificada enquanto instalava o aplicativo de http",
     "No path specified when installing app from local file" : "Nenhum caminho foi especificado enquanto instalava o aplicativo do arquivo local",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "Compartilhamento %s falhou, porque o usuário %s não existe",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Compartilhamento %s falhou, porque o usuário %s não é membro de nenhum grupo que o usuário %s pertença",
     "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou, porque este ítem já está compartilhado com %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Compartilhamento de %s falhou, porque esse item já é compartilhada com o usuário %s",
     "Sharing %s failed, because the group %s does not exist" : "Compartilhamento %s falhou, porque o grupo %s não existe",
     "Sharing %s failed, because %s is not a member of the group %s" : "Compartilhamento %s falhou, porque  %s não é membro do grupo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Você precisa fornecer uma senha para criar um link público, apenas links protegidos são permitidos",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index 63192f8a5b..255272b8cb 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Não é possível ler arquivo",
     "App directory already exists" : "Diretório App  já existe",
     "Can't create app folder. Please fix permissions. %s" : "Não é possível criar pasta app. Corrija as permissões. %s",
+    "Archive does not contain a directory named %s" : "O arquivo não contém um diretório chamado %s",
     "No source specified when installing app" : "Nenhuma fonte foi especificada enquanto instalava o aplicativo",
     "No href specified when installing app from http" : "Nenhuma href foi especificada enquanto instalava o aplicativo de http",
     "No path specified when installing app from local file" : "Nenhum caminho foi especificado enquanto instalava o aplicativo do arquivo local",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "Compartilhamento %s falhou, porque o usuário %s não existe",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Compartilhamento %s falhou, porque o usuário %s não é membro de nenhum grupo que o usuário %s pertença",
     "Sharing %s failed, because this item is already shared with %s" : "Compartilhamento %s falhou, porque este ítem já está compartilhado com %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "Compartilhamento de %s falhou, porque esse item já é compartilhada com o usuário %s",
     "Sharing %s failed, because the group %s does not exist" : "Compartilhamento %s falhou, porque o grupo %s não existe",
     "Sharing %s failed, because %s is not a member of the group %s" : "Compartilhamento %s falhou, porque  %s não é membro do grupo %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "Você precisa fornecer uma senha para criar um link público, apenas links protegidos são permitidos",
diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js
index 75149346f0..0f0e116128 100644
--- a/lib/l10n/pt_PT.js
+++ b/lib/l10n/pt_PT.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Library %s with a version lower than %s is required - available version %s." : "É necessário que a biblioteca %s tenha uma versão inferior a %s - versão disponível: %s.",
     "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.",
     "Help" : "Ajuda",
     "Personal" : "Pessoal",
     "Users" : "Utilizadores",
@@ -34,12 +35,15 @@ OC.L10N.register(
     "_%n year ago_::_%n years ago_" : ["%n ano atrás","%n anos atrás"],
     "seconds ago" : "Minutos atrás",
     "web services under your control" : "serviços web sob o seu controlo",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "O módulo com a id: %s não existe. Por favor, ative-o nas definições da sua app ou contacte o seu administrador.",
     "Empty filename is not allowed" : "Não é permitido um ficheiro sem nome",
     "Dot files are not allowed" : "Ficheiros dot não são permitidos",
     "4-byte characters are not supported in file names" : "Carateres 4-byte não são suportados como nome de ficheiros",
     "File name is a reserved word" : "Nome de ficheiro é uma palavra reservada",
     "File name contains at least one invalid character" : "Nome de ficheiro contém pelo menos um caráter inválido",
     "File name is too long" : "Nome do ficheiro demasiado longo",
+    "File is currently busy, please try again later" : "O ficheiro está ocupado, por favor, tente mais tarde",
+    "Can't read file" : "Não é possível ler o ficheiro",
     "App directory already exists" : "A directoria da aplicação já existe",
     "Can't create app folder. Please fix permissions. %s" : "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
     "No source specified when installing app" : "Não foi especificada uma fonte de instalação desta aplicação",
@@ -73,6 +77,7 @@ OC.L10N.register(
     "Set an admin username." : "Definir um nome de utilizador de administrador",
     "Set an admin password." : "Definiar uma password de administrador",
     "Can't create or write into the data directory %s" : "Não é possível criar ou escrever a directoria data %s",
+    "Invalid Federated Cloud ID" : "Id. de Nuvem Federada Inválida",
     "%s shared »%s« with you" : "%s partilhado »%s« consigo",
     "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "A partilha de %s falhou porque a interface não permite as partilhas do tipo %i",
diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json
index 21a3b85723..9c00021b59 100644
--- a/lib/l10n/pt_PT.json
+++ b/lib/l10n/pt_PT.json
@@ -14,6 +14,7 @@
     "Library %s with a version lower than %s is required - available version %s." : "É necessário que a biblioteca %s tenha uma versão inferior a %s - versão disponível: %s.",
     "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.",
     "Help" : "Ajuda",
     "Personal" : "Pessoal",
     "Users" : "Utilizadores",
@@ -32,12 +33,15 @@
     "_%n year ago_::_%n years ago_" : ["%n ano atrás","%n anos atrás"],
     "seconds ago" : "Minutos atrás",
     "web services under your control" : "serviços web sob o seu controlo",
+    "Module with id: %s does not exist. Please enable it in your apps settings or contact your administrator." : "O módulo com a id: %s não existe. Por favor, ative-o nas definições da sua app ou contacte o seu administrador.",
     "Empty filename is not allowed" : "Não é permitido um ficheiro sem nome",
     "Dot files are not allowed" : "Ficheiros dot não são permitidos",
     "4-byte characters are not supported in file names" : "Carateres 4-byte não são suportados como nome de ficheiros",
     "File name is a reserved word" : "Nome de ficheiro é uma palavra reservada",
     "File name contains at least one invalid character" : "Nome de ficheiro contém pelo menos um caráter inválido",
     "File name is too long" : "Nome do ficheiro demasiado longo",
+    "File is currently busy, please try again later" : "O ficheiro está ocupado, por favor, tente mais tarde",
+    "Can't read file" : "Não é possível ler o ficheiro",
     "App directory already exists" : "A directoria da aplicação já existe",
     "Can't create app folder. Please fix permissions. %s" : "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
     "No source specified when installing app" : "Não foi especificada uma fonte de instalação desta aplicação",
@@ -71,6 +75,7 @@
     "Set an admin username." : "Definir um nome de utilizador de administrador",
     "Set an admin password." : "Definiar uma password de administrador",
     "Can't create or write into the data directory %s" : "Não é possível criar ou escrever a directoria data %s",
+    "Invalid Federated Cloud ID" : "Id. de Nuvem Federada Inválida",
     "%s shared »%s« with you" : "%s partilhado »%s« consigo",
     "%s via %s" : "%s via %s",
     "Sharing %s failed, because the backend does not allow shares from type %i" : "A partilha de %s falhou porque a interface não permite as partilhas do tipo %i",
diff --git a/lib/l10n/sk.js b/lib/l10n/sk.js
deleted file mode 100644
index 1eed1a5720..0000000000
--- a/lib/l10n/sk.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "Personal" : "Osobné",
-    "Settings" : "Nastavenia"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/lib/l10n/sk.json b/lib/l10n/sk.json
deleted file mode 100644
index bd84c129e9..0000000000
--- a/lib/l10n/sk.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "Personal" : "Osobné",
-    "Settings" : "Nastavenia"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/lib/l10n/th_TH.js b/lib/l10n/th_TH.js
index c2d327e22d..6092f348cb 100644
--- a/lib/l10n/th_TH.js
+++ b/lib/l10n/th_TH.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "ไม่สามารถอ่านไฟล์",
     "App directory already exists" : "มีไดเรกทอรีแอพฯอยู่แล้ว",
     "Can't create app folder. Please fix permissions. %s" : "ไม่สามารถสร้างโฟลเดอร์แอพพลิเคชัน โปรดแก้ไขการอนุญาต: %s",
+    "Archive does not contain a directory named %s" : "เอกสารไม่สามารถประกอบด้วยไดเรกทอรีชื่อ %s",
     "No source specified when installing app" : "ไม่ได้ระบุแหล่งที่มาเมื่อติดตั้งแอพพลิเคชัน",
     "No href specified when installing app from http" : "ไม่ได้ระบุ href เมื่อกำลังติดตั้งแอพพลิเคชันจาก http",
     "No path specified when installing app from local file" : "ไม่ได้ระบุเส้นทางไว้เมื่อกำลังติดตั้งแอพฯจากไฟล์ต้นทาง",
@@ -90,6 +91,7 @@ OC.L10N.register(
     "Sharing %s failed, because the user %s does not exist" : "การแชร์ %s ล้มเหลวเนื่องจากไม่ได้มีผู้ใช้ %s อยู่",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "การแชร์ %s ล้มเหลวเนื่องจากผู้ใช้ %s ไม่ได้เป็นสมาชิกของกลุ่มใดๆ %s เป็นสมาชิกของ",
     "Sharing %s failed, because this item is already shared with %s" : "การแชร์ %s ล้มเหลวเพราะรายการนี้ถูกแชร์กับ %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "%s ที่กำลังแชร์ล้มเหลว เพราะรายการนี้ได้ถูกแชร์กับผู้ใช้ %s",
     "Sharing %s failed, because the group %s does not exist" : "การแชร์ %s ล้มเหลวเพราะไม่มีกลุ่ม %s อยู่",
     "Sharing %s failed, because %s is not a member of the group %s" : "การแชร์ %s ล้มเหลวเพราะ %s ไม่ได้เป็นสมาชิกของกลุ่ม %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "คุณจำเป็นต้องระบุรหัสผ่านเพื่อสร้างลิงค์สาธารณะ, ลิงค์ที่มีการป้องกันเท่านั้นที่ได้รับอนุญาต",
diff --git a/lib/l10n/th_TH.json b/lib/l10n/th_TH.json
index d6ffcb5f73..a872236a70 100644
--- a/lib/l10n/th_TH.json
+++ b/lib/l10n/th_TH.json
@@ -47,6 +47,7 @@
     "Can't read file" : "ไม่สามารถอ่านไฟล์",
     "App directory already exists" : "มีไดเรกทอรีแอพฯอยู่แล้ว",
     "Can't create app folder. Please fix permissions. %s" : "ไม่สามารถสร้างโฟลเดอร์แอพพลิเคชัน โปรดแก้ไขการอนุญาต: %s",
+    "Archive does not contain a directory named %s" : "เอกสารไม่สามารถประกอบด้วยไดเรกทอรีชื่อ %s",
     "No source specified when installing app" : "ไม่ได้ระบุแหล่งที่มาเมื่อติดตั้งแอพพลิเคชัน",
     "No href specified when installing app from http" : "ไม่ได้ระบุ href เมื่อกำลังติดตั้งแอพพลิเคชันจาก http",
     "No path specified when installing app from local file" : "ไม่ได้ระบุเส้นทางไว้เมื่อกำลังติดตั้งแอพฯจากไฟล์ต้นทาง",
@@ -88,6 +89,7 @@
     "Sharing %s failed, because the user %s does not exist" : "การแชร์ %s ล้มเหลวเนื่องจากไม่ได้มีผู้ใช้ %s อยู่",
     "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "การแชร์ %s ล้มเหลวเนื่องจากผู้ใช้ %s ไม่ได้เป็นสมาชิกของกลุ่มใดๆ %s เป็นสมาชิกของ",
     "Sharing %s failed, because this item is already shared with %s" : "การแชร์ %s ล้มเหลวเพราะรายการนี้ถูกแชร์กับ %s",
+    "Sharing %s failed, because this item is already shared with user %s" : "%s ที่กำลังแชร์ล้มเหลว เพราะรายการนี้ได้ถูกแชร์กับผู้ใช้ %s",
     "Sharing %s failed, because the group %s does not exist" : "การแชร์ %s ล้มเหลวเพราะไม่มีกลุ่ม %s อยู่",
     "Sharing %s failed, because %s is not a member of the group %s" : "การแชร์ %s ล้มเหลวเพราะ %s ไม่ได้เป็นสมาชิกของกลุ่ม %s",
     "You need to provide a password to create a public link, only protected links are allowed" : "คุณจำเป็นต้องระบุรหัสผ่านเพื่อสร้างลิงค์สาธารณะ, ลิงค์ที่มีการป้องกันเท่านั้นที่ได้รับอนุญาต",
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index d26505b4a1..828b5a8556 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -49,6 +49,7 @@ OC.L10N.register(
     "Can't read file" : "Dosya okunamıyor",
     "App directory already exists" : "Uygulama dizini zaten mevcut",
     "Can't create app folder. Please fix permissions. %s" : "Uygulama dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s",
+    "Archive does not contain a directory named %s" : "Arşivde %s adında bir dizin bulunmuyor",
     "No source specified when installing app" : "Uygulama kurulurken bir kaynak belirtilmedi",
     "No href specified when installing app from http" : "Uygulama http'den kurulurken href belirtilmedi",
     "No path specified when installing app from local file" : "Uygulama yerel dosyadan kurulurken dosya yolu belirtilmedi",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index 4170115682..13b63ee6f7 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -47,6 +47,7 @@
     "Can't read file" : "Dosya okunamıyor",
     "App directory already exists" : "Uygulama dizini zaten mevcut",
     "Can't create app folder. Please fix permissions. %s" : "Uygulama dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s",
+    "Archive does not contain a directory named %s" : "Arşivde %s adında bir dizin bulunmuyor",
     "No source specified when installing app" : "Uygulama kurulurken bir kaynak belirtilmedi",
     "No href specified when installing app from http" : "Uygulama http'den kurulurken href belirtilmedi",
     "No path specified when installing app from local file" : "Uygulama yerel dosyadan kurulurken dosya yolu belirtilmedi",
diff --git a/lib/l10n/ur.js b/lib/l10n/ur.js
deleted file mode 100644
index da0dcc6bdd..0000000000
--- a/lib/l10n/ur.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "_%n minute ago_::_%n minutes ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n day go_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""]
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ur.json b/lib/l10n/ur.json
deleted file mode 100644
index 4286553dd0..0000000000
--- a/lib/l10n/ur.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%n minute ago_::_%n minutes ago_" : ["",""],
-    "_%n hour ago_::_%n hours ago_" : ["",""],
-    "_%n day go_::_%n days ago_" : ["",""],
-    "_%n month ago_::_%n months ago_" : ["",""]
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js
index 9ec40a93aa..4e4ad0478c 100644
--- a/lib/l10n/zh_CN.js
+++ b/lib/l10n/zh_CN.js
@@ -20,6 +20,7 @@ OC.L10N.register(
     "_%n minute ago_::_%n minutes ago_" : ["%n 分钟前"],
     "seconds ago" : "秒前",
     "web services under your control" : "您控制的网络服务",
+    "File name contains at least one invalid character" : "文件名中存在至少一个非法字符",
     "App directory already exists" : "应用程序目录已存在",
     "Can't create app folder. Please fix permissions. %s" : "无法创建应用程序文件夹。请修正权限。%s",
     "No source specified when installing app" : "安装 App 时未指定来源",
diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json
index 1d9fbf2ae3..097f7d4d54 100644
--- a/lib/l10n/zh_CN.json
+++ b/lib/l10n/zh_CN.json
@@ -18,6 +18,7 @@
     "_%n minute ago_::_%n minutes ago_" : ["%n 分钟前"],
     "seconds ago" : "秒前",
     "web services under your control" : "您控制的网络服务",
+    "File name contains at least one invalid character" : "文件名中存在至少一个非法字符",
     "App directory already exists" : "应用程序目录已存在",
     "Can't create app folder. Please fix permissions. %s" : "无法创建应用程序文件夹。请修正权限。%s",
     "No source specified when installing app" : "安装 App 时未指定来源",
diff --git a/lib/l10n/zh_TW.js b/lib/l10n/zh_TW.js
index d9a7dd965d..3e761604d7 100644
--- a/lib/l10n/zh_TW.js
+++ b/lib/l10n/zh_TW.js
@@ -25,6 +25,7 @@ OC.L10N.register(
     "_%n minute ago_::_%n minutes ago_" : ["%n 分鐘前"],
     "seconds ago" : "幾秒前",
     "web services under your control" : "由您控制的網路服務",
+    "File name contains at least one invalid character" : "檔案名稱含有不合法的字元",
     "App directory already exists" : "應用程式目錄已經存在",
     "Can't create app folder. Please fix permissions. %s" : "無法建立應用程式目錄，請檢查權限：%s",
     "No source specified when installing app" : "沒有指定應用程式安裝來源",
diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json
index 3544bde0b1..2e0de90373 100644
--- a/lib/l10n/zh_TW.json
+++ b/lib/l10n/zh_TW.json
@@ -23,6 +23,7 @@
     "_%n minute ago_::_%n minutes ago_" : ["%n 分鐘前"],
     "seconds ago" : "幾秒前",
     "web services under your control" : "由您控制的網路服務",
+    "File name contains at least one invalid character" : "檔案名稱含有不合法的字元",
     "App directory already exists" : "應用程式目錄已經存在",
     "Can't create app folder. Please fix permissions. %s" : "無法建立應用程式目錄，請檢查權限：%s",
     "No source specified when installing app" : "沒有指定應用程式安裝來源",
diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php
index a973db7206..fc25017353 100644
--- a/lib/private/activitymanager.php
+++ b/lib/private/activitymanager.php
@@ -244,15 +244,27 @@ class ActivityManager implements IManager {
 	 * @return array
 	 */
 	public function getNotificationTypes($languageCode) {
+		$filesNotificationTypes = [];
+		$sharingNotificationTypes = [];
+
 		$notificationTypes = array();
 		foreach ($this->getExtensions() as $c) {
 			$result = $c->getNotificationTypes($languageCode);
 			if (is_array($result)) {
+				if (class_exists('\OCA\Files\Activity') && $c instanceof \OCA\Files\Activity) {
+					$filesNotificationTypes = $result;
+					continue;
+				}
+				if (class_exists('\OCA\Files_Sharing\Activity') && $c instanceof \OCA\Files_Sharing\Activity) {
+					$sharingNotificationTypes = $result;
+					continue;
+				}
+
 				$notificationTypes = array_merge($notificationTypes, $result);
 			}
 		}
 
-		return $notificationTypes;
+		return array_merge($filesNotificationTypes, $sharingNotificationTypes, $notificationTypes);
 	}
 
 	/**
diff --git a/lib/private/app.php b/lib/private/app.php
index f1a1d27ae6..e42fba525e 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -101,11 +101,19 @@ class OC_App {
 		}
 		// Load the enabled apps here
 		$apps = self::getEnabledApps();
+
+		// Add each apps' folder as allowed class path
+		foreach($apps as $app) {
+			$path = self::getAppPath($app);
+			if($path !== false) {
+				\OC::$loader->addValidRoot($path);
+			}
+		}
+
 		// prevent app.php from printing output
 		ob_start();
 		foreach ($apps as $app) {
 			if ((is_null($types) or self::isType($app, $types)) && !in_array($app, self::$loadedApps)) {
-				self::$loadedApps[] = $app;
 				self::loadApp($app);
 			}
 		}
@@ -122,6 +130,7 @@ class OC_App {
 	 * @throws \OC\NeedsUpdateException
 	 */
 	public static function loadApp($app, $checkUpgrade = true) {
+		self::$loadedApps[] = $app;
 		if (is_file(self::getAppPath($app) . '/appinfo/app.php')) {
 			\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
 			if ($checkUpgrade and self::shouldUpgrade($app)) {
diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index b88df10ddd..cf2a057f22 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -28,23 +28,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-/*
- *
- * The following SQL statement is just a help for developers and will not be
- * executed!
- *
- * CREATE TABLE  `appconfig` (
- * `appid` VARCHAR( 255 ) NOT NULL ,
- * `configkey` VARCHAR( 255 ) NOT NULL ,
- * `configvalue` VARCHAR( 255 ) NOT NULL
- * )
- *
- */
 
 namespace OC;
 
-use OC\DB\Connection;
 use OCP\IAppConfig;
+use OCP\IDBConnection;
 
 /**
  * This class provides an easy way for apps to store config values in the
@@ -52,54 +40,32 @@ use OCP\IAppConfig;
  */
 class AppConfig implements IAppConfig {
 	/**
-	 * @var \OC\DB\Connection $conn
+	 * @var \OCP\IDBConnection $conn
 	 */
 	protected $conn;
 
 	private $cache = array();
 
-	private $appsLoaded = array();
-
 	/**
-	 * @var string[]
+	 * @param IDBConnection $conn
 	 */
-	private $apps = null;
-
-	/**
-	 * @param Connection $conn
-	 */
-	public function __construct(Connection $conn) {
+	public function __construct(IDBConnection $conn) {
 		$this->conn = $conn;
+		$this->configLoaded = false;
 	}
 
 	/**
 	 * @param string $app
-	 * @return string[]
-	 */
-	private function getAppCache($app) {
-		if (!isset($this->cache[$app])) {
-			$this->cache[$app] = array();
-		}
-		return $this->cache[$app];
-	}
-
-	/**
-	 * @param string $app
-	 * @return \string[]
+	 * @return array
 	 */
 	private function getAppValues($app) {
-		$appCache = $this->getAppCache($app);
-		if (array_search($app, $this->appsLoaded) === false) {
-			$query = 'SELECT `configvalue`, `configkey` FROM `*PREFIX*appconfig`'
-				. ' WHERE `appid` = ?';
-			$result = $this->conn->executeQuery($query, array($app));
-			while ($row = $result->fetch()) {
-				$appCache[$row['configkey']] = $row['configvalue'];
-			}
-			$this->appsLoaded[] = $app;
+		$this->loadConfigValues();
+
+		if (isset($this->cache[$app])) {
+			return $this->cache[$app];
 		}
-		$this->cache[$app] = $appCache;
-		return $appCache;
+
+		return [];
 	}
 
 	/**
@@ -111,18 +77,9 @@ class AppConfig implements IAppConfig {
 	 * entry in the appconfig table.
 	 */
 	public function getApps() {
-		if (is_array($this->apps)) {
-			return $this->apps;
-		}
-		$query = 'SELECT DISTINCT `appid` FROM `*PREFIX*appconfig` ORDER BY `appid`';
-		$result = $this->conn->executeQuery($query);
+		$this->loadConfigValues();
 
-		$apps = array();
-		while ($appid = $result->fetchColumn()) {
-			$apps[] = $appid;
-		}
-		$this->apps = $apps;
-		return $apps;
+		return $this->getSortedKeys($this->cache);
 	}
 
 	/**
@@ -135,8 +92,17 @@ class AppConfig implements IAppConfig {
 	 * not returned.
 	 */
 	public function getKeys($app) {
-		$values = $this->getAppValues($app);
-		$keys = array_keys($values);
+		$this->loadConfigValues();
+
+		if (isset($this->cache[$app])) {
+			return $this->getSortedKeys($this->cache[$app]);
+		}
+
+		return [];
+	}
+
+	public function getSortedKeys($data) {
+		$keys = array_keys($data);
 		sort($keys);
 		return $keys;
 	}
@@ -153,12 +119,13 @@ class AppConfig implements IAppConfig {
 	 * not exist the default value will be returned
 	 */
 	public function getValue($app, $key, $default = null) {
-		$values = $this->getAppValues($app);
-		if (isset($values[$key])) {
-			return $values[$key];
-		} else {
-			return $default;
+		$this->loadConfigValues();
+
+		if ($this->hasKey($app, $key)) {
+			return $this->cache[$app][$key];
 		}
+
+		return $default;
 	}
 
 	/**
@@ -169,8 +136,9 @@ class AppConfig implements IAppConfig {
 	 * @return bool
 	 */
 	public function hasKey($app, $key) {
-		$values = $this->getAppValues($app);
-		return array_key_exists($key, $values);
+		$this->loadConfigValues();
+
+		return isset($this->cache[$app][$key]);
 	}
 
 	/**
@@ -179,11 +147,9 @@ class AppConfig implements IAppConfig {
 	 * @param string $app app
 	 * @param string $key key
 	 * @param string $value value
-	 * @return void
+	 * @return bool True if the value was inserted or updated, false if the value was the same
 	 */
 	public function setValue($app, $key, $value) {
-		$inserted = false;
-		// Does the key exist? no: insert, yes: update.
 		if (!$this->hasKey($app, $key)) {
 			$inserted = (bool) $this->conn->insertIfNotExist('*PREFIX*appconfig', [
 				'appid' => $app,
@@ -193,29 +159,42 @@ class AppConfig implements IAppConfig {
 				'appid',
 				'configkey',
 			]);
+
+			if ($inserted) {
+				if (!isset($this->cache[$app])) {
+					$this->cache[$app] = [];
+				}
+
+				$this->cache[$app][$key] = $value;
+				return true;
+			}
 		}
 
-		if (!$inserted) {
-			$oldValue = $this->getValue($app, $key);
-			if($oldValue === strval($value)) {
-				return;
-			}
-			$data = array(
-				'configvalue' => $value,
-			);
-			$where = array(
-				'appid' => $app,
-				'configkey' => $key,
-			);
-			$this->conn->update('*PREFIX*appconfig', $data, $where);
-		}
-		if (!isset($this->cache[$app])) {
-			$this->cache[$app] = array();
-		}
-		if (is_array($this->apps) and array_search($app, $this->apps) === false) {
-			$this->apps[$app] = $app;
+		$sql = $this->conn->getQueryBuilder();
+		$sql->update('appconfig')
+			->set('configvalue', $sql->createParameter('configvalue'))
+			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+			->setParameter('configvalue', $value)
+			->setParameter('app', $app)
+			->setParameter('configkey', $key);
+
+		/*
+		 * Only limit to the existing value for non-Oracle DBs:
+		 * http://docs.oracle.com/cd/E11882_01/server.112/e26088/conditions002.htm#i1033286
+		 * > Large objects (LOBs) are not supported in comparison conditions.
+		 */
+		if (!($this->conn instanceof \OC\DB\OracleConnection)) {
+			// Only update the value when it is not the same
+			$sql->andWhere($sql->expr()->neq('configvalue', $sql->createParameter('configvalue')))
+				->setParameter('configvalue', $value);
 		}
+
+		$changedRow = (bool) $sql->execute();
+
 		$this->cache[$app][$key] = $value;
+
+		return $changedRow;
 	}
 
 	/**
@@ -226,14 +205,17 @@ class AppConfig implements IAppConfig {
 	 * @return boolean|null
 	 */
 	public function deleteKey($app, $key) {
-		$where = array(
-			'appid' => $app,
-			'configkey' => $key,
-		);
-		$this->conn->delete('*PREFIX*appconfig', $where);
-		if (isset($this->cache[$app]) and isset($this->cache[$app][$key])) {
-			unset($this->cache[$app][$key]);
-		}
+		$this->loadConfigValues();
+
+		$sql = $this->conn->getQueryBuilder();
+		$sql->delete('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+			->setParameter('app', $app)
+			->setParameter('configkey', $key);
+		$sql->execute();
+
+		unset($this->cache[$app][$key]);
 	}
 
 	/**
@@ -245,38 +227,65 @@ class AppConfig implements IAppConfig {
 	 * Removes all keys in appconfig belonging to the app.
 	 */
 	public function deleteApp($app) {
-		$where = array(
-			'appid' => $app,
-		);
-		$this->conn->delete('*PREFIX*appconfig', $where);
+		$this->loadConfigValues();
+
+		$sql = $this->conn->getQueryBuilder();
+		$sql->delete('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('app')))
+			->setParameter('app', $app);
+		$sql->execute();
+
 		unset($this->cache[$app]);
-		unset($this->apps[$app]);
 	}
 
 	/**
-	 * get multiply values, either the app or key can be used as wildcard by setting it to false
+	 * get multiple values, either the app or key can be used as wildcard by setting it to false
 	 *
 	 * @param string|false $app
 	 * @param string|false $key
 	 * @return array|false
 	 */
 	public function getValues($app, $key) {
-		if (($app !== false) == ($key !== false)) {
+		if (($app !== false) === ($key !== false)) {
 			return false;
 		}
 
-		if ($app !== false) {
+		if ($key === false) {
 			return $this->getAppValues($app);
 		} else {
-			$query = 'SELECT `configvalue`, `appid` FROM `*PREFIX*appconfig` WHERE `configkey` = ?';
-			$result = $this->conn->executeQuery($query, array($key));
-
-			$values = array();
-			while ($row = $result->fetch((\PDO::FETCH_ASSOC))) {
-				$values[$row['appid']] = $row['configvalue'];
+			$configs = [];
+			foreach ($this->getApps() as $appId) {
+				if ($this->hasKey($appId, $key)) {
+					$configs[$appId] = $this->getValue($appId, $key);
+				}
 			}
 
-			return $values;
+			return $configs;
 		}
 	}
+
+	/**
+	 * Load all the app config values
+	 */
+	protected function loadConfigValues() {
+		if ($this->configLoaded) return;
+
+		$this->cache = [];
+
+		$sql = $this->conn->getQueryBuilder();
+		$sql->select('*')
+			->from('appconfig');
+		$result = $sql->execute();
+
+		while ($row = $result->fetch()) {
+			if (!isset($this->cache[$row['appid']])) {
+				$this->cache[$row['appid']] = [];
+			}
+
+			$this->cache[$row['appid']][$row['configkey']] = $row['configvalue'];
+		}
+		$result->closeCursor();
+
+		$this->configLoaded = true;
+	}
 }
diff --git a/lib/private/appframework/db/db.php b/lib/private/appframework/db/db.php
index cde8583168..8e3fa6e419 100644
--- a/lib/private/appframework/db/db.php
+++ b/lib/private/appframework/db/db.php
@@ -153,6 +153,15 @@ class Db implements IDb {
 		$this->connection->beginTransaction();
 	}
 
+	/**
+	 * Check if a transaction is active
+	 *
+	 * @return bool
+	 */
+	public function inTransaction() {
+		return $this->connection->inTransaction();
+	}
+
 	/**
 	 * Commit the database changes done during a transaction that is in progress
 	 */
diff --git a/lib/private/appframework/http.php b/lib/private/appframework/http.php
index e7b0d1e2ca..dee9818f4b 100644
--- a/lib/private/appframework/http.php
+++ b/lib/private/appframework/http.php
@@ -121,7 +121,7 @@ class Http extends BaseHttp {
 
 		// if etag or lastmodified have not changed, return a not modified
 		if ((isset($this->server['HTTP_IF_NONE_MATCH'])
-			&& trim($this->server['HTTP_IF_NONE_MATCH']) === $ETag) 
+			&& trim(trim($this->server['HTTP_IF_NONE_MATCH']), '"') === (string)$ETag)
 
 			||
 
diff --git a/lib/private/appframework/http/request.php b/lib/private/appframework/http/request.php
index aaad286e84..b430673f9a 100644
--- a/lib/private/appframework/http/request.php
+++ b/lib/private/appframework/http/request.php
@@ -9,6 +9,7 @@
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author Vincent Petry <pvince81@owncloud.com>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
@@ -32,6 +33,7 @@ namespace OC\AppFramework\Http;
 use OC\Security\TrustedDomainHelper;
 use OCP\IConfig;
 use OCP\IRequest;
+use OCP\Security\ICrypto;
 use OCP\Security\ISecureRandom;
 
 /**
@@ -67,6 +69,11 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 	protected $config;
 	/** @var string */
 	protected $requestId = '';
+	/** @var ICrypto */
+	protected $crypto;
+
+	/** @var bool */
+	protected $contentDecoded = false;
 
 	/**
 	 * @param array $vars An associative array with the following optional values:
@@ -80,17 +87,20 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 	 *        - string 'method' the request method (GET, POST etc)
 	 *        - string|false 'requesttoken' the requesttoken or false when not available
 	 * @param ISecureRandom $secureRandom
+	 * @param ICrypto $crypto
 	 * @param IConfig $config
 	 * @param string $stream
 	 * @see http://www.php.net/manual/en/reserved.variables.php
 	 */
 	public function __construct(array $vars=array(),
 								ISecureRandom $secureRandom = null,
+								ICrypto $crypto,
 								IConfig $config,
 								$stream='php://input') {
 		$this->inputStream = $stream;
 		$this->items['params'] = array();
 		$this->secureRandom = $secureRandom;
+		$this->crypto = $crypto;
 		$this->config = $config;
 
 		if(!array_key_exists('method', $vars)) {
@@ -103,27 +113,6 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 				: array();
 		}
 
-		// 'application/json' must be decoded manually.
-		if (strpos($this->getHeader('Content-Type'), 'application/json') !== false) {
-			$params = json_decode(file_get_contents($this->inputStream), true);
-			if(count($params) > 0) {
-				$this->items['params'] = $params;
-				if($vars['method'] === 'POST') {
-					$this->items['post'] = $params;
-				}
-			}
-		// Handle application/x-www-form-urlencoded for methods other than GET
-		// or post correctly
-		} elseif($vars['method'] !== 'GET'
-				&& $vars['method'] !== 'POST'
-				&& strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') !== false) {
-
-			parse_str(file_get_contents($this->inputStream), $params);
-			if(is_array($params)) {
-				$this->items['params'] = $params;
-			}
-		}
-
 		$this->items['parameters'] = array_merge(
 			$this->items['get'],
 			$this->items['post'],
@@ -231,24 +220,19 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 				if($this->method !== strtoupper($name)) {
 					throw new \LogicException(sprintf('%s cannot be accessed in a %s request.', $name, $this->method));
 				}
+				return $this->getContent();
 			case 'files':
 			case 'server':
 			case 'env':
 			case 'cookies':
+			case 'urlParams':
+			case 'method':
+				return isset($this->items[$name])
+					? $this->items[$name]
+					: null;
 			case 'parameters':
 			case 'params':
-			case 'urlParams':
-				if(in_array($name, array('put', 'patch'))) {
-					return $this->getContent();
-				} else {
-					return isset($this->items[$name])
-						? $this->items[$name]
-						: null;
-				}
-				break;
-			case 'method':
-				return $this->items['method'];
-				break;
+				return $this->getContent();
 			default;
 				return isset($this[$name])
 					? $this[$name]
@@ -390,10 +374,47 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 			$this->content = false;
 			return fopen($this->inputStream, 'rb');
 		} else {
-			return $this->parameters;
+			$this->decodeContent();
+			return $this->items['parameters'];
 		}
 	}
 
+	/**
+	 * Attempt to decode the content and populate parameters
+	 */
+	protected function decodeContent() {
+		if ($this->contentDecoded) {
+			return;
+		}
+		$params = [];
+
+		// 'application/json' must be decoded manually.
+		if (strpos($this->getHeader('Content-Type'), 'application/json') !== false) {
+			$params = json_decode(file_get_contents($this->inputStream), true);
+			if(count($params) > 0) {
+				$this->items['params'] = $params;
+				if($this->method === 'POST') {
+					$this->items['post'] = $params;
+				}
+			}
+
+		// Handle application/x-www-form-urlencoded for methods other than GET
+		// or post correctly
+		} elseif($this->method !== 'GET'
+				&& $this->method !== 'POST'
+				&& strpos($this->getHeader('Content-Type'), 'application/x-www-form-urlencoded') !== false) {
+
+			parse_str(file_get_contents($this->inputStream), $params);
+			if(is_array($params)) {
+				$this->items['params'] = $params;
+			}
+		}
+
+		$this->items['parameters'] = array_merge($this->items['parameters'], $params);
+		$this->contentDecoded = true;
+	}
+
+
 	/**
 	 * Checks if the CSRF check was correct
 	 * @return bool true if CSRF check passed
@@ -415,8 +436,22 @@ class Request implements \ArrayAccess, \Countable, IRequest {
 			return false;
 		}
 
+		// Decrypt token to prevent BREACH like attacks
+		$token = explode(':', $token);
+		if (count($token) !== 2) {
+			return false;
+		}
+
+		$encryptedToken = $token[0];
+		$secret = $token[1];
+		try {
+			$decryptedToken = $this->crypto->decrypt($encryptedToken, $secret);
+		} catch (\Exception $e) {
+			return false;
+		}
+
 		// Check if the token is valid
-		if(\OCP\Security\StringUtils::equals($token, $this->items['requesttoken'])) {
+		if(\OCP\Security\StringUtils::equals($decryptedToken, $this->items['requesttoken'])) {
 			return true;
 		} else {
 			return false;
diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index 83a08acde2..5d7ea48752 100644
--- a/lib/private/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -77,7 +77,7 @@ class SimpleContainer extends Container implements IContainer {
 	 * @return stdClass
 	 * @throws QueryException if the class could not be found or instantiated
 	 */
-	private function resolve($name) {
+	public function resolve($name) {
 		$baseMsg = 'Could not resolve ' . $name . '!';
 		try {
 			$class = new ReflectionClass($name);
diff --git a/lib/private/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
index f297bccbc7..deadadfb77 100644
--- a/lib/private/backgroundjob/joblist.php
+++ b/lib/private/backgroundjob/joblist.php
@@ -26,6 +26,7 @@
 namespace OC\BackgroundJob;
 
 use OCP\BackgroundJob\IJobList;
+use OCP\AutoloadNotAllowedException;
 
 class JobList implements IJobList {
 	/**
@@ -185,15 +186,20 @@ class JobList implements IJobList {
 		/**
 		 * @var Job $job
 		 */
-		if (!class_exists($class)) {
-			// job from disabled app or old version of an app, no need to do anything
-			return null;
+		try {
+			if (!class_exists($class)) {
+				// job from disabled app or old version of an app, no need to do anything
+				return null;
+			}
+			$job = new $class();
+			$job->setId($row['id']);
+			$job->setLastRun($row['last_run']);
+			$job->setArgument(json_decode($row['argument'], true));
+			return $job;
+		} catch (AutoloadNotAllowedException $e) {
+			// job is from a disabled app, ignore
 		}
-		$job = new $class();
-		$job->setId($row['id']);
-		$job->setLastRun($row['last_run']);
-		$job->setArgument(json_decode($row['argument'], true));
-		return $job;
+		return null;
 	}
 
 	/**
diff --git a/lib/private/config.php b/lib/private/config.php
index 20ff02c1ab..3ad800a00b 100644
--- a/lib/private/config.php
+++ b/lib/private/config.php
@@ -47,8 +47,6 @@ class Config {
 	protected $configFilePath;
 	/** @var string */
 	protected $configFileName;
-	/** @var bool */
-	protected $debugMode;
 
 	/**
 	 * @param string $configDir Path to the config dir, needs to end with '/'
@@ -59,7 +57,6 @@ class Config {
 		$this->configFilePath = $this->configDir.$fileName;
 		$this->configFileName = $fileName;
 		$this->readData();
-		$this->debugMode = (defined('DEBUG') && DEBUG);
 	}
 
 	/**
@@ -225,9 +222,6 @@ class Config {
 	private function writeData() {
 		// Create a php file ...
 		$content = "<?php\n";
-		if ($this->debugMode) {
-			$content .= "define('DEBUG',true);\n";
-		}
 		$content .= '$CONFIG = ';
 		$content .= var_export($this->cache, true);
 		$content .= ";\n";
diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index 551176e4bd..0261ab1804 100644
--- a/lib/private/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
@@ -30,6 +30,7 @@ namespace OC\Connector\Sabre;
 
 use OC\Connector\Sabre\Exception\InvalidPath;
 use OC\Connector\Sabre\Exception\FileLocked;
+use OCP\Lock\ILockingProvider;
 use OCP\Lock\LockedException;
 use Sabre\DAV\Exception\Locked;
 
@@ -110,6 +111,7 @@ class Directory extends \OC\Connector\Sabre\Node
 			// using a dummy FileInfo is acceptable here since it will be refreshed after the put is complete
 			$info = new \OC\Files\FileInfo($path, null, null, array(), null);
 			$node = new \OC\Connector\Sabre\File($this->fileView, $info);
+			$node->acquireLock(ILockingProvider::LOCK_SHARED);
 			return $node->put($data);
 		} catch (\OCP\Files\StorageNotAvailableException $e) {
 			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
diff --git a/lib/private/connector/sabre/dummygetresponseplugin.php b/lib/private/connector/sabre/dummygetresponseplugin.php
index 6057236b63..6f5a009d08 100644
--- a/lib/private/connector/sabre/dummygetresponseplugin.php
+++ b/lib/private/connector/sabre/dummygetresponseplugin.php
@@ -61,6 +61,7 @@ class DummyGetResponsePlugin extends \Sabre\DAV\ServerPlugin {
 		fwrite($stream, $string);
 		rewind($stream);
 
+		$response->setStatus(200);
 		$response->setBody($stream);
 
 		return false;
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index b7d0c547f2..17659c96b0 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -35,6 +35,7 @@ namespace OC\Connector\Sabre;
 use OC\Connector\Sabre\Exception\EntityTooLarge;
 use OC\Connector\Sabre\Exception\FileLocked;
 use OC\Connector\Sabre\Exception\UnsupportedMediaType;
+use OC\Files\Filesystem;
 use OCP\Encryption\Exceptions\GenericEncryptionException;
 use OCP\Files\EntityTooLargeException;
 use OCP\Files\InvalidContentException;
@@ -114,12 +115,6 @@ class File extends Node implements IFile {
 			$partFilePath = $this->path;
 		}
 
-		try {
-			$this->fileView->lockFile($this->path, ILockingProvider::LOCK_SHARED);
-		} catch (LockedException $e) {
-			throw new FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
-
 		// the part file and target file might be on a different storage in case of a single file storage (e.g. single file share)
 		/** @var \OC\Files\Storage\Storage $partStorage */
 		list($partStorage, $internalPartPath) = $this->fileView->resolvePath($partFilePath);
@@ -132,7 +127,7 @@ class File extends Node implements IFile {
 				// because we have no clue about the cause we can only throw back a 500/Internal Server Error
 				throw new Exception('Could not write file contents');
 			}
-			list($count, ) = \OC_Helper::streamCopy($data, $target);
+			list($count,) = \OC_Helper::streamCopy($data, $target);
 			fclose($target);
 
 			// if content length is sent by client:
@@ -154,29 +149,14 @@ class File extends Node implements IFile {
 
 		try {
 			$view = \OC\Files\Filesystem::getView();
-			$run = true;
 			if ($view) {
-				$hookPath = $view->getRelativePath($this->fileView->getAbsolutePath($this->path));
-
-				if (!$exists) {
-					\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_create, array(
-						\OC\Files\Filesystem::signal_param_path => $hookPath,
-						\OC\Files\Filesystem::signal_param_run => &$run,
-					));
-				} else {
-					\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_update, array(
-						\OC\Files\Filesystem::signal_param_path => $hookPath,
-						\OC\Files\Filesystem::signal_param_run => &$run,
-					));
-				}
-				\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_write, array(
-					\OC\Files\Filesystem::signal_param_path => $hookPath,
-					\OC\Files\Filesystem::signal_param_run => &$run,
-				));
+				$run = $this->emitPreHooks($exists);
+			} else {
+				$run = true;
 			}
 
 			try {
-				$this->fileView->changeLock($this->path, ILockingProvider::LOCK_EXCLUSIVE);
+				$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
 			} catch (LockedException $e) {
 				if ($needsPartFile) {
 					$partStorage->unlink($internalPartPath);
@@ -202,7 +182,7 @@ class File extends Node implements IFile {
 			}
 
 			try {
-				$this->fileView->changeLock($this->path, ILockingProvider::LOCK_SHARED);
+				$this->changeLock(ILockingProvider::LOCK_SHARED);
 			} catch (LockedException $e) {
 				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
 			}
@@ -211,18 +191,7 @@ class File extends Node implements IFile {
 			$this->fileView->getUpdater()->update($this->path);
 
 			if ($view) {
-				if (!$exists) {
-					\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_create, array(
-						\OC\Files\Filesystem::signal_param_path => $hookPath
-					));
-				} else {
-					\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_update, array(
-						\OC\Files\Filesystem::signal_param_path => $hookPath
-					));
-				}
-				\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_write, array(
-					\OC\Files\Filesystem::signal_param_path => $hookPath
-				));
+				$this->emitPostHooks($exists);
 			}
 
 			// allow sync clients to send the mtime along in a header
@@ -233,7 +202,6 @@ class File extends Node implements IFile {
 				}
 			}
 			$this->refreshInfo();
-			$this->fileView->unlockFile($this->path, ILockingProvider::LOCK_SHARED);
 		} catch (StorageNotAvailableException $e) {
 			throw new ServiceUnavailable("Failed to check file size: " . $e->getMessage());
 		}
@@ -241,6 +209,50 @@ class File extends Node implements IFile {
 		return '"' . $this->info->getEtag() . '"';
 	}
 
+	private function emitPreHooks($exists, $path = null) {
+		if (is_null($path)) {
+			$path = $this->path;
+		}
+		$hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($path));
+		$run = true;
+
+		if (!$exists) {
+			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_create, array(
+				\OC\Files\Filesystem::signal_param_path => $hookPath,
+				\OC\Files\Filesystem::signal_param_run => &$run,
+			));
+		} else {
+			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_update, array(
+				\OC\Files\Filesystem::signal_param_path => $hookPath,
+				\OC\Files\Filesystem::signal_param_run => &$run,
+			));
+		}
+		\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_write, array(
+			\OC\Files\Filesystem::signal_param_path => $hookPath,
+			\OC\Files\Filesystem::signal_param_run => &$run,
+		));
+		return $run;
+	}
+
+	private function emitPostHooks($exists, $path = null) {
+		if (is_null($path)) {
+			$path = $this->path;
+		}
+		$hookPath = Filesystem::getView()->getRelativePath($this->fileView->getAbsolutePath($path));
+		if (!$exists) {
+			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_create, array(
+				\OC\Files\Filesystem::signal_param_path => $hookPath
+			));
+		} else {
+			\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_update, array(
+				\OC\Files\Filesystem::signal_param_path => $hookPath
+			));
+		}
+		\OC_Hook::emit(\OC\Files\Filesystem::CLASSNAME, \OC\Files\Filesystem::signal_post_write, array(
+			\OC\Files\Filesystem::signal_param_path => $hookPath
+		));
+	}
+
 	/**
 	 * Returns the data
 	 *
@@ -354,15 +366,30 @@ class File extends Node implements IFile {
 			$needsPartFile = $this->needsPartFile($storage);
 			$partFile = null;
 
+			$targetPath = $path . '/' . $info['name'];
+			/** @var \OC\Files\Storage\Storage $targetStorage */
+			list($targetStorage, $targetInternalPath) = $this->fileView->resolvePath($targetPath);
+
+			$exists = $this->fileView->file_exists($targetPath);
+
 			try {
-				$targetPath = $path . '/' . $info['name'];
+				$this->emitPreHooks($exists, $targetPath);
+
+				$this->changeLock(ILockingProvider::LOCK_EXCLUSIVE);
+
 				if ($needsPartFile) {
 					// we first assembly the target file as a part file
 					$partFile = $path . '/' . $info['name'] . '.ocTransferId' . $info['transferid'] . '.part';
-					$chunk_handler->file_assemble($partFile);
+
+
+					list($partStorage, $partInternalPath) = $this->fileView->resolvePath($partFile);
+
+
+					$chunk_handler->file_assemble($partStorage, $partInternalPath, $this->fileView->getAbsolutePath($targetPath));
 
 					// here is the final atomic rename
-					$renameOkay = $this->fileView->rename($partFile, $targetPath);
+					$renameOkay = $targetStorage->moveFromStorage($partStorage, $partInternalPath, $targetInternalPath);
+
 					$fileExists = $this->fileView->file_exists($targetPath);
 					if ($renameOkay === false || $fileExists === false) {
 						\OCP\Util::writeLog('webdav', '\OC\Files\Filesystem::rename() failed', \OCP\Util::ERROR);
@@ -371,28 +398,36 @@ class File extends Node implements IFile {
 							// set to null to avoid double-deletion when handling exception
 							// stray part file
 							$partFile = null;
-							$this->fileView->unlink($targetPath);
+							$targetStorage->unlink($targetInternalPath);
 						}
+						$this->changeLock(ILockingProvider::LOCK_SHARED);
 						throw new Exception('Could not rename part file assembled from chunks');
 					}
 				} else {
 					// assemble directly into the final file
-					$chunk_handler->file_assemble($targetPath);
+					$chunk_handler->file_assemble($targetStorage, $targetInternalPath, $this->fileView->getAbsolutePath($targetPath));
 				}
 
 				// allow sync clients to send the mtime along in a header
 				$request = \OC::$server->getRequest();
 				if (isset($request->server['HTTP_X_OC_MTIME'])) {
-					if ($this->fileView->touch($targetPath, $request->server['HTTP_X_OC_MTIME'])) {
+					if ($targetStorage->touch($targetInternalPath, $request->server['HTTP_X_OC_MTIME'])) {
 						header('X-OC-MTime: accepted');
 					}
 				}
 
+				$this->changeLock(ILockingProvider::LOCK_SHARED);
+
+				// since we skipped the view we need to scan and emit the hooks ourselves
+				$this->fileView->getUpdater()->update($targetPath);
+
+				$this->emitPostHooks($exists, $targetPath);
+
 				$info = $this->fileView->getFileInfo($targetPath);
 				return $info->getEtag();
 			} catch (\Exception $e) {
 				if ($partFile !== null) {
-					$this->fileView->unlink($partFile);
+					$targetStorage->unlink($targetInternalPath);
 				}
 				$this->convertToSabreException($e);
 			}
diff --git a/lib/private/connector/sabre/lockplugin.php b/lib/private/connector/sabre/lockplugin.php
new file mode 100644
index 0000000000..a3a7bb84e3
--- /dev/null
+++ b/lib/private/connector/sabre/lockplugin.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Connector\Sabre;
+
+use OC\Connector\Sabre\Exception\FileLocked;
+use OCP\Lock\ILockingProvider;
+use OCP\Lock\LockedException;
+use Sabre\DAV\Exception\NotFound;
+use \Sabre\DAV\PropFind;
+use \Sabre\DAV\PropPatch;
+use Sabre\DAV\ServerPlugin;
+use Sabre\DAV\Tree;
+use Sabre\HTTP\RequestInterface;
+use Sabre\HTTP\ResponseInterface;
+
+class LockPlugin extends ServerPlugin {
+	/**
+	 * Reference to main server object
+	 *
+	 * @var \Sabre\DAV\Server
+	 */
+	private $server;
+
+	/**
+	 * @var \Sabre\DAV\Tree
+	 */
+	private $tree;
+
+	/**
+	 * @param \Sabre\DAV\Tree $tree tree
+	 */
+	public function __construct(Tree $tree) {
+		$this->tree = $tree;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function initialize(\Sabre\DAV\Server $server) {
+		$this->server = $server;
+		$this->server->on('beforeMethod', [$this, 'getLock'], 50);
+		$this->server->on('afterMethod', [$this, 'releaseLock'], 50);
+	}
+
+	public function getLock(RequestInterface $request) {
+		// we cant listen on 'beforeMethod:PUT' due to order of operations with setting up the tree
+		// so instead we limit ourselves to the PUT method manually
+		if ($request->getMethod() !== 'PUT') {
+			return;
+		}
+		try {
+			$node = $this->tree->getNodeForPath($request->getPath());
+		} catch (NotFound $e) {
+			return;
+		}
+		if ($node instanceof Node) {
+			try {
+				$node->acquireLock(ILockingProvider::LOCK_SHARED);
+			} catch (LockedException $e) {
+				throw new FileLocked($e->getMessage(), $e->getCode(), $e);
+			}
+		}
+	}
+
+	public function releaseLock(RequestInterface $request) {
+		if ($request->getMethod() !== 'PUT') {
+			return;
+		}
+		try {
+			$node = $this->tree->getNodeForPath($request->getPath());
+		} catch (NotFound $e) {
+			return;
+		}
+		if ($node instanceof Node) {
+			$node->releaseLock(ILockingProvider::LOCK_SHARED);
+		}
+	}
+}
diff --git a/lib/private/connector/sabre/node.php b/lib/private/connector/sabre/node.php
index 7f4bf8ffed..30faf9941b 100644
--- a/lib/private/connector/sabre/node.php
+++ b/lib/private/connector/sabre/node.php
@@ -67,6 +67,7 @@ abstract class Node implements \Sabre\DAV\INode {
 
 	/**
 	 * Sets up the node, expects a full path name
+	 *
 	 * @param \OC\Files\View $view
 	 * @param \OCP\Files\FileInfo $info
 	 */
@@ -82,6 +83,7 @@ abstract class Node implements \Sabre\DAV\INode {
 
 	/**
 	 *  Returns the name of the node
+	 *
 	 * @return string
 	 */
 	public function getName() {
@@ -99,6 +101,7 @@ abstract class Node implements \Sabre\DAV\INode {
 
 	/**
 	 * Renames the node
+	 *
 	 * @param string $name The new name
 	 * @throws \Sabre\DAV\Exception\BadRequest
 	 * @throws \Sabre\DAV\Exception\Forbidden
@@ -131,6 +134,7 @@ abstract class Node implements \Sabre\DAV\INode {
 
 	/**
 	 * Returns the last modification time, as a unix timestamp
+	 *
 	 * @return int timestamp as integer
 	 */
 	public function getLastModified() {
@@ -212,7 +216,7 @@ abstract class Node implements \Sabre\DAV\INode {
 	 * @return string|null
 	 */
 	public function getDavPermissions() {
-		$p ='';
+		$p = '';
 		if ($this->info->isShared()) {
 			$p .= 'S';
 		}
@@ -248,4 +252,25 @@ abstract class Node implements \Sabre\DAV\INode {
 			throw new InvalidPath($ex->getMessage());
 		}
 	}
+
+	/**
+	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+	 */
+	public function acquireLock($type) {
+		$this->fileView->lockFile($this->path, $type);
+	}
+
+	/**
+	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+	 */
+	public function releaseLock($type) {
+		$this->fileView->unlockFile($this->path, $type);
+	}
+
+	/**
+	 * @param int $type \OCP\Lock\ILockingProvider::LOCK_SHARED or \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE
+	 */
+	public function changeLock($type) {
+		$this->fileView->changeLock($this->path, $type);
+	}
 }
diff --git a/lib/private/connector/sabre/serverfactory.php b/lib/private/connector/sabre/serverfactory.php
index 525ff0104c..86f6063354 100644
--- a/lib/private/connector/sabre/serverfactory.php
+++ b/lib/private/connector/sabre/serverfactory.php
@@ -70,6 +70,7 @@ class ServerFactory {
 		$server->addPlugin(new \OC\Connector\Sabre\FilesPlugin($objectTree));
 		$server->addPlugin(new \OC\Connector\Sabre\MaintenancePlugin($this->config));
 		$server->addPlugin(new \OC\Connector\Sabre\ExceptionLoggerPlugin('webdav', $this->logger));
+		$server->addPlugin(new \OC\Connector\Sabre\LockPlugin($objectTree));
 
 		// wait with registering these until auth is handled and the filesystem is setup
 		$server->on('beforeMethod', function () use ($server, $objectTree, $viewCallBack) {
diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php
index def3f2fd12..4d33cd968a 100644
--- a/lib/private/db/connection.php
+++ b/lib/private/db/connection.php
@@ -291,4 +291,14 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
 	protected function replaceTablePrefix($statement) {
 		return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
 	}
+
+	/**
+	 * Check if a transaction is active
+	 *
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function inTransaction() {
+		return $this->getTransactionNestingLevel() > 0;
+	}
 }
diff --git a/lib/private/encryption/keys/storage.php b/lib/private/encryption/keys/storage.php
index b754462d9b..d0c094538b 100644
--- a/lib/private/encryption/keys/storage.php
+++ b/lib/private/encryption/keys/storage.php
@@ -27,11 +27,13 @@ namespace OC\Encryption\Keys;
 use OC\Encryption\Util;
 use OC\Files\Filesystem;
 use OC\Files\View;
-use OCP\Encryption\Exceptions\GenericEncryptionException;
 use OCP\Encryption\Keys\IStorage;
 
 class Storage implements IStorage {
 
+	// hidden file which indicate that the folder is a valid key storage
+	const KEY_STORAGE_MARKER = '.oc_key_storage';
+
 	/** @var View */
 	private $view;
 
@@ -42,6 +44,10 @@ class Storage implements IStorage {
 	/** @var string */
 	private $keys_base_dir;
 
+	// root of the key storage default is empty which means that we use the data folder
+	/** @var string */
+	private $root_dir;
+
 	/** @var string */
 	private $encryption_base_dir;
 
@@ -58,6 +64,7 @@ class Storage implements IStorage {
 
 		$this->encryption_base_dir = '/files_encryption';
 		$this->keys_base_dir = $this->encryption_base_dir .'/keys';
+		$this->root_dir = $this->util->getKeyStorageRoot();
 	}
 
 	/**
@@ -162,13 +169,13 @@ class Storage implements IStorage {
 	protected function constructUserKeyPath($encryptionModuleId, $keyId, $uid) {
 
 		if ($uid === null) {
-			$path = $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
+			$path = $this->root_dir . '/' . $this->encryption_base_dir . '/' . $encryptionModuleId . '/' . $keyId;
 		} else {
-			$path = '/' . $uid . $this->encryption_base_dir . '/'
+			$path = $this->root_dir . '/' . $uid . $this->encryption_base_dir . '/'
 				. $encryptionModuleId . '/' . $uid . '.' . $keyId;
 		}
 
-		return $path;
+		return \OC\Files\Filesystem::normalizePath($path);
 	}
 
 	/**
@@ -227,9 +234,9 @@ class Storage implements IStorage {
 
 		// in case of system wide mount points the keys are stored directly in the data directory
 		if ($this->util->isSystemWideMountPoint($filename, $owner)) {
-			$keyPath = $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir . '/' . $this->keys_base_dir . $filename . '/';
 		} else {
-			$keyPath = '/' . $owner . $this->keys_base_dir . $filename . '/';
+			$keyPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $filename . '/';
 		}
 
 		return Filesystem::normalizePath($keyPath . $encryptionModuleId . '/', false);
@@ -290,12 +297,12 @@ class Storage implements IStorage {
 		$systemWideMountPoint = $this->util->isSystemWideMountPoint($relativePath, $owner);
 
 		if ($systemWideMountPoint) {
-			$systemPath = $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir . '/' . $this->keys_base_dir . $relativePath . '/';
 		} else {
-			$systemPath = '/' . $owner . $this->keys_base_dir . $relativePath . '/';
+			$systemPath = $this->root_dir . '/' . $owner . $this->keys_base_dir . $relativePath . '/';
 		}
 
-		return $systemPath;
+		return  Filesystem::normalizePath($systemPath, false);
 	}
 
 	/**
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index 1e0a065e25..c004dfda0d 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -25,14 +25,12 @@
 
 namespace OC\Encryption;
 
+use OC\Encryption\Keys\Storage;
 use OC\Files\Filesystem;
-use OC\Files\Storage\Shared;
-use OC\Files\Storage\Wrapper\Encryption;
 use OC\Files\View;
-use OC\Search\Provider\File;
+use OC\ServiceUnavailableException;
 use OCP\Encryption\IEncryptionModule;
 use OCP\Encryption\IManager;
-use OCP\Files\Mount\IMountPoint;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\ILogger;
@@ -51,16 +49,26 @@ class Manager implements IManager {
 	/** @var Il10n */
 	protected $l;
 
+	/** @var View  */
+	protected $rootView;
+
+	/** @var Util  */
+	protected $util;
+
 	/**
 	 * @param IConfig $config
 	 * @param ILogger $logger
 	 * @param IL10N $l10n
+	 * @param View $rootView
+	 * @param Util $util
 	 */
-	public function __construct(IConfig $config, ILogger $logger, IL10N $l10n) {
+	public function __construct(IConfig $config, ILogger $logger, IL10N $l10n, View $rootView, Util $util) {
 		$this->encryptionModules = array();
 		$this->config = $config;
 		$this->logger = $logger;
 		$this->l = $l10n;
+		$this->rootView = $rootView;
+		$this->util = $util;
 	}
 
 	/**
@@ -82,7 +90,8 @@ class Manager implements IManager {
 	/**
 	 * check if new encryption is ready
 	 *
-	 * @return boolean
+	 * @return bool
+	 * @throws ServiceUnavailableException
 	 */
 	public function isReady() {
 		// check if we are still in transit between the old and the new encryption
@@ -94,6 +103,11 @@ class Manager implements IManager {
 			$this->logger->warning($warning);
 			return false;
 		}
+
+		if ($this->isKeyStorageReady() === false) {
+			throw new ServiceUnavailableException('Key Storage is not ready');
+		}
+
 		return true;
 	}
 
@@ -221,6 +235,31 @@ class Manager implements IManager {
 			\OC::$server->getGroupManager(),
 			\OC::$server->getConfig()
 		);
-		\OC\Files\Filesystem::addStorageWrapper('oc_encryption', array($util, 'wrapStorage'), 2);
+		Filesystem::addStorageWrapper('oc_encryption', array($util, 'wrapStorage'), 2);
 	}
+
+
+	/**
+	 * check if key storage is ready
+	 *
+	 * @return bool
+	 */
+	protected function isKeyStorageReady() {
+
+		$rootDir = $this->util->getKeyStorageRoot();
+
+		// the default root is always valid
+		if ($rootDir === '') {
+			return true;
+		}
+
+		// check if key storage is mounted correctly
+		if ($this->rootView->file_exists($rootDir . '/' . Storage::KEY_STORAGE_MARKER)) {
+			return true;
+		}
+
+		return false;
+	}
+
+
 }
diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php
index d0733941a3..90ae825997 100644
--- a/lib/private/encryption/util.php
+++ b/lib/private/encryption/util.php
@@ -59,7 +59,7 @@ class Util {
 	protected $blockSize = 8192;
 
 	/** @var View */
-	protected $view;
+	protected $rootView;
 
 	/** @var array */
 	protected $ocHeaderKeys;
@@ -78,13 +78,13 @@ class Util {
 
 	/**
 	 *
-	 * @param \OC\Files\View $view
+	 * @param View $rootView
 	 * @param \OC\User\Manager $userManager
 	 * @param \OC\Group\Manager $groupManager
 	 * @param IConfig $config
 	 */
 	public function __construct(
-		\OC\Files\View $view,
+		View $rootView,
 		\OC\User\Manager $userManager,
 		\OC\Group\Manager $groupManager,
 		IConfig $config) {
@@ -93,7 +93,7 @@ class Util {
 			self::HEADER_ENCRYPTION_MODULE_KEY
 		];
 
-		$this->view = $view;
+		$this->rootView = $rootView;
 		$this->userManager = $userManager;
 		$this->groupManager = $groupManager;
 		$this->config = $config;
@@ -167,7 +167,7 @@ class Util {
 
 		while ($dirList) {
 			$dir = array_pop($dirList);
-			$content = $this->view->getDirectoryContent($dir);
+			$content = $this->rootView->getDirectoryContent($dir);
 
 			foreach ($content as $c) {
 				if ($c->getType() === 'dir') {
@@ -332,10 +332,22 @@ class Util {
 	 * @return boolean
 	 */
 	public function isExcluded($path) {
-		$normalizedPath = \OC\Files\Filesystem::normalizePath($path);
+		$normalizedPath = Filesystem::normalizePath($path);
 		$root = explode('/', $normalizedPath, 4);
 		if (count($root) > 1) {
 
+			// detect alternative key storage root
+			$rootDir = $this->getKeyStorageRoot();
+			if ($rootDir !== '' &&
+				0 === strpos(
+					Filesystem::normalizePath($path),
+					Filesystem::normalizePath($rootDir)
+				)
+			) {
+				return true;
+			}
+
+
 			//detect system wide folders
 			if (in_array($root[1], $this->excludedPaths)) {
 				return true;
@@ -363,6 +375,24 @@ class Util {
 		return ($enabled === '1') ? true : false;
 	}
 
+	/**
+	 * set new key storage root
+	 *
+	 * @param string $root new key store root relative to the data folder
+	 */
+	public function setKeyStorageRoot($root) {
+		$this->config->setAppValue('core', 'encryption_key_storage_root', $root);
+	}
+
+	/**
+	 * get key storage root
+	 *
+	 * @return string key storage root
+	 */
+	public function getKeyStorageRoot() {
+		return $this->config->getAppValue('core', 'encryption_key_storage_root', '');
+	}
+
 	/**
 	 * Wraps the given storage when it is not a shared storage
 	 *
diff --git a/lib/private/eventsource.php b/lib/private/eventsource.php
index c69671c1a7..e2be808e72 100644
--- a/lib/private/eventsource.php
+++ b/lib/private/eventsource.php
@@ -59,6 +59,17 @@ class OC_EventSource implements \OCP\IEventSource {
 		$this->fallback = isset($_GET['fallback']) and $_GET['fallback'] == 'true';
 		if ($this->fallback) {
 			$this->fallBackId = (int)$_GET['fallback_id'];
+			/**
+			 * FIXME: The default content-security-policy of ownCloud forbids inline
+			 * JavaScript for security reasons. IE starting on Windows 10 will
+			 * however also obey the CSP which will break the event source fallback.
+			 *
+			 * As a workaround thus we set a custom policy which allows the execution
+			 * of inline JavaScript.
+			 *
+			 * @link https://github.com/owncloud/core/issues/14286
+			 */
+			header("Content-Security-Policy: default-src 'none'; script-src 'unsafe-inline'");
 			header("Content-Type: text/html");
 			echo str_repeat('<span></span>' . PHP_EOL, 10); //dummy data to keep IE happy
 		} else {
diff --git a/lib/private/filechunking.php b/lib/private/filechunking.php
index 82bf61fa7b..64399ad436 100644
--- a/lib/private/filechunking.php
+++ b/lib/private/filechunking.php
@@ -178,27 +178,26 @@ class OC_FileChunking {
 	 * Assembles the chunks into the file specified by the path.
 	 * Also triggers the relevant hooks and proxies.
 	 *
-	 * @param string $path target path
+	 * @param \OC\Files\Storage\Storage $storage
+	 * @param string $path target path relative to the storage
+	 * @param string $absolutePath
+	 * @return bool assembled file size or false if file could not be created
 	 *
-	 * @return boolean assembled file size or false if file could not be created
-	 *
-	 * @throws \OC\InsufficientStorageException when file could not be fully
-	 * assembled due to lack of free space
+	 * @throws \OC\ServerNotAvailableException
 	 */
-	public function file_assemble($path) {
-		$absolutePath = \OC\Files\Filesystem::normalizePath(\OC\Files\Filesystem::getView()->getAbsolutePath($path));
+	public function file_assemble($storage, $path, $absolutePath) {
 		$data = '';
 		// use file_put_contents as method because that best matches what this function does
 		if (\OC\Files\Filesystem::isValidPath($path)) {
-			$path = \OC\Files\Filesystem::getView()->getRelativePath($absolutePath);
-			$exists = \OC\Files\Filesystem::file_exists($path);
+			$exists = $storage->file_exists($path);
 			$run = true;
+			$hookPath = \OC\Files\Filesystem::getView()->getRelativePath($absolutePath);
 			if(!$exists) {
 				OC_Hook::emit(
 					\OC\Files\Filesystem::CLASSNAME,
 					\OC\Files\Filesystem::signal_create,
 					array(
-						\OC\Files\Filesystem::signal_param_path => $path,
+						\OC\Files\Filesystem::signal_param_path => $hookPath,
 						\OC\Files\Filesystem::signal_param_run => &$run
 					)
 				);
@@ -207,14 +206,14 @@ class OC_FileChunking {
 				\OC\Files\Filesystem::CLASSNAME,
 				\OC\Files\Filesystem::signal_write,
 				array(
-					\OC\Files\Filesystem::signal_param_path => $path,
+					\OC\Files\Filesystem::signal_param_path => $hookPath,
 					\OC\Files\Filesystem::signal_param_run => &$run
 				)
 			);
 			if(!$run) {
 				return false;
 			}
-			$target = \OC\Files\Filesystem::fopen($path, 'w');
+			$target = $storage->fopen($path, 'w');
 			if($target) {
 				$count = $this->assemble($target);
 				fclose($target);
@@ -222,13 +221,13 @@ class OC_FileChunking {
 					OC_Hook::emit(
 						\OC\Files\Filesystem::CLASSNAME,
 						\OC\Files\Filesystem::signal_post_create,
-						array( \OC\Files\Filesystem::signal_param_path => $path)
+						array( \OC\Files\Filesystem::signal_param_path => $hookPath)
 					);
 				}
 				OC_Hook::emit(
 					\OC\Files\Filesystem::CLASSNAME,
 					\OC\Files\Filesystem::signal_post_write,
-					array( \OC\Files\Filesystem::signal_param_path => $path)
+					array( \OC\Files\Filesystem::signal_param_path => $hookPath)
 				);
 				return $count > 0;
 			}else{
diff --git a/lib/private/files.php b/lib/private/files.php
index 6268bf8a12..0172f1ca6a 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -86,15 +86,6 @@ class OC_Files {
 	 */
 	public static function get($dir, $files, $only_header = false) {
 		$view = \OC\Files\Filesystem::getView();
-		$xsendfile = false;
-		if (\OC::$server->getLockingProvider() instanceof NoopLockingProvider) {
-			if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) ||
-				isset($_SERVER['MOD_X_SENDFILE2_ENABLED']) ||
-				isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])
-			) {
-				$xsendfile = true;
-			}
-		}
 
 		if (is_array($files) && count($files) === 1) {
 			$files = $files[0];
@@ -129,9 +120,6 @@ class OC_Files {
 
 		if ($get_type === self::FILE) {
 			$zip = false;
-			if ($xsendfile && \OC::$server->getEncryptionManager()->isEnabled()) {
-				$xsendfile = false;
-			}
 		} else {
 			$zip = new ZipStreamer(false);
 		}
@@ -176,17 +164,7 @@ class OC_Files {
 				$zip->finalize();
 				set_time_limit($executionTime);
 			} else {
-				if ($xsendfile) {
-					/** @var $storage \OC\Files\Storage\Storage */
-					list($storage) = $view->resolvePath($filename);
-					if ($storage->isLocal()) {
-						self::addSendfileHeader($filename);
-					} else {
-						\OC\Files\Filesystem::readfile($filename);
-					}
-				} else {
-					\OC\Files\Filesystem::readfile($filename);
-				}
+				\OC\Files\Filesystem::readfile($filename);
 			}
 			if ($get_type === self::FILE) {
 				$view->unlockFile($filename, ILockingProvider::LOCK_SHARED);
@@ -202,40 +180,6 @@ class OC_Files {
 		}
 	}
 
-	/**
-	 * @param false|string $filename
-	 */
-	private static function addSendfileHeader($filename) {
-		if (isset($_SERVER['MOD_X_SENDFILE_ENABLED'])) {
-			$filename = \OC\Files\Filesystem::getLocalFile($filename);
-			header("X-Sendfile: " . $filename);
- 		}
- 		if (isset($_SERVER['MOD_X_SENDFILE2_ENABLED'])) {
-			$filename = \OC\Files\Filesystem::getLocalFile($filename);
-			if (isset($_SERVER['HTTP_RANGE']) &&
-				preg_match("/^bytes=([0-9]+)-([0-9]*)$/", $_SERVER['HTTP_RANGE'], $range)) {
-				$filelength = filesize($filename);
- 				if ($range[2] === "") {
- 					$range[2] = $filelength - 1;
- 				}
- 				header("Content-Range: bytes $range[1]-$range[2]/" . $filelength);
- 				header("HTTP/1.1 206 Partial content");
- 				header("X-Sendfile2: " . str_replace(",", "%2c", rawurlencode($filename)) . " $range[1]-$range[2]");
- 			} else {
- 				header("X-Sendfile: " . $filename);
- 			}
-		}
-
-		if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
-			if (isset($_SERVER['MOD_X_ACCEL_REDIRECT_PREFIX'])) {
-				$filename = $_SERVER['MOD_X_ACCEL_REDIRECT_PREFIX'] . \OC\Files\Filesystem::getLocalFile($filename);
-			} else {
-				$filename = \OC::$WEBROOT . '/data' . \OC\Files\Filesystem::getRoot() . $filename;
-			}
-			header("X-Accel-Redirect: " . $filename);
-		}
-	}
-
 	/**
 	 * @param string $dir
 	 * @param ZipStreamer $zip
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 8cf097421d..5c04da1f0d 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -35,6 +35,8 @@
 
 namespace OC\Files\Cache;
 
+use \OCP\Files\IMimeTypeLoader;
+
 /**
  * Metadata cache for a storage
  *
@@ -66,8 +68,8 @@ class Cache {
 	 */
 	protected $storageCache;
 
-	protected static $mimetypeIds = array();
-	protected static $mimetypes = array();
+	/** @var IMimeTypeLoader */
+	protected $mimetypeLoader;
 
 	/**
 	 * @param \OC\Files\Storage\Storage|string $storage
@@ -83,6 +85,7 @@ class Cache {
 		}
 
 		$this->storageCache = new Storage($storage);
+		$this->mimetypeLoader = \OC::$server->getMimeTypeLoader();
 	}
 
 	/**
@@ -94,72 +97,6 @@ class Cache {
 		return $this->storageCache->getNumericId();
 	}
 
-	/**
-	 * Get the numeric id for a mimetype
-	 *
-	 * Mimetypes are stored as integers in the cache to prevent duplicated data of the (usually) fairly limited amount of unique mimetypes
-	 * If the supplied mimetype does not yet have a numeric id a new one will be generated
-	 *
-	 * @param string $mime
-	 * @return int
-	 */
-	public function getMimetypeId($mime) {
-		if (empty($mime)) {
-			// Can not insert empty string into Oracle NOT NULL column.
-			$mime = 'application/octet-stream';
-		}
-		if (empty(self::$mimetypeIds)) {
-			$this->loadMimetypes();
-		}
-
-		if (!isset(self::$mimetypeIds[$mime])) {
-			try {
-				$connection = \OC_DB::getConnection();
-				$connection->insertIfNotExist('*PREFIX*mimetypes', [
-					'mimetype'	=> $mime,
-				]);
-				$this->loadMimetypes();
-			} catch (\Doctrine\DBAL\DBALException $e) {
-				\OCP\Util::writeLog('core', 'Exception during mimetype insertion: ' . $e->getmessage(), \OCP\Util::DEBUG);
-				return -1;
-			}
-		}
-
-		return self::$mimetypeIds[$mime];
-	}
-
-
-	/**
-	 * Get the mimetype (as string) from a mimetype id
-	 *
-	 * @param int $id
-	 * @return string | null the mimetype for the id or null if the id is not known
-	 */
-	public function getMimetype($id) {
-		if (empty(self::$mimetypes)) {
-			$this->loadMimetypes();
-		}
-
-		return isset(self::$mimetypes[$id]) ? self::$mimetypes[$id] : null;
-	}
-
-	/**
-	 * Load all known mimetypes and mimetype ids from the database
-	 *
-	 * @throws \OC\DatabaseException
-	 */
-	public function loadMimetypes() {
-		self::$mimetypeIds = self::$mimetypes = array();
-
-		$result = \OC_DB::executeAudited('SELECT `id`, `mimetype` FROM `*PREFIX*mimetypes`', array());
-		if ($result) {
-			while ($row = $result->fetchRow()) {
-				self::$mimetypeIds[$row['mimetype']] = $row['id'];
-				self::$mimetypes[$row['id']] = $row['mimetype'];
-			}
-		}
-	}
-
 	/**
 	 * get the stored metadata of a file or folder
 	 *
@@ -222,8 +159,8 @@ class Cache {
 			$data['storage_mtime'] = (int)$data['storage_mtime'];
 			$data['encrypted'] = (bool)$data['encrypted'];
 			$data['storage'] = $this->storageId;
-			$data['mimetype'] = $this->getMimetype($data['mimetype']);
-			$data['mimepart'] = $this->getMimetype($data['mimepart']);
+			$data['mimetype'] = $this->mimetypeLoader->getMimetypeById($data['mimetype']);
+			$data['mimepart'] = $this->mimetypeLoader->getMimetypeById($data['mimepart']);
 			if ($data['storage_mtime'] == 0) {
 				$data['storage_mtime'] = $data['mtime'];
 			}
@@ -258,8 +195,8 @@ class Cache {
 			$result = \OC_DB::executeAudited($sql, array($fileId));
 			$files = $result->fetchAll();
 			foreach ($files as &$file) {
-				$file['mimetype'] = $this->getMimetype($file['mimetype']);
-				$file['mimepart'] = $this->getMimetype($file['mimepart']);
+				$file['mimetype'] = $this->mimetypeLoader->getMimetypeById($file['mimetype']);
+				$file['mimepart'] = $this->mimetypeLoader->getMimetypeById($file['mimepart']);
 				if ($file['storage_mtime'] == 0) {
 					$file['storage_mtime'] = $file['mtime'];
 				}
@@ -385,9 +322,9 @@ class Cache {
 					$params[] = md5($value);
 					$queryParts[] = '`path_hash`';
 				} elseif ($name === 'mimetype') {
-					$params[] = $this->getMimetypeId(substr($value, 0, strpos($value, '/')));
+					$params[] = $this->mimetypeLoader->getId(substr($value, 0, strpos($value, '/')));
 					$queryParts[] = '`mimepart`';
-					$value = $this->getMimetypeId($value);
+					$value = $this->mimetypeLoader->getId($value);
 				} elseif ($name === 'storage_mtime') {
 					if (!isset($data['mtime'])) {
 						$params[] = $value;
@@ -613,7 +550,6 @@ class Cache {
 	 * @return array an array of cache entries where the name matches the search pattern
 	 */
 	public function search($pattern) {
-
 		// normalize pattern
 		$pattern = $this->normalize($pattern);
 
@@ -630,8 +566,8 @@ class Cache {
 
 		$files = array();
 		while ($row = $result->fetchRow()) {
-			$row['mimetype'] = $this->getMimetype($row['mimetype']);
-			$row['mimepart'] = $this->getMimetype($row['mimepart']);
+			$row['mimetype'] = $this->mimetypeLoader->getMimetypeById($row['mimetype']);
+			$row['mimepart'] = $this->mimetypeLoader->getMimetypeById($row['mimepart']);
 			$files[] = $row;
 		}
 		return $files;
@@ -652,12 +588,12 @@ class Cache {
 		}
 		$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `etag`, `permissions`
 				FROM `*PREFIX*filecache` WHERE ' . $where . ' AND `storage` = ?';
-		$mimetype = $this->getMimetypeId($mimetype);
+		$mimetype = $this->mimetypeLoader->getId($mimetype);
 		$result = \OC_DB::executeAudited($sql, array($mimetype, $this->getNumericStorageId()));
 		$files = array();
 		while ($row = $result->fetchRow()) {
-			$row['mimetype'] = $this->getMimetype($row['mimetype']);
-			$row['mimepart'] = $this->getMimetype($row['mimepart']);
+			$row['mimetype'] = $this->mimetypeLoader->getMimetypeById($row['mimetype']);
+			$row['mimepart'] = $this->mimetypeLoader->getMimetypeById($row['mimepart']);
 			$files[] = $row;
 		}
 		return $files;
diff --git a/lib/private/files/cache/scanner.php b/lib/private/files/cache/scanner.php
index 7c65c72135..fb60ee5aa5 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -377,7 +377,7 @@ class Scanner extends BasicEmitter {
 			// inserted mimetypes but those weren't available yet inside the transaction
 			// To make sure to have the updated mime types in such cases,
 			// we reload them here
-			$this->cache->loadMimetypes();
+			\OC::$server->getMimeTypeLoader()->reset();
 		}
 
 		foreach ($childQueue as $child => $childData) {
@@ -416,11 +416,21 @@ class Scanner extends BasicEmitter {
 	public function backgroundScan() {
 		$lastPath = null;
 		while (($path = $this->cache->getIncomplete()) !== false && $path !== $lastPath) {
-			$this->scan($path, self::SCAN_RECURSIVE, self::REUSE_ETAG);
-			\OC_Hook::emit('Scanner', 'correctFolderSize', array('path' => $path));
-			if ($this->cacheActive) {
-				$this->cache->correctFolderSize($path);
+			try {
+				$this->scan($path, self::SCAN_RECURSIVE, self::REUSE_ETAG);
+				\OC_Hook::emit('Scanner', 'correctFolderSize', array('path' => $path));
+				if ($this->cacheActive) {
+					$this->cache->correctFolderSize($path);
+				}
+			} catch (\OCP\Files\StorageInvalidException $e) {
+				// skip unavailable storages
+			} catch (\OCP\Files\StorageNotAvailableException $e) {
+				// skip unavailable storages
+			} catch (\OCP\Lock\LockedException $e) {
+				// skip unavailable storages
 			}
+			// FIXME: this won't proceed with the next item, needs revamping of getIncomplete()
+			// to make this possible
 			$lastPath = $path;
 		}
 	}
diff --git a/lib/private/files/cache/storage.php b/lib/private/files/cache/storage.php
index 338d830828..a116e84b3f 100644
--- a/lib/private/files/cache/storage.php
+++ b/lib/private/files/cache/storage.php
@@ -58,7 +58,8 @@ class Storage {
 			$this->numericId = $row['numeric_id'];
 		} else {
 			$connection = \OC_DB::getConnection();
-			if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $isAvailable])) {
+			$available = $isAvailable ? 1 : 0;
+			if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
 				$this->numericId = \OC_DB::insertid('*PREFIX*storages');
 			} else {
 				if ($row = self::getStorageById($this->storageId)) {
@@ -141,7 +142,7 @@ class Storage {
 	public function getAvailability() {
 		if ($row = self::getStorageById($this->storageId)) {
 			return [
-				'available' => $row['available'],
+				'available' => ($row['available'] === 1),
 				'last_checked' => $row['last_checked']
 			];
 		} else {
@@ -154,7 +155,8 @@ class Storage {
 	 */
 	public function setAvailability($isAvailable) {
 		$sql = 'UPDATE `*PREFIX*storages` SET `available` = ?, `last_checked` = ? WHERE `id` = ?';
-		\OC_DB::executeAudited($sql, array($isAvailable, time(), $this->storageId));
+		$available = $isAvailable ? 1 : 0;
+		\OC_DB::executeAudited($sql, array($available, time(), $this->storageId));
 	}
 
 	/**
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index 82c8f3de69..b333844f8c 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -252,7 +252,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 		$sid = $this->getStorage()->getId();
 		if (!is_null($sid)) {
 			$sid = explode(':', $sid);
-			return ($sid[0] !== 'local' and $sid[0] !== 'home' and $sid[0] !== 'shared');
+			return ($sid[0] !== 'home' and $sid[0] !== 'shared');
 		}
 
 		return false;
diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php
index 042b515fea..23004fc352 100644
--- a/lib/private/files/node/folder.php
+++ b/lib/private/files/node/folder.php
@@ -25,7 +25,7 @@
 
 namespace OC\Files\Node;
 
-use OC\Files\Cache\Cache;
+use OCP\Files\FileInfo;
 use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 
@@ -77,76 +77,15 @@ class Folder extends Node implements \OCP\Files\Folder {
 	 * @return Node[]
 	 */
 	public function getDirectoryListing() {
-		$result = array();
+		$folderContent = $this->view->getDirectoryContent($this->path);
 
-		/**
-		 * @var \OC\Files\Storage\Storage $storage
-		 */
-		list($storage, $internalPath) = $this->view->resolvePath($this->path);
-		if ($storage) {
-			$cache = $storage->getCache($internalPath);
-
-			//trigger cache update check
-			$this->view->getFileInfo($this->path);
-
-			$files = $cache->getFolderContents($internalPath);
-		} else {
-			$files = array();
-		}
-
-		//add a folder for any mountpoint in this directory and add the sizes of other mountpoints to the folders
-		$mounts = $this->root->getMountsIn($this->path);
-		$dirLength = strlen($this->path);
-		foreach ($mounts as $mount) {
-			$subStorage = $mount->getStorage();
-			if ($subStorage) {
-				$subCache = $subStorage->getCache('');
-
-				if ($subCache->getStatus('') === Cache::NOT_FOUND) {
-					$subScanner = $subStorage->getScanner('');
-					$subScanner->scanFile('');
-				}
-
-				$rootEntry = $subCache->get('');
-				if ($rootEntry) {
-					$relativePath = trim(substr($mount->getMountPoint(), $dirLength), '/');
-					if ($pos = strpos($relativePath, '/')) {
-						//mountpoint inside subfolder add size to the correct folder
-						$entryName = substr($relativePath, 0, $pos);
-						foreach ($files as &$entry) {
-							if ($entry['name'] === $entryName) {
-								if ($rootEntry['size'] >= 0) {
-									$entry['size'] += $rootEntry['size'];
-								} else {
-									$entry['size'] = -1;
-								}
-							}
-						}
-					} else { //mountpoint in this folder, add an entry for it
-						$rootEntry['name'] = $relativePath;
-						$rootEntry['storageObject'] = $subStorage;
-
-						//remove any existing entry with the same name
-						foreach ($files as $i => $file) {
-							if ($file['name'] === $rootEntry['name']) {
-								$files[$i] = null;
-								break;
-							}
-						}
-						$files[] = $rootEntry;
-					}
-				}
+		return array_map(function(FileInfo $info) {
+			if ($info->getMimetype() === 'httpd/unix-directory') {
+				return new Folder($this->root, $this->view, $info->getPath(), $info);
+			} else {
+				return new File($this->root, $this->view, $info->getPath(), $info);
 			}
-		}
-
-		foreach ($files as $file) {
-			if ($file) {
-				$node = $this->createNode($this->path . '/' . $file['name'], $file);
-				$result[] = $node;
-			}
-		}
-
-		return $result;
+		}, $folderContent);
 	}
 
 	/**
diff --git a/lib/private/files/node/node.php b/lib/private/files/node/node.php
index b9bd785de5..943d12122e 100644
--- a/lib/private/files/node/node.php
+++ b/lib/private/files/node/node.php
@@ -56,11 +56,13 @@ class Node implements \OCP\Files\Node {
 	 * @param \OC\Files\View $view
 	 * @param \OC\Files\Node\Root $root
 	 * @param string $path
+	 * @param FileInfo $fileInfo
 	 */
-	public function __construct($root, $view, $path) {
+	public function __construct($root, $view, $path, $fileInfo = null) {
 		$this->view = $view;
 		$this->root = $root;
 		$this->path = $path;
+		$this->fileInfo = $fileInfo;
 	}
 
 	/**
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 6e89dcccbc..c1cf17abde 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -40,6 +40,7 @@ use OC\Files\Filesystem;
 use OC\Files\Stream\Close;
 use Icewind\Streams\IteratorDirectory;
 use OC\MemCache\ArrayCache;
+use OCP\AppFramework\Http;
 use OCP\Constants;
 use OCP\Files;
 use OCP\Files\FileInfo;
@@ -77,6 +78,8 @@ class DAV extends Common {
 	private $statCache;
 	/** @var array */
 	private static $tempFiles = [];
+	/** @var \OCP\Http\Client\IClientService */
+	private $httpClientService;
 
 	/**
 	 * @param array $params
@@ -84,6 +87,7 @@ class DAV extends Common {
 	 */
 	public function __construct($params) {
 		$this->statCache = new ArrayCache();
+		$this->httpClientService = \OC::$server->getHTTPClientService();
 		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
 			$host = $params['host'];
 			//remove leading http[s], will be generated in createBaseUri()
@@ -232,7 +236,7 @@ class DAV extends Common {
 	 * If not, request it from the server then store to cache.
 	 *
 	 * @param string $path path to propfind
-	 * 
+	 *
 	 * @return array propfind response
 	 *
 	 * @throws NotFound
@@ -337,38 +341,22 @@ class DAV extends Common {
 				if (!$this->file_exists($path)) {
 					return false;
 				}
-				//straight up curl instead of sabredav here, sabredav put's the entire get result in memory
-				$curl = curl_init();
-				$fp = fopen('php://temp', 'r+');
-				curl_setopt($curl, CURLOPT_USERPWD, $this->user . ':' . $this->password);
-				curl_setopt($curl, CURLOPT_URL, $this->createBaseUri() . $this->encodePath($path));
-				curl_setopt($curl, CURLOPT_FILE, $fp);
-				curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-				if(defined('CURLOPT_PROTOCOLS')) {
-					curl_setopt($curl, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-				}
-				if(defined('CURLOPT_REDIR_PROTOCOLS')) {
-					curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-				}
-				if ($this->secure === true) {
-					curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
-					curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
-					if ($this->certPath) {
-						curl_setopt($curl, CURLOPT_CAINFO, $this->certPath);
+				$response = $this->httpClientService
+					->newClient()
+					->get($this->createBaseUri() . $this->encodePath($path), [
+						'auth' => [$this->user, $this->password],
+						'stream' => true
+					]);
+
+				if ($response->getStatusCode() !== Http::STATUS_OK) {
+					if ($response->getStatusCode() === Http::STATUS_LOCKED) {
+						throw new \OCP\Lock\LockedException($path);
+					} else {
+						Util::writeLog("webdav client", 'Guzzle get returned status code ' . $response->getStatusCode(), Util::ERROR);
 					}
 				}
 
-				curl_exec($curl);
-				$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-				if ($statusCode !== 200) {
-					Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, Util::ERROR);
-					if ($statusCode === 423) {
-						throw new \OCP\Lock\LockedException($path);
-					}
-				}
-				curl_close($curl);
-				rewind($fp);
-				return $fp;
+				return $response->getBody();
 			case 'w':
 			case 'wb':
 			case 'a':
@@ -478,38 +466,19 @@ class DAV extends Common {
 	 */
 	protected function uploadFile($path, $target) {
 		$this->init();
+
 		// invalidate
 		$target = $this->cleanPath($target);
 		$this->statCache->remove($target);
 		$source = fopen($path, 'r');
 
-		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_USERPWD, $this->user . ':' . $this->password);
-		curl_setopt($curl, CURLOPT_URL, $this->createBaseUri() . $this->encodePath($target));
-		curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
-		curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer
-		curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path));
-		curl_setopt($curl, CURLOPT_PUT, true);
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($curl, CURLOPT_PROTOCOLS,  CURLPROTO_HTTP | CURLPROTO_HTTPS);
-		curl_setopt($curl, CURLOPT_REDIR_PROTOCOLS,  CURLPROTO_HTTP | CURLPROTO_HTTPS);
-		if ($this->secure === true) {
-			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
-			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
-			if ($this->certPath) {
-				curl_setopt($curl, CURLOPT_CAINFO, $this->certPath);
-			}
-		}
-		curl_exec($curl);
-		$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		if ($statusCode !== 200) {
-			Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, Util::ERROR);
-			if ($statusCode === 423) {
-				throw new \OCP\Lock\LockedException($path);
-			}
-		}
-		curl_close($curl);
-		fclose($source);
+		$this->httpClientService
+			->newClient()
+			->put($this->createBaseUri() . $this->encodePath($target), [
+				'body' => $source,
+				'auth' => [$this->user, $this->password]
+			]);
+
 		$this->removeCachedFile($target);
 	}
 
@@ -768,7 +737,7 @@ class DAV extends Common {
 			if ($e->getHttpStatus() === 404 || $e->getHttpStatus() === 405) {
 				if ($path === '') {
 					// if root is gone it means the storage is not available
-					throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+					throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
 				}
 				return false;
 			}
@@ -802,19 +771,19 @@ class DAV extends Common {
 			}
 			if ($e->getHttpStatus() === 401) {
 				// either password was changed or was invalid all along
-				throw new StorageInvalidException(get_class($e).': '.$e->getMessage());
+				throw new StorageInvalidException(get_class($e) . ': ' . $e->getMessage());
 			} else if ($e->getHttpStatus() === 405) {
 				// ignore exception for MethodNotAllowed, false will be returned
 				return;
 			}
-			throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
 		} else if ($e instanceof ClientException) {
 			// connection timeout or refused, server could be temporarily down
-			throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
 		} else if ($e instanceof \InvalidArgumentException) {
 			// parse error because the server returned HTML instead of XML,
 			// possibly temporarily down
-			throw new StorageNotAvailableException(get_class($e).': '.$e->getMessage());
+			throw new StorageNotAvailableException(get_class($e) . ': ' . $e->getMessage());
 		} else if (($e instanceof StorageNotAvailableException) || ($e instanceof StorageInvalidException)) {
 			// rethrow
 			throw $e;
diff --git a/lib/private/files/storage/storagefactory.php b/lib/private/files/storage/storagefactory.php
index 62b393c845..e8df5090f0 100644
--- a/lib/private/files/storage/storagefactory.php
+++ b/lib/private/files/storage/storagefactory.php
@@ -99,6 +99,9 @@ class StorageFactory implements IStorageFactory {
 		}, $wrappers);
 		foreach ($wrappers as $wrapper) {
 			$storage = $wrapper($mountPoint->getMountPoint(), $storage, $mountPoint);
+			if (!($storage instanceof \OCP\Files\Storage)) {
+				throw new \Exception('Invalid result from storage wrapper');
+			}
 		}
 		return $storage;
 	}
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/files/storage/wrapper/encryption.php
index 4ba9b21ddb..805a2bc1ad 100644
--- a/lib/private/files/storage/wrapper/encryption.php
+++ b/lib/private/files/storage/wrapper/encryption.php
@@ -67,7 +67,6 @@ class Encryption extends Wrapper {
 	/** @var IMountPoint */
 	private $mount;
 
-
 	/** @var IStorage */
 	private $keyStorage;
 
@@ -300,33 +299,15 @@ class Encryption extends Wrapper {
 	public function copy($path1, $path2) {
 
 		$source = $this->getFullPath($path1);
-		$target = $this->getFullPath($path2);
 
 		if ($this->util->isExcluded($source)) {
 			return $this->storage->copy($path1, $path2);
 		}
 
-		$result = $this->storage->copy($path1, $path2);
-
-		if ($result && $this->encryptionManager->isEnabled()) {
-			$keysCopied = $this->copyKeys($source, $target);
-
-			if ($keysCopied &&
-				dirname($source) !== dirname($target) &&
-				$this->util->isFile($target)
-			) {
-				$this->update->update($target);
-			}
-
-			$data = $this->getMetaData($path1);
-
-			if (isset($data['encrypted'])) {
-				$this->getCache()->put($path2, ['encrypted' => $data['encrypted']]);
-			}
-			if (isset($data['size'])) {
-				$this->updateUnencryptedSize($target, $data['size']);
-			}
-		}
+		// need to stream copy file by file in case we copy between a encrypted
+		// and a unencrypted storage
+		$this->unlink($path2);
+		$result = $this->copyFromStorage($this, $path1, $path2);
 
 		return $result;
 	}
@@ -511,12 +492,17 @@ class Encryption extends Wrapper {
 				}
 			}
 		} else {
-			$source = $sourceStorage->fopen($sourceInternalPath, 'r');
-			$target = $this->fopen($targetInternalPath, 'w');
-			list(, $result) = \OC_Helper::streamCopy($source, $target);
-			fclose($source);
-			fclose($target);
-
+			try {
+				$source = $sourceStorage->fopen($sourceInternalPath, 'r');
+				$target = $this->fopen($targetInternalPath, 'w');
+				list(, $result) = \OC_Helper::streamCopy($source, $target);
+				fclose($source);
+				fclose($target);
+			} catch (\Exception $e) {
+				fclose($source);
+				fclose($target);
+				throw $e;
+			}
 			if($result) {
 				if ($preserveMtime) {
 					$this->touch($targetInternalPath, $sourceStorage->filemtime($sourceInternalPath));
diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index ba286637df..3dc3975fb2 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -6,6 +6,7 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <roeland@famdouma.nl>
  * @author Thomas Tanghus <thomas@tanghus.net>
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
@@ -101,15 +102,22 @@ class Detection implements IMimeTypeDetector {
 			return;
 		}
 
-		$file = file_get_contents($this->configDir . '/mimetypealiases.dist.json');
-		$this->mimeTypeAlias = get_object_vars(json_decode($file));
+		$this->mimeTypeAlias = json_decode(file_get_contents($this->configDir . '/mimetypealiases.dist.json'), true);
 
 		if (file_exists($this->configDir . '/mimetypealiases.json')) {
-			$custom = get_object_vars(json_decode(file_get_contents($this->configDir . '/mimetypealiases.json')));
+			$custom = json_decode(file_get_contents($this->configDir . '/mimetypealiases.json'), true);
 			$this->mimeTypeAlias = array_merge($this->mimeTypeAlias, $custom);
 		}
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getAllAliases() {
+		$this->loadAliases();
+		return $this->mimeTypeAlias;
+	}
+
 	/**
 	 * Add mimetype mappings if they are not yet present
 	 */
@@ -118,19 +126,25 @@ class Detection implements IMimeTypeDetector {
 			return;
 		}
 
-		$dist = file_get_contents($this->configDir . '/mimetypemapping.dist.json');
-		$mimetypemapping = get_object_vars(json_decode($dist));
+		$mimetypemapping = json_decode(file_get_contents($this->configDir . '/mimetypemapping.dist.json'), true);
 
 		//Check if need to load custom mappings
 		if (file_exists($this->configDir . '/mimetypemapping.json')) {
-			$custom = file_get_contents($this->configDir . '/mimetypemapping.json');
-			$custom_mapping = get_object_vars(json_decode($custom));
-			$mimetypemapping = array_merge($mimetypemapping, $custom_mapping);
+			$custom = json_decode(file_get_contents($this->configDir . '/mimetypemapping.json'), true);
+			$mimetypemapping = array_merge($mimetypemapping, $custom);
 		}
 
 		$this->registerTypeArray($mimetypemapping);
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getAllMappings() {
+		$this->loadMappings();
+		return $this->mimetypes;
+	}
+
 	/**
 	 * detect mimetype only based on filename, content of file is not used
 	 *
diff --git a/lib/private/files/type/loader.php b/lib/private/files/type/loader.php
new file mode 100644
index 0000000000..78bfcf60bf
--- /dev/null
+++ b/lib/private/files/type/loader.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Type;
+
+use OCP\Files\IMimeTypeLoader;
+use OCP\IDBConnection;
+
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
+
+/**
+ * Mimetype database loader
+ *
+ * @package OC\Files\Type
+ */
+class Loader implements IMimeTypeLoader {
+
+	/** @var IDBConnection */
+	private $dbConnection;
+
+	/** @var array [id => mimetype] */
+	protected $mimetypes;
+
+	/** @var array [mimetype => id] */
+	protected $mimetypeIds;
+
+	/**
+	 * @param IDBConnection $dbConnection
+	 */
+	public function __construct(IDBConnection $dbConnection) {
+		$this->dbConnection = $dbConnection;
+		$this->mimetypes = [];
+		$this->mimetypeIds = [];
+	}
+
+	/**
+	 * Get a mimetype from its ID
+	 *
+	 * @param int $id
+	 * @return string|null
+	 */
+	public function getMimetypeById($id) {
+		if (!$this->mimetypes) {
+			$this->loadMimetypes();
+		}
+		if (isset($this->mimetypes[$id])) {
+			return $this->mimetypes[$id];
+		}
+		return null;
+	}
+
+	/**
+	 * Get a mimetype ID, adding the mimetype to the DB if it does not exist
+	 *
+	 * @param string $mimetype
+	 * @return int
+	 */
+	public function getId($mimetype) {
+		if (!$this->mimetypeIds) {
+			$this->loadMimetypes();
+		}
+		if (isset($this->mimetypeIds[$mimetype])) {
+			return $this->mimetypeIds[$mimetype];
+		}
+		return $this->store($mimetype);
+	}
+
+	/**
+	 * Test if a mimetype exists in the database
+	 *
+	 * @param string $mimetype
+	 * @return bool
+	 */
+	public function exists($mimetype) {
+		if (!$this->mimetypeIds) {
+			$this->loadMimetypes();
+		}
+		return isset($this->mimetypeIds[$mimetype]);
+	}
+
+	/**
+	 * Clear all loaded mimetypes, allow for re-loading
+	 */
+	public function reset() {
+		$this->mimetypes = [];
+		$this->mimetypeIds = [];
+	}
+
+	/**
+	 * Store a mimetype in the DB
+	 *
+	 * @param string $mimetype
+	 * @param int inserted ID
+	 */
+	protected function store($mimetype) {
+		try {
+			$qb = $this->dbConnection->getQueryBuilder();
+			$qb->insert('mimetypes')
+				->values([
+					'mimetype' => $qb->createNamedParameter($mimetype)
+				]);
+			$qb->execute();
+		} catch (UniqueConstraintViolationException $e) {
+			// something inserted it before us
+		}
+
+		$fetch = $this->dbConnection->getQueryBuilder();
+		$fetch->select('id')
+			->from('mimetypes')
+			->where(
+				$fetch->expr()->eq('mimetype', $fetch->createNamedParameter($mimetype)
+			));
+		$row = $fetch->execute()->fetch();
+
+		$this->mimetypes[$row['id']] = $mimetype;
+		$this->mimetypeIds[$mimetype] = $row['id'];
+		return $row['id'];
+	}
+
+	/**
+	 * Load all mimetypes from DB
+	 */
+	private function loadMimetypes() {
+		$qb = $this->dbConnection->getQueryBuilder();
+		$qb->select('id', 'mimetype')
+			->from('mimetypes');
+		$results = $qb->execute()->fetchAll();
+
+		foreach ($results as $row) {
+			$this->mimetypes[$row['id']] = $row['mimetype'];
+			$this->mimetypeIds[$row['mimetype']] = $row['id'];
+		}
+	}
+
+	/**
+	 * Update filecache mimetype based on file extension
+	 *
+	 * @param string $ext file extension
+	 * @param int $mimetypeId
+	 * @return int number of changed rows
+	 */
+	public function updateFilecache($ext, $mimetypeId) {
+		$update = $this->dbConnection->getQueryBuilder();
+		$update->update('filecache')
+			->set('mimetype', $update->createNamedParameter($mimetypeId))
+			->where($update->expr()->neq(
+				'mimetype', $update->createNamedParameter($mimetypeId)
+			))
+			->andWhere($update->expr()->like(
+				$update->createFunction('LOWER(`name`)'), $update->createNamedParameter($ext)
+			));
+		return $update->execute();
+	}
+
+}
diff --git a/lib/private/http/client/client.php b/lib/private/http/client/client.php
index fb3e06f3c4..b0aff10a41 100644
--- a/lib/private/http/client/client.php
+++ b/lib/private/http/client/client.php
@@ -120,7 +120,8 @@ class Client implements IClient {
 	 */
 	public function get($uri, array $options = []) {
 		$response = $this->client->get($uri, $options);
-		return new Response($response);
+		$isStream = isset($options['stream']) && $options['stream'];
+		return new Response($response, $isStream);
 	}
 
 	/**
@@ -144,6 +145,7 @@ class Client implements IClient {
 	 *              'debug' => true,
 	 *              'timeout' => 5,
 	 * @return Response
+	 * @throws \Exception If the request could not get completed
 	 */
 	public function head($uri, $options = []) {
 		$response = $this->client->head($uri, $options);
@@ -176,6 +178,7 @@ class Client implements IClient {
 	 *              'debug' => true,
 	 *              'timeout' => 5,
 	 * @return Response
+	 * @throws \Exception If the request could not get completed
 	 */
 	public function post($uri, array $options = []) {
 		$response = $this->client->post($uri, $options);
@@ -208,6 +211,7 @@ class Client implements IClient {
 	 *              'debug' => true,
 	 *              'timeout' => 5,
 	 * @return Response
+	 * @throws \Exception If the request could not get completed
 	 */
 	public function put($uri, array $options = []) {
 		$response = $this->client->put($uri, $options);
@@ -240,6 +244,7 @@ class Client implements IClient {
 	 *              'debug' => true,
 	 *              'timeout' => 5,
 	 * @return Response
+	 * @throws \Exception If the request could not get completed
 	 */
 	public function delete($uri, array $options = []) {
 		$response = $this->client->delete($uri, $options);
@@ -273,6 +278,7 @@ class Client implements IClient {
 	 *              'debug' => true,
 	 *              'timeout' => 5,
 	 * @return Response
+	 * @throws \Exception If the request could not get completed
 	 */
 	public function options($uri, array $options = []) {
 		$response = $this->client->options($uri, $options);
diff --git a/lib/private/http/client/response.php b/lib/private/http/client/response.php
index 4e9df51d77..558482491d 100644
--- a/lib/private/http/client/response.php
+++ b/lib/private/http/client/response.php
@@ -34,17 +34,26 @@ class Response implements IResponse {
 	private $response;
 
 	/**
-	 * @param GuzzleResponse $response
+	 * @var bool
 	 */
-	public function __construct(GuzzleResponse $response) {
+	private $stream;
+
+	/**
+	 * @param GuzzleResponse $response
+	 * @param bool $stream
+	 */
+	public function __construct(GuzzleResponse $response, $stream = false) {
 		$this->response = $response;
+		$this->stream = $stream;
 	}
 
 	/**
-	 * @return string
+	 * @return string|resource
 	 */
 	public function getBody() {
-		return $this->response->getBody()->getContents();
+		return $this->stream ?
+			$this->response->getBody()->detach():
+			$this->response->getBody()->getContents();
 	}
 
 	/**
diff --git a/lib/private/json.php b/lib/private/json.php
index e32e937c01..ac72f02f60 100644
--- a/lib/private/json.php
+++ b/lib/private/json.php
@@ -167,6 +167,6 @@ class OC_JSON{
 		if (is_array($data)) {
 			array_walk_recursive($data, array('OC_JSON', 'to_string'));
 		}
-		return json_encode($data);
+		return json_encode($data, JSON_HEX_TAG);
 	}
 }
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index d367dbae69..168011cfce 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -81,14 +81,11 @@ class OC_L10N implements \OCP\IL10N {
 	 * get an L10N instance
 	 * @param string $app
 	 * @param string|null $lang
-	 * @return \OC_L10N
+	 * @return \OCP\IL10N
+	 * @deprecated Use \OC::$server->getL10NFactory()->get() instead
 	 */
 	public static function get($app, $lang=null) {
-		if (is_null($lang)) {
-			return OC::$server->getL10N($app);
-		} else {
-			return new \OC_L10N($app, $lang);
-		}
+		return \OC::$server->getL10NFactory()->get($app, $lang);
 	}
 
 	/**
@@ -449,8 +446,11 @@ class OC_L10N implements \OCP\IL10N {
 			return self::$language;
 		}
 
-		if(OC_User::getUser() && \OC::$server->getConfig()->getUserValue(OC_User::getUser(), 'core', 'lang')) {
-			$lang = \OC::$server->getConfig()->getUserValue(OC_User::getUser(), 'core', 'lang');
+		$config = \OC::$server->getConfig();
+		$userId = \OC_User::getUser();
+
+		if($userId && $config->getUserValue($userId, 'core', 'lang')) {
+			$lang = $config->getUserValue($userId, 'core', 'lang');
 			self::$language = $lang;
 			if(is_array($app)) {
 				$available = $app;
@@ -463,13 +463,18 @@ class OC_L10N implements \OCP\IL10N {
 			}
 		}
 
-		$default_language = \OC::$server->getConfig()->getSystemValue('default_language', false);
+		$default_language = $config->getSystemValue('default_language', false);
 
 		if($default_language !== false) {
 			return $default_language;
 		}
 
-		return self::setLanguageFromRequest($app);
+		$lang = self::setLanguageFromRequest($app);
+		if($userId && !$config->getUserValue($userId, 'core', 'lang')) {
+			$config->setUserValue($userId, 'core', 'lang', $lang);
+		}
+
+		return $lang;
 	}
 
 	/**
diff --git a/lib/private/l10n/factory.php b/lib/private/l10n/factory.php
index 4424d014f4..a9ac4da42a 100644
--- a/lib/private/l10n/factory.php
+++ b/lib/private/l10n/factory.php
@@ -25,29 +25,35 @@
 
 namespace OC\L10N;
 
+use OCP\L10N\IFactory;
+
 /**
- * TODO: Description
+ * A factory that generates language instances
  */
-class Factory {
+class Factory implements IFactory {
 	/**
 	 * cached instances
 	 */
 	protected $instances = array();
 
 	/**
-	 * get an L10N instance
+	 * Get a language instance
 	 *
 	 * @param string $app
 	 * @param string|null $lang
-	 * @return \OC_L10N
+	 * @return \OCP\IL10N
 	 */
 	public function get($app, $lang = null) {
-		if (!is_null($lang)) {
-			return new \OC_L10N($app, $lang);
-		} else if (!isset($this->instances[$app])) {
-			$this->instances[$app] = new \OC_L10N($app);
+		$key = $lang;
+		if ($key === null) {
+			$key = 'null';
 		}
-		return $this->instances[$app];
+
+		if (!isset($this->instances[$key][$app])) {
+			$this->instances[$key][$app] = new \OC_L10N($app, $lang);
+		}
+
+		return $this->instances[$key][$app];
 	}
 
 }
diff --git a/lib/private/lock/abstractlockingprovider.php b/lib/private/lock/abstractlockingprovider.php
new file mode 100644
index 0000000000..eb86be6850
--- /dev/null
+++ b/lib/private/lock/abstractlockingprovider.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Lock;
+
+use OCP\Lock\ILockingProvider;
+
+/**
+ * Base locking provider that keeps track of locks acquired during the current request
+ * to release any left over locks at the end of the request
+ */
+abstract class AbstractLockingProvider implements ILockingProvider {
+	protected $acquiredLocks = [
+		'shared' => [],
+		'exclusive' => []
+	];
+
+	/**
+	 * Mark a locally acquired lock
+	 *
+	 * @param string $path
+	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+	 */
+	protected function markAcquire($path, $type) {
+		if ($type === self::LOCK_SHARED) {
+			if (!isset($this->acquiredLocks['shared'][$path])) {
+				$this->acquiredLocks['shared'][$path] = 0;
+			}
+			$this->acquiredLocks['shared'][$path]++;
+		} else {
+			$this->acquiredLocks['exclusive'][$path] = true;
+		}
+	}
+
+	/**
+	 * Mark a release of a locally acquired lock
+	 *
+	 * @param string $path
+	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+	 */
+	protected function markRelease($path, $type) {
+		if ($type === self::LOCK_SHARED) {
+			if (isset($this->acquiredLocks['shared'][$path]) and $this->acquiredLocks['shared'][$path] > 0) {
+				$this->acquiredLocks['shared'][$path]--;
+			}
+		} else if ($type === self::LOCK_EXCLUSIVE) {
+			unset($this->acquiredLocks['exclusive'][$path]);
+		}
+	}
+
+	/**
+	 * Change the type of an existing tracked lock
+	 *
+	 * @param string $path
+	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+	 */
+	protected function markChange($path, $targetType) {
+		if ($targetType === self::LOCK_SHARED) {
+			unset($this->acquiredLocks['exclusive'][$path]);
+			if (!isset($this->acquiredLocks['shared'][$path])) {
+				$this->acquiredLocks['shared'][$path] = 0;
+			}
+			$this->acquiredLocks['shared'][$path]++;
+		} else if ($targetType === self::LOCK_EXCLUSIVE) {
+			$this->acquiredLocks['exclusive'][$path] = true;
+			$this->acquiredLocks['shared'][$path]--;
+		}
+	}
+
+	/**
+	 * release all lock acquired by this instance which were marked using the mark* methods
+	 */
+	public function releaseAll() {
+		foreach ($this->acquiredLocks['shared'] as $path => $count) {
+			for ($i = 0; $i < $count; $i++) {
+				$this->releaseLock($path, self::LOCK_SHARED);
+			}
+		}
+
+		foreach ($this->acquiredLocks['exclusive'] as $path => $hasLock) {
+			$this->releaseLock($path, self::LOCK_EXCLUSIVE);
+		}
+	}
+}
diff --git a/lib/private/lock/dblockingprovider.php b/lib/private/lock/dblockingprovider.php
new file mode 100644
index 0000000000..f3e684d0b4
--- /dev/null
+++ b/lib/private/lock/dblockingprovider.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * @author Robin Appelman <icewind@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Lock;
+
+use OCP\IDBConnection;
+use OCP\ILogger;
+use OCP\Lock\LockedException;
+
+/**
+ * Locking provider that stores the locks in the database
+ */
+class DBLockingProvider extends AbstractLockingProvider {
+	/**
+	 * @var \OCP\IDBConnection
+	 */
+	private $connection;
+
+	/**
+	 * @var \OCP\ILogger
+	 */
+	private $logger;
+
+	/**
+	 * @param \OCP\IDBConnection $connection
+	 * @param \OCP\ILogger $logger
+	 */
+	public function __construct(IDBConnection $connection, ILogger $logger) {
+		$this->connection = $connection;
+		$this->logger = $logger;
+	}
+
+	protected function initLockField($path) {
+		$this->connection->insertIfNotExist('*PREFIX*file_locks', ['key' => $path, 'lock' => 0, 'ttl' => 0], ['key']);
+	}
+
+	/**
+	 * @param string $path
+	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+	 * @return bool
+	 */
+	public function isLocked($path, $type) {
+		$query = $this->connection->prepare('SELECT `lock` from `*PREFIX*file_locks` WHERE `key` = ?');
+		$query->execute([$path]);
+		$lockValue = (int)$query->fetchColumn();
+		if ($type === self::LOCK_SHARED) {
+			return $lockValue > 0;
+		} else if ($type === self::LOCK_EXCLUSIVE) {
+			return $lockValue === -1;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * @param string $path
+	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+	 * @throws \OCP\Lock\LockedException
+	 */
+	public function acquireLock($path, $type) {
+		if ($this->connection->inTransaction()){
+			$this->logger->warning("Trying to acquire a lock for '$path' while inside a transition");
+		}
+
+		$this->connection->beginTransaction();
+		$this->initLockField($path);
+		if ($type === self::LOCK_SHARED) {
+			$result = $this->connection->executeUpdate(
+				'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` + 1 WHERE `key` = ? AND `lock` >= 0',
+				[$path]
+			);
+		} else {
+			$result = $this->connection->executeUpdate(
+				'UPDATE `*PREFIX*file_locks` SET `lock` = -1 WHERE `key` = ? AND `lock` = 0',
+				[$path]
+			);
+		}
+		$this->connection->commit();
+		if ($result !== 1) {
+			throw new LockedException($path);
+		}
+		$this->markAcquire($path, $type);
+	}
+
+	/**
+	 * @param string $path
+	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+	 */
+	public function releaseLock($path, $type) {
+		$this->initLockField($path);
+		if ($type === self::LOCK_SHARED) {
+			$this->connection->executeUpdate(
+				'UPDATE `*PREFIX*file_locks` SET `lock` = `lock` - 1 WHERE `key` = ? AND `lock` > 0',
+				[$path]
+			);
+		} else {
+			$this->connection->executeUpdate(
+				'UPDATE `*PREFIX*file_locks` SET `lock` = 0 WHERE `key` = ? AND `lock` = -1',
+				[$path]
+			);
+		}
+
+		$this->markRelease($path, $type);
+	}
+
+	/**
+	 * Change the type of an existing lock
+	 *
+	 * @param string $path
+	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+	 * @throws \OCP\Lock\LockedException
+	 */
+	public function changeLock($path, $targetType) {
+		$this->initLockField($path);
+		if ($targetType === self::LOCK_SHARED) {
+			$result = $this->connection->executeUpdate(
+				'UPDATE `*PREFIX*file_locks` SET `lock` = 1 WHERE `key` = ? AND `lock` = -1',
+				[$path]
+			);
+		} else {
+			$result = $this->connection->executeUpdate(
+				'UPDATE `*PREFIX*file_locks` SET `lock` = -1 WHERE `key` = ? AND `lock` = 1',
+				[$path]
+			);
+		}
+		if ($result !== 1) {
+			throw new LockedException($path);
+		}
+		$this->markChange($path, $targetType);
+	}
+
+	/**
+	 * cleanup empty locks
+	 */
+	public function cleanEmptyLocks() {
+		$this->connection->executeUpdate(
+			'DELETE FROM `*PREFIX*file_locks` WHERE `lock` = 0'
+		);
+	}
+
+	public function __destruct() {
+		$this->cleanEmptyLocks();
+	}
+}
diff --git a/lib/private/lock/memcachelockingprovider.php b/lib/private/lock/memcachelockingprovider.php
index 5f2b5e5a4b..871572f7e3 100644
--- a/lib/private/lock/memcachelockingprovider.php
+++ b/lib/private/lock/memcachelockingprovider.php
@@ -23,21 +23,15 @@
 
 namespace OC\Lock;
 
-use OCP\Lock\ILockingProvider;
 use OCP\Lock\LockedException;
 use OCP\IMemcache;
 
-class MemcacheLockingProvider implements ILockingProvider {
+class MemcacheLockingProvider extends AbstractLockingProvider {
 	/**
 	 * @var \OCP\IMemcache
 	 */
 	private $memcache;
 
-	private $acquiredLocks = [
-		'shared' => [],
-		'exclusive' => []
-	];
-
 	/**
 	 * @param \OCP\IMemcache $memcache
 	 */
@@ -71,17 +65,13 @@ class MemcacheLockingProvider implements ILockingProvider {
 			if (!$this->memcache->inc($path)) {
 				throw new LockedException($path);
 			}
-			if (!isset($this->acquiredLocks['shared'][$path])) {
-				$this->acquiredLocks['shared'][$path] = 0;
-			}
-			$this->acquiredLocks['shared'][$path]++;
 		} else {
 			$this->memcache->add($path, 0);
 			if (!$this->memcache->cas($path, 0, 'exclusive')) {
 				throw new LockedException($path);
 			}
-			$this->acquiredLocks['exclusive'][$path] = true;
 		}
+		$this->markAcquire($path, $type);
 	}
 
 	/**
@@ -92,13 +82,12 @@ class MemcacheLockingProvider implements ILockingProvider {
 		if ($type === self::LOCK_SHARED) {
 			if (isset($this->acquiredLocks['shared'][$path]) and $this->acquiredLocks['shared'][$path] > 0) {
 				$this->memcache->dec($path);
-				$this->acquiredLocks['shared'][$path]--;
 				$this->memcache->cad($path, 0);
 			}
 		} else if ($type === self::LOCK_EXCLUSIVE) {
 			$this->memcache->cad($path, 'exclusive');
-			unset($this->acquiredLocks['exclusive'][$path]);
 		}
+		$this->markRelease($path, $type);
 	}
 
 	/**
@@ -113,33 +102,12 @@ class MemcacheLockingProvider implements ILockingProvider {
 			if (!$this->memcache->cas($path, 'exclusive', 1)) {
 				throw new LockedException($path);
 			}
-			unset($this->acquiredLocks['exclusive'][$path]);
-			if (!isset($this->acquiredLocks['shared'][$path])) {
-				$this->acquiredLocks['shared'][$path] = 0;
-			}
-			$this->acquiredLocks['shared'][$path]++;
 		} else if ($targetType === self::LOCK_EXCLUSIVE) {
 			// we can only change a shared lock to an exclusive if there's only a single owner of the shared lock
 			if (!$this->memcache->cas($path, 1, 'exclusive')) {
 				throw new LockedException($path);
 			}
-			$this->acquiredLocks['exclusive'][$path] = true;
-			$this->acquiredLocks['shared'][$path]--;
-		}
-	}
-
-	/**
-	 * release all lock acquired by this instance
-	 */
-	public function releaseAll() {
-		foreach ($this->acquiredLocks['shared'] as $path => $count) {
-			for ($i = 0; $i < $count; $i++) {
-				$this->releaseLock($path, self::LOCK_SHARED);
-			}
-		}
-
-		foreach ($this->acquiredLocks['exclusive'] as $path => $hasLock) {
-			$this->releaseLock($path, self::LOCK_EXCLUSIVE);
 		}
+		$this->markChange($path, $targetType);
 	}
 }
diff --git a/lib/private/memcache/memcached.php b/lib/private/memcache/memcached.php
index 1503851fd7..e99303ecc1 100644
--- a/lib/private/memcache/memcached.php
+++ b/lib/private/memcache/memcached.php
@@ -89,6 +89,11 @@ class Memcached extends Cache implements IMemcache {
 	public function clear($prefix = '') {
 		$prefix = $this->getNamespace() . $prefix;
 		$allKeys = self::$cache->getAllKeys();
+		if ($allKeys === false) {
+			// newer Memcached doesn't like getAllKeys(), flush everything
+			self::$cache->flush();
+			return true;
+		}
 		$keys = array();
 		$prefixLength = strlen($prefix);
 		foreach ($allKeys as $key) {
diff --git a/lib/private/notification/action.php b/lib/private/notification/action.php
new file mode 100644
index 0000000000..6de8a1a4bb
--- /dev/null
+++ b/lib/private/notification/action.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Notification;
+
+
+class Action implements IAction {
+
+	/** @var string */
+	protected $label;
+
+	/** @var string */
+	protected $labelParsed;
+
+	/** @var string */
+	protected $link;
+
+	/** @var string */
+	protected $requestType;
+
+	/** @var string */
+	protected $icon;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		$this->label = '';
+		$this->labelParsed = '';
+		$this->link = '';
+		$this->requestType = '';
+		$this->icon = '';
+	}
+
+	/**
+	 * @param string $label
+	 * @return $this
+	 * @throws \InvalidArgumentException if the label is invalid
+	 * @since 8.2.0
+	 */
+	public function setLabel($label) {
+		if (!is_string($label) || $label === '' || isset($label[32])) {
+			throw new \InvalidArgumentException('The given label is invalid');
+		}
+		$this->label = $label;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLabel() {
+		return $this->label;
+	}
+
+	/**
+	 * @param string $label
+	 * @return $this
+	 * @throws \InvalidArgumentException if the label is invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedLabel($label) {
+		if (!is_string($label) || $label === '') {
+			throw new \InvalidArgumentException('The given parsed label is invalid');
+		}
+		$this->labelParsed = $label;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedLabel() {
+		return $this->labelParsed;
+	}
+
+	/**
+	 * @param string $link
+	 * @param string $requestType
+	 * @return $this
+	 * @throws \InvalidArgumentException if the link is invalid
+	 * @since 8.2.0
+	 */
+	public function setLink($link, $requestType) {
+		if (!is_string($link) || $link === '' || isset($link[256])) {
+			throw new \InvalidArgumentException('The given link is invalid');
+		}
+		if (!in_array($requestType, ['GET', 'POST', 'PUT', 'DELETE'], true)) {
+			throw new \InvalidArgumentException('The given request type is invalid');
+		}
+		$this->link = $link;
+		$this->requestType = $requestType;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLink() {
+		return $this->link;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getRequestType() {
+		return $this->requestType;
+	}
+
+	/**
+	 * @param string $icon
+	 * @return $this
+	 * @throws \InvalidArgumentException if the icon is invalid
+	 * @since 8.2.0
+	 */
+	public function setIcon($icon) {
+		if (!is_string($icon) || $icon === '' || isset($icon[64])) {
+			throw new \InvalidArgumentException('The given icon is invalid');
+		}
+		$this->icon = $icon;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getIcon() {
+		return $this->icon;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isValid() {
+		return $this->label !== '' && $this->link !== '';
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isValidParsed() {
+		return $this->labelParsed !== '' && $this->link !== '';
+	}
+}
diff --git a/lib/private/notification/iaction.php b/lib/private/notification/iaction.php
new file mode 100644
index 0000000000..da6728f5c5
--- /dev/null
+++ b/lib/private/notification/iaction.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Notification;
+
+/**
+ * Interface IAction
+ *
+ * @package OC\Notification
+ * @since 8.2.0
+ *
+ * DEVELOPER NOTE:
+ * The notification api is experimental only in 8.2.0! Do not start using it,
+ * if you can not prepare an update for the next version afterwards.
+ */
+interface IAction {
+	/**
+	 * @param string $label
+	 * @return $this
+	 * @throws \InvalidArgumentException if the label is invalid
+	 * @since 8.2.0
+	 */
+	public function setLabel($label);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLabel();
+
+	/**
+	 * @param string $label
+	 * @return $this
+	 * @throws \InvalidArgumentException if the label is invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedLabel($label);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedLabel();
+
+	/**
+	 * @param string $link
+	 * @param string $requestType
+	 * @return $this
+	 * @throws \InvalidArgumentException if the link is invalid
+	 * @since 8.2.0
+	 */
+	public function setLink($link, $requestType);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLink();
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getRequestType();
+
+	/**
+	 * @param string $icon
+	 * @return $this
+	 * @throws \InvalidArgumentException if the icon is invalid
+	 * @since 8.2.0
+	 */
+	public function setIcon($icon);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getIcon();
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function isValid();
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function isValidParsed();
+}
diff --git a/lib/private/notification/iapp.php b/lib/private/notification/iapp.php
new file mode 100644
index 0000000000..eda66423f3
--- /dev/null
+++ b/lib/private/notification/iapp.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Notification;
+
+/**
+ * Interface IApp
+ *
+ * @package OC\Notification
+ * @since 8.2.0
+ *
+ * DEVELOPER NOTE:
+ * The notification api is experimental only in 8.2.0! Do not start using it,
+ * if you can not prepare an update for the next version afterwards.
+ */
+interface IApp {
+	/**
+	 * @param INotification $notification
+	 * @return null
+	 * @throws \InvalidArgumentException When the notification is not valid
+	 * @since 8.2.0
+	 */
+	public function notify(INotification $notification);
+
+	/**
+	 * @param INotification $notification
+	 * @return null
+	 * @since 8.2.0
+	 */
+	public function markProcessed(INotification $notification);
+
+	/**
+	 * @param INotification $notification
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getCount(INotification $notification);
+}
diff --git a/lib/private/notification/imanager.php b/lib/private/notification/imanager.php
new file mode 100644
index 0000000000..0cd92b3325
--- /dev/null
+++ b/lib/private/notification/imanager.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Notification;
+
+/**
+ * Interface IManager
+ *
+ * @package OC\Notification
+ * @since 8.2.0
+ *
+ * DEVELOPER NOTE:
+ * The notification api is experimental only in 8.2.0! Do not start using it,
+ * if you can not prepare an update for the next version afterwards.
+ */
+interface IManager extends IApp, INotifier {
+	/**
+	 * @param \Closure $service The service must implement IApp, otherwise a
+	 *                          \InvalidArgumentException is thrown later
+	 * @return null
+	 * @since 8.2.0
+	 */
+	public function registerApp(\Closure $service);
+
+	/**
+	 * @param \Closure $service The service must implement INotifier, otherwise a
+	 *                          \InvalidArgumentException is thrown later
+	 * @return null
+	 * @since 8.2.0
+	 */
+	public function registerNotifier(\Closure $service);
+
+	/**
+	 * @return INotification
+	 * @since 8.2.0
+	 */
+	public function createNotification();
+}
diff --git a/lib/private/notification/inotification.php b/lib/private/notification/inotification.php
new file mode 100644
index 0000000000..faf5db1d24
--- /dev/null
+++ b/lib/private/notification/inotification.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Notification;
+
+/**
+ * Interface INotification
+ *
+ * @package OC\Notification
+ * @since 8.2.0
+ *
+ * DEVELOPER NOTE:
+ * The notification api is experimental only in 8.2.0! Do not start using it,
+ * if you can not prepare an update for the next version afterwards.
+ */
+interface INotification {
+	/**
+	 * @param string $app
+	 * @return $this
+	 * @throws \InvalidArgumentException if the app id are invalid
+	 * @since 8.2.0
+	 */
+	public function setApp($app);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getApp();
+
+	/**
+	 * @param string $user
+	 * @return $this
+	 * @throws \InvalidArgumentException if the user id are invalid
+	 * @since 8.2.0
+	 */
+	public function setUser($user);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getUser();
+
+	/**
+	 * @param int $timestamp
+	 * @return $this
+	 * @throws \InvalidArgumentException if the timestamp are invalid
+	 * @since 8.2.0
+	 */
+	public function setTimestamp($timestamp);
+
+	/**
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getTimestamp();
+
+	/**
+	 * @param string $type
+	 * @param int $id
+	 * @return $this
+	 * @throws \InvalidArgumentException if the object type or id are invalid
+	 * @since 8.2.0
+	 */
+	public function setObject($type, $id);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getObjectType();
+
+	/**
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getObjectId();
+
+	/**
+	 * @param string $subject
+	 * @param array $parameters
+	 * @return $this
+	 * @throws \InvalidArgumentException if the subject or parameters are invalid
+	 * @since 8.2.0
+	 */
+	public function setSubject($subject, array $parameters = []);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getSubject();
+
+	/**
+	 * @return string[]
+	 * @since 8.2.0
+	 */
+	public function getSubjectParameters();
+
+	/**
+	 * @param string $subject
+	 * @return $this
+	 * @throws \InvalidArgumentException if the subject are invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedSubject($subject);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedSubject();
+
+	/**
+	 * @param string $message
+	 * @param array $parameters
+	 * @return $this
+	 * @throws \InvalidArgumentException if the message or parameters are invalid
+	 * @since 8.2.0
+	 */
+	public function setMessage($message, array $parameters = []);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getMessage();
+
+	/**
+	 * @return string[]
+	 * @since 8.2.0
+	 */
+	public function getMessageParameters();
+
+	/**
+	 * @param string $message
+	 * @return $this
+	 * @throws \InvalidArgumentException if the message are invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedMessage($message);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedMessage();
+
+	/**
+	 * @param string $link
+	 * @return $this
+	 * @throws \InvalidArgumentException if the link are invalid
+	 * @since 8.2.0
+	 */
+	public function setLink($link);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLink();
+
+	/**
+	 * @param string $icon
+	 * @return $this
+	 * @throws \InvalidArgumentException if the icon are invalid
+	 * @since 8.2.0
+	 */
+	public function setIcon($icon);
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getIcon();
+
+	/**
+	 * @return IAction
+	 * @since 8.2.0
+	 */
+	public function createAction();
+
+	/**
+	 * @param IAction $action
+	 * @return $this
+	 * @throws \InvalidArgumentException if the action are invalid
+	 * @since 8.2.0
+	 */
+	public function addAction(IAction $action);
+
+	/**
+	 * @return IAction[]
+	 * @since 8.2.0
+	 */
+	public function getActions();
+
+	/**
+	 * @param IAction $action
+	 * @return $this
+	 * @throws \InvalidArgumentException if the action are invalid
+	 * @since 8.2.0
+	 */
+	public function addParsedAction(IAction $action);
+
+	/**
+	 * @return IAction[]
+	 * @since 8.2.0
+	 */
+	public function getParsedActions();
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function isValid();
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function isValidParsed();
+}
diff --git a/lib/private/notification/inotifier.php b/lib/private/notification/inotifier.php
new file mode 100644
index 0000000000..22531229e3
--- /dev/null
+++ b/lib/private/notification/inotifier.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Notification;
+
+/**
+ * Interface INotifier
+ *
+ * @package OC\Notification
+ * @since 8.2.0
+ *
+ * DEVELOPER NOTE:
+ * The notification api is experimental only in 8.2.0! Do not start using it,
+ * if you can not prepare an update for the next version afterwards.
+ */
+interface INotifier {
+	/**
+	 * @param INotification $notification
+	 * @param string $languageCode The code of the language that should be used to prepare the notification
+	 * @return INotification
+	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+	 * @since 8.2.0
+	 */
+	public function prepare(INotification $notification, $languageCode);
+}
diff --git a/lib/private/notification/manager.php b/lib/private/notification/manager.php
new file mode 100644
index 0000000000..9635925e38
--- /dev/null
+++ b/lib/private/notification/manager.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Notification;
+
+
+class Manager implements IManager {
+	/** @var IApp */
+	protected $apps;
+
+	/** @var INotifier */
+	protected $notifiers;
+
+	/** @var \Closure */
+	protected $appsClosures;
+
+	/** @var \Closure */
+	protected $notifiersClosures;
+
+	public function __construct() {
+		$this->apps = [];
+		$this->notifiers = [];
+		$this->appsClosures = [];
+		$this->notifiersClosures = [];
+	}
+
+	/**
+	 * @param \Closure $service The service must implement IApp, otherwise a
+	 *                          \InvalidArgumentException is thrown later
+	 * @return null
+	 * @since 8.2.0
+	 */
+	public function registerApp(\Closure $service) {
+		$this->appsClosures[] = $service;
+		$this->apps = [];
+	}
+
+	/**
+	 * @param \Closure $service The service must implement INotifier, otherwise a
+	 *                          \InvalidArgumentException is thrown later
+	 * @return null
+	 * @since 8.2.0
+	 */
+	public function registerNotifier(\Closure $service) {
+		$this->notifiersClosures[] = $service;
+		$this->notifiers = [];
+	}
+
+	/**
+	 * @return IApp[]
+	 */
+	protected function getApps() {
+		if (!empty($this->apps)) {
+			return $this->apps;
+		}
+
+		$this->apps = [];
+		foreach ($this->appsClosures as $closure) {
+			$app = $closure();
+			if (!($app instanceof IApp)) {
+				throw new \InvalidArgumentException('The given notification app does not implement the IApp interface');
+			}
+			$this->apps[] = $app;
+		}
+
+		return $this->apps;
+	}
+
+	/**
+	 * @return INotifier[]
+	 */
+	protected function getNotifiers() {
+		if (!empty($this->notifiers)) {
+			return $this->notifiers;
+		}
+
+		$this->notifiers = [];
+		foreach ($this->notifiersClosures as $closure) {
+			$notifier = $closure();
+			if (!($notifier instanceof INotifier)) {
+				throw new \InvalidArgumentException('The given notification app does not implement the INotifier interface');
+			}
+			$this->notifiers[] = $notifier;
+		}
+
+		return $this->notifiers;
+	}
+
+	/**
+	 * @return INotification
+	 * @since 8.2.0
+	 */
+	public function createNotification() {
+		return new Notification();
+	}
+
+	/**
+	 * @param INotification $notification
+	 * @return null
+	 * @throws \InvalidArgumentException When the notification is not valid
+	 * @since 8.2.0
+	 */
+	public function notify(INotification $notification) {
+		if (!$notification->isValid()) {
+			throw new \InvalidArgumentException('The given notification is invalid');
+		}
+
+		$apps = $this->getApps();
+
+		foreach ($apps as $app) {
+			try {
+				$app->notify($notification);
+			} catch (\InvalidArgumentException $e) {
+			}
+		}
+	}
+
+	/**
+	 * @param INotification $notification
+	 * @param string $languageCode The code of the language that should be used to prepare the notification
+	 * @return INotification
+	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+	 * @since 8.2.0
+	 */
+	public function prepare(INotification $notification, $languageCode) {
+		$notifiers = $this->getNotifiers();
+
+		foreach ($notifiers as $notifier) {
+			try {
+				$notification = $notifier->prepare($notification, $languageCode);
+			} catch (\InvalidArgumentException $e) {
+				continue;
+			}
+
+			if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
+				throw new \InvalidArgumentException('The given notification has not been handled');
+			}
+		}
+
+		if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
+			throw new \InvalidArgumentException('The given notification has not been handled');
+		}
+
+		return $notification;
+	}
+
+	/**
+	 * @param INotification $notification
+	 * @return null
+	 */
+	public function markProcessed(INotification $notification) {
+		$apps = $this->getApps();
+
+		foreach ($apps as $app) {
+			$app->markProcessed($notification);
+		}
+	}
+
+	/**
+	 * @param INotification $notification
+	 * @return int
+	 */
+	public function getCount(INotification $notification) {
+		$apps = $this->getApps();
+
+		$count = 0;
+		foreach ($apps as $app) {
+			$count += $app->getCount($notification);
+		}
+
+		return $count;
+	}
+}
diff --git a/lib/private/notification/notification.php b/lib/private/notification/notification.php
new file mode 100644
index 0000000000..40fe39a956
--- /dev/null
+++ b/lib/private/notification/notification.php
@@ -0,0 +1,446 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Notification;
+
+
+class Notification implements INotification {
+	/** @var string */
+	protected $app;
+
+	/** @var string */
+	protected $user;
+
+	/** @var int */
+	protected $timestamp;
+
+	/** @var string */
+	protected $objectType;
+
+	/** @var int */
+	protected $objectId;
+
+	/** @var string */
+	protected $subject;
+
+	/** @var array */
+	protected $subjectParameters;
+
+	/** @var string */
+	protected $subjectParsed;
+
+	/** @var string */
+	protected $message;
+
+	/** @var array */
+	protected $messageParameters;
+
+	/** @var string */
+	protected $messageParsed;
+
+	/** @var string */
+	protected $link;
+
+	/** @var string */
+	protected $icon;
+
+	/** @var array */
+	protected $actions;
+
+	/** @var array */
+	protected $actionsParsed;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		$this->app = '';
+		$this->user = '';
+		$this->timestamp = 0;
+		$this->objectType = '';
+		$this->objectId = 0;
+		$this->subject = '';
+		$this->subjectParameters = [];
+		$this->subjectParsed = '';
+		$this->message = '';
+		$this->messageParameters = [];
+		$this->messageParsed = '';
+		$this->link = '';
+		$this->icon = '';
+		$this->actions = [];
+		$this->actionsParsed = [];
+	}
+
+	/**
+	 * @param string $app
+	 * @return $this
+	 * @throws \InvalidArgumentException if the app id is invalid
+	 * @since 8.2.0
+	 */
+	public function setApp($app) {
+		if (!is_string($app) || $app === '' || isset($app[32])) {
+			throw new \InvalidArgumentException('The given app name is invalid');
+		}
+		$this->app = $app;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getApp() {
+		return $this->app;
+	}
+
+	/**
+	 * @param string $user
+	 * @return $this
+	 * @throws \InvalidArgumentException if the user id is invalid
+	 * @since 8.2.0
+	 */
+	public function setUser($user) {
+		if (!is_string($user) || $user === '' || isset($user[64])) {
+			throw new \InvalidArgumentException('The given user id is invalid');
+		}
+		$this->user = $user;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getUser() {
+		return $this->user;
+	}
+
+	/**
+	 * @param int $timestamp
+	 * @return $this
+	 * @throws \InvalidArgumentException if the timestamp is invalid
+	 * @since 8.2.0
+	 */
+	public function setTimestamp($timestamp) {
+		if (!is_int($timestamp)) {
+			throw new \InvalidArgumentException('The given timestamp is invalid');
+		}
+		$this->timestamp = $timestamp;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getTimestamp() {
+		return $this->timestamp;
+	}
+
+	/**
+	 * @param string $type
+	 * @param int $id
+	 * @return $this
+	 * @throws \InvalidArgumentException if the object type or id is invalid
+	 * @since 8.2.0
+	 */
+	public function setObject($type, $id) {
+		if (!is_string($type) || $type === '' || isset($type[64])) {
+			throw new \InvalidArgumentException('The given object type is invalid');
+		}
+		$this->objectType = $type;
+
+		if (!is_int($id)) {
+			throw new \InvalidArgumentException('The given object id is invalid');
+		}
+		$this->objectId = $id;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getObjectType() {
+		return $this->objectType;
+	}
+
+	/**
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getObjectId() {
+		return $this->objectId;
+	}
+
+	/**
+	 * @param string $subject
+	 * @param array $parameters
+	 * @return $this
+	 * @throws \InvalidArgumentException if the subject or parameters are invalid
+	 * @since 8.2.0
+	 */
+	public function setSubject($subject, array $parameters = []) {
+		if (!is_string($subject) || $subject === '' || isset($subject[64])) {
+			throw new \InvalidArgumentException('The given subject is invalid');
+		}
+		$this->subject = $subject;
+
+		if (!is_array($parameters)) {
+			throw new \InvalidArgumentException('The given subject parameters are invalid');
+		}
+		$this->subjectParameters = $parameters;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getSubject() {
+		return $this->subject;
+	}
+
+	/**
+	 * @return string[]
+	 * @since 8.2.0
+	 */
+	public function getSubjectParameters() {
+		return $this->subjectParameters;
+	}
+
+	/**
+	 * @param string $subject
+	 * @return $this
+	 * @throws \InvalidArgumentException if the subject are invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedSubject($subject) {
+		if (!is_string($subject) || $subject === '') {
+			throw new \InvalidArgumentException('The given parsed subject is invalid');
+		}
+		$this->subjectParsed = $subject;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedSubject() {
+		return $this->subjectParsed;
+	}
+
+	/**
+	 * @param string $message
+	 * @param array $parameters
+	 * @return $this
+	 * @throws \InvalidArgumentException if the message or parameters are invalid
+	 * @since 8.2.0
+	 */
+	public function setMessage($message, array $parameters = []) {
+		if (!is_string($message) || $message === '' || isset($message[64])) {
+			throw new \InvalidArgumentException('The given message is invalid');
+		}
+		$this->message = $message;
+
+		if (!is_array($parameters)) {
+			throw new \InvalidArgumentException('The given message parameters are invalid');
+		}
+		$this->messageParameters = $parameters;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getMessage() {
+		return $this->message;
+	}
+
+	/**
+	 * @return string[]
+	 * @since 8.2.0
+	 */
+	public function getMessageParameters() {
+		return $this->messageParameters;
+	}
+
+	/**
+	 * @param string $message
+	 * @return $this
+	 * @throws \InvalidArgumentException if the message are invalid
+	 * @since 8.2.0
+	 */
+	public function setParsedMessage($message) {
+		if (!is_string($message) || $message === '') {
+			throw new \InvalidArgumentException('The given parsed message is invalid');
+		}
+		$this->messageParsed = $message;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getParsedMessage() {
+		return $this->messageParsed;
+	}
+
+	/**
+	 * @param string $link
+	 * @return $this
+	 * @throws \InvalidArgumentException if the link are invalid
+	 * @since 8.2.0
+	 */
+	public function setLink($link) {
+		if (!is_string($link) || $link === '' || isset($link[4000])) {
+			throw new \InvalidArgumentException('The given link is invalid');
+		}
+		$this->link = $link;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getLink() {
+		return $this->link;
+	}
+
+	/**
+	 * @param string $icon
+	 * @return $this
+	 * @throws \InvalidArgumentException if the icon are invalid
+	 * @since 8.2.0
+	 */
+	public function setIcon($icon) {
+		if (!is_string($icon) || $icon === '' || isset($icon[64])) {
+			throw new \InvalidArgumentException('The given icon is invalid');
+		}
+		$this->icon = $icon;
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getIcon() {
+		return $this->icon;
+	}
+
+	/**
+	 * @return IAction
+	 * @since 8.2.0
+	 */
+	public function createAction() {
+		return new Action();
+	}
+
+	/**
+	 * @param IAction $action
+	 * @return $this
+	 * @throws \InvalidArgumentException if the action are invalid
+	 * @since 8.2.0
+	 */
+	public function addAction(IAction $action) {
+		if (!$action->isValid()) {
+			throw new \InvalidArgumentException('The given action is invalid');
+		}
+		$this->actions[] = $action;
+		return $this;
+	}
+
+	/**
+	 * @return IAction[]
+	 * @since 8.2.0
+	 */
+	public function getActions() {
+		return $this->actions;
+	}
+
+	/**
+	 * @param IAction $action
+	 * @return $this
+	 * @throws \InvalidArgumentException if the action are invalid
+	 * @since 8.2.0
+	 */
+	public function addParsedAction(IAction $action) {
+		if (!$action->isValidParsed()) {
+			throw new \InvalidArgumentException('The given parsed action is invalid');
+		}
+		$this->actionsParsed[] = $action;
+		return $this;
+	}
+
+	/**
+	 * @return IAction[]
+	 * @since 8.2.0
+	 */
+	public function getParsedActions() {
+		return $this->actionsParsed;
+	}
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function isValid() {
+		return
+			$this->isValidCommon()
+			&&
+			$this->getSubject() !== ''
+		;
+	}
+
+	/**
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function isValidParsed() {
+		return
+			$this->isValidCommon()
+			&&
+			$this->getParsedSubject() !== ''
+		;
+	}
+
+	/**
+	 * @return bool
+	 */
+	protected function isValidCommon() {
+		return
+			$this->getApp() !== ''
+			&&
+			$this->getUser() !== ''
+			&&
+			$this->getTimestamp() !== 0
+			&&
+			$this->getObjectType() !== ''
+			&&
+			$this->getObjectId() !== 0
+		;
+	}
+}
diff --git a/lib/private/preview.php b/lib/private/preview.php
index 5dcab476a4..978da1161c 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -38,6 +38,9 @@ class Preview {
 	//the thumbnail folder
 	const THUMBNAILS_FOLDER = 'thumbnails';
 
+	const MODE_FILL = 'fill';
+	const MODE_COVER = 'cover';
+
 	//config
 	private $maxScaleFactor;
 	/** @var int maximum width allowed for a preview */
@@ -56,6 +59,7 @@ class Preview {
 	private $scalingUp;
 	private $mimeType;
 	private $keepAspect = false;
+	private $mode = self::MODE_FILL;
 
 	//used to calculate the size of the preview to generate
 	/** @var int $maxPreviewWidth max width a preview can have */
@@ -331,6 +335,19 @@ class Preview {
 		return $this;
 	}
 
+	/**
+	 * Set whether to cover or fill the specified dimensions
+	 *
+	 * @param string $mode
+	 *
+	 * @return \OC\Preview
+	 */
+	public function setMode($mode) {
+		$this->mode = $mode;
+
+		return $this;
+	}
+
 	/**
 	 * Sets whether we need to generate a preview which keeps the aspect ratio of the original file
 	 *
@@ -531,14 +548,22 @@ class Preview {
 	 * @param int $askedWidth
 	 * @param int $askedHeight
 	 *
+	 * @param int $originalWidth
+	 * @param int $originalHeight
 	 * @return \int[]
 	 */
-	private function applyAspectRatio($askedWidth, $askedHeight) {
-		$originalRatio = $this->maxPreviewWidth / $this->maxPreviewHeight;
+	private function applyAspectRatio($askedWidth, $askedHeight, $originalWidth = 0, $originalHeight = 0) {
+		if(!$originalWidth){
+			$originalWidth= $this->maxPreviewWidth;
+		}
+		if (!$originalHeight) {
+			$originalHeight = $this->maxPreviewHeight;
+		}
+		$originalRatio = $originalWidth / $originalHeight;
 		// Defines the box in which the preview has to fit
 		$scaleFactor = $this->scalingUp ? $this->maxScaleFactor : 1;
-		$askedWidth = min($askedWidth, $this->maxPreviewWidth * $scaleFactor);
-		$askedHeight = min($askedHeight, $this->maxPreviewHeight * $scaleFactor);
+		$askedWidth = min($askedWidth, $originalWidth * $scaleFactor);
+		$askedHeight = min($askedHeight, $originalHeight * $scaleFactor);
 
 		if ($askedWidth / $originalRatio < $askedHeight) {
 			// width restricted
@@ -550,6 +575,32 @@ class Preview {
 		return [(int)$askedWidth, (int)$askedHeight];
 	}
 
+	/**
+	 * Resizes the boundaries to cover the area
+	 *
+	 * @param int $askedWidth
+	 * @param int $askedHeight
+	 * @param int $previewWidth
+	 * @param int $previewHeight
+	 * @return \int[]
+	 */
+	private function applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight) {
+		$originalRatio = $previewWidth / $previewHeight;
+		// Defines the box in which the preview has to fit
+		$scaleFactor = $this->scalingUp ? $this->maxScaleFactor : 1;
+		$askedWidth = min($askedWidth, $previewWidth * $scaleFactor);
+		$askedHeight = min($askedHeight, $previewHeight * $scaleFactor);
+
+		if ($askedWidth / $originalRatio > $askedHeight) {
+			// height restricted
+			$askedHeight = round($askedWidth / $originalRatio);
+		} else {
+			$askedWidth = round($askedHeight * $originalRatio);
+		}
+
+		return [(int)$askedWidth, (int)$askedHeight];
+	}
+
 	/**
 	 * Makes sure an upscaled preview doesn't end up larger than the max dimensions defined in the
 	 * config
@@ -791,7 +842,15 @@ class Preview {
 		 */
 		if ($this->keepAspect) {
 			list($askedWidth, $askedHeight) =
-				$this->applyAspectRatio($askedWidth, $askedHeight);
+				$this->applyAspectRatio($askedWidth, $askedHeight, $previewWidth, $previewHeight);
+		}
+
+		if ($this->mode === self::MODE_COVER) {
+			list($scaleWidth, $scaleHeight) =
+				$this->applyCover($askedWidth, $askedHeight, $previewWidth, $previewHeight);
+		} else {
+			$scaleWidth = $askedWidth;
+			$scaleHeight = $askedHeight;
 		}
 
 		/**
@@ -799,7 +858,7 @@ class Preview {
 		 * Takes the scaling ratio into consideration
 		 */
 		list($newPreviewWidth, $newPreviewHeight) = $this->scale(
-			$image, $askedWidth, $askedHeight, $previewWidth, $previewHeight
+			$image, $scaleWidth, $scaleHeight, $previewWidth, $previewHeight
 		);
 
 		// The preview has been resized and should now have the asked dimensions
@@ -1000,6 +1059,9 @@ class Preview {
 		if ($this->keepAspect && !$isMaxPreview) {
 			$previewPath .= '-with-aspect';
 		}
+		if ($this->mode === self::MODE_COVER) {
+			$previewPath .= '-cover';
+		}
 		$previewPath .= '.png';
 
 		return $previewPath;
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index 30398147aa..ac6b4afa0c 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -36,7 +36,7 @@ abstract class Office extends Provider {
 
 		$absPath = $fileview->toTmpFile($path);
 
-		$tmpDir = get_temp_dir();
+		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
 
 		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir ';
 		$clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index 33669452f2..7b7849a6da 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -169,8 +169,9 @@ class Router implements IRouter {
 			$this->useCollection('root');
 			require_once 'settings/routes.php';
 			require_once 'core/routes.php';
-
-			// include ocs routes
+		}
+		if ($this->loaded) {
+			// include ocs routes, must be loaded last for /ocs prefix
 			require_once 'ocs/routes.php';
 			$collection = $this->getCollection('ocs');
 			$collection->addPrefix('/ocs');
diff --git a/lib/private/security/certificatemanager.php b/lib/private/security/certificatemanager.php
index d61c7f2932..4d470f69a6 100644
--- a/lib/private/security/certificatemanager.php
+++ b/lib/private/security/certificatemanager.php
@@ -27,6 +27,7 @@ namespace OC\Security;
 
 use OC\Files\Filesystem;
 use OCP\ICertificateManager;
+use OCP\IConfig;
 
 /**
  * Manage trusted certificates for users
@@ -42,13 +43,20 @@ class CertificateManager implements ICertificateManager {
 	 */
 	protected $view;
 
+	/**
+	 * @var IConfig
+	 */
+	protected $config;
+
 	/**
 	 * @param string $uid
 	 * @param \OC\Files\View $view relative zu data/
+	 * @param IConfig $config
 	 */
-	public function __construct($uid, \OC\Files\View $view) {
+	public function __construct($uid, \OC\Files\View $view, IConfig $config) {
 		$this->uid = $uid;
 		$this->view = $view;
+		$this->config = $config;
 	}
 
 	/**
@@ -57,6 +65,11 @@ class CertificateManager implements ICertificateManager {
 	 * @return \OCP\ICertificate[]
 	 */
 	public function listCertificates() {
+
+		if (!$this->config->getSystemValue('installed', false)) {
+			return array();
+		}
+
 		$path = $this->getPathToCertificates() . 'uploads/';
 		if (!$this->view->is_dir($path)) {
 			return array();
diff --git a/lib/private/server.php b/lib/private/server.php
index 8900156721..9657afbdae 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -40,6 +40,7 @@ use bantu\IniGetWrapper\IniGetWrapper;
 use OC\AppFramework\Http\Request;
 use OC\AppFramework\Db\Db;
 use OC\AppFramework\Utility\SimpleContainer;
+use OC\AppFramework\Utility\TimeFactory;
 use OC\Command\AsyncBus;
 use OC\Diagnostics\EventLogger;
 use OC\Diagnostics\NullEventLogger;
@@ -48,14 +49,17 @@ use OC\Diagnostics\QueryLogger;
 use OC\Files\Node\Root;
 use OC\Files\View;
 use OC\Http\Client\ClientService;
+use OC\Lock\DBLockingProvider;
 use OC\Lock\MemcacheLockingProvider;
 use OC\Lock\NoopLockingProvider;
 use OC\Mail\Mailer;
+use OC\Notification\Manager;
 use OC\Security\CertificateManager;
 use OC\Security\Crypto;
 use OC\Security\Hasher;
 use OC\Security\SecureRandom;
 use OC\Security\TrustedDomainHelper;
+use OC\Session\CryptoWrapper;
 use OC\Tagging\TagMapper;
 use OCP\IServerContainer;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -88,12 +92,25 @@ class Server extends SimpleContainer implements IServerContainer {
 		});
 
 		$this->registerService('EncryptionManager', function (Server $c) {
-			return new Encryption\Manager($c->getConfig(), $c->getLogger(), $c->getL10N('core'));
+			$view = new View();
+			$util = new Encryption\Util(
+				$view,
+				$c->getUserManager(),
+				$c->getGroupManager(),
+				$c->getConfig()
+			);
+			return new Encryption\Manager(
+				$c->getConfig(),
+				$c->getLogger(),
+				$c->getL10N('core'),
+				new View(),
+				$util
+			);
 		});
 
 		$this->registerService('EncryptionFileHelper', function (Server $c) {
-			$util = new \OC\Encryption\Util(
-				new \OC\Files\View(),
+			$util = new Encryption\Util(
+				new View(),
 				$c->getUserManager(),
 				$c->getGroupManager(),
 				$c->getConfig()
@@ -102,8 +119,8 @@ class Server extends SimpleContainer implements IServerContainer {
 		});
 
 		$this->registerService('EncryptionKeyStorage', function (Server $c) {
-			$view = new \OC\Files\View();
-			$util = new \OC\Encryption\Util(
+			$view = new View();
+			$util = new Encryption\Util(
 				$view,
 				$c->getUserManager(),
 				$c->getGroupManager(),
@@ -159,7 +176,10 @@ class Server extends SimpleContainer implements IServerContainer {
 		});
 		$this->registerService('UserSession', function (Server $c) {
 			$manager = $c->getUserManager();
-			$userSession = new \OC\User\Session($manager, new \OC\Session\Memory(''));
+
+			$session = new \OC\Session\Memory('');
+
+			$userSession = new \OC\User\Session($manager, $session);
 			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
 			});
@@ -231,7 +251,7 @@ class Server extends SimpleContainer implements IServerContainer {
 
 			if($config->getSystemValue('installed', false) && !(defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
 				$v = \OC_App::getAppVersions();
-				$v['core'] = implode('.', \OC_Util::getVersion());
+				$v['core'] = md5(file_get_contents(\OC::$SERVERROOT . '/version.php'));
 				$version = implode(',', $v);
 				$instanceId = \OC_Util::getInstanceId();
 				$path = \OC::$SERVERROOT;
@@ -318,25 +338,28 @@ class Server extends SimpleContainer implements IServerContainer {
 			$uid = $user ? $user : null;
 			return new ClientService(
 				$c->getConfig(),
-				new \OC\Security\CertificateManager($uid, new \OC\Files\View())
+				new \OC\Security\CertificateManager($uid, new View(), $c->getConfig())
 			);
 		});
 		$this->registerService('EventLogger', function (Server $c) {
-			if (defined('DEBUG') and DEBUG) {
+			if ($c->getSystemConfig()->getValue('debug', false)) {
 				return new EventLogger();
 			} else {
 				return new NullEventLogger();
 			}
 		});
-		$this->registerService('QueryLogger', function ($c) {
-			if (defined('DEBUG') and DEBUG) {
+		$this->registerService('QueryLogger', function (Server $c) {
+			if ($c->getSystemConfig()->getValue('debug', false)) {
 				return new QueryLogger();
 			} else {
 				return new NullQueryLogger();
 			}
 		});
 		$this->registerService('TempManager', function (Server $c) {
-			return new TempManager(get_temp_dir(), $c->getLogger());
+			return new TempManager(
+				$c->getLogger(),
+				$c->getConfig()
+			);
 		});
 		$this->registerService('AppManager', function(Server $c) {
 			return new \OC\App\AppManager(
@@ -410,6 +433,7 @@ class Server extends SimpleContainer implements IServerContainer {
 					'requesttoken' => $requestToken,
 				],
 				$this->getSecureRandom(),
+				$this->getCrypto(),
 				$this->getConfig(),
 				$stream
 			);
@@ -429,17 +453,14 @@ class Server extends SimpleContainer implements IServerContainer {
 			);
 		});
 		$this->registerService('LockingProvider', function (Server $c) {
-			if ($c->getConfig()->getSystemValue('filelocking.enabled', false) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
+			if ($c->getConfig()->getSystemValue('filelocking.enabled', true) or (defined('PHPUNIT_RUN') && PHPUNIT_RUN)) {
 				/** @var \OC\Memcache\Factory $memcacheFactory */
 				$memcacheFactory = $c->getMemCacheFactory();
 				$memcache = $memcacheFactory->createLocking('lock');
 				if (!($memcache instanceof \OC\Memcache\NullCache)) {
 					return new MemcacheLockingProvider($memcache);
 				}
-				throw new HintException(
-					'File locking is enabled but the locking cache class was not found',
-					'Please check the "memcache.locking" setting and make sure the matching PHP module is installed and enabled'
-				);
+				return new DBLockingProvider($c->getDatabaseConnection(), $c->getLogger());
 			}
 			return new NoopLockingProvider();
 		});
@@ -451,6 +472,14 @@ class Server extends SimpleContainer implements IServerContainer {
 				$c->getURLGenerator(),
 				\OC::$configDir);
 		});
+		$this->registerService('MimeTypeLoader', function(Server $c) {
+			return new \OC\Files\Type\Loader(
+				$c->getDatabaseConnection()
+			);
+		});
+		$this->registerService('NotificationManager', function() {
+			return new Manager();
+		});
 		$this->registerService('CapabilitiesManager', function (Server $c) {
 			$manager = new \OC\CapabilitiesManager();
 			$manager->registerCapability(function() use ($c) {
@@ -461,6 +490,32 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('EventDispatcher', function() {
 			return new EventDispatcher();
 		});
+		$this->registerService('CryptoWrapper', function (Server $c) {
+			// FIXME: Instantiiated here due to cyclic dependency
+			$request = new Request(
+				[
+					'get' => $_GET,
+					'post' => $_POST,
+					'files' => $_FILES,
+					'server' => $_SERVER,
+					'env' => $_ENV,
+					'cookies' => $_COOKIE,
+					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
+						? $_SERVER['REQUEST_METHOD']
+						: null,
+				],
+				new SecureRandom(),
+				$c->getCrypto(),
+				$c->getConfig()
+			);
+
+			return new CryptoWrapper(
+				$c->getConfig(),
+				$c->getCrypto(),
+				$c->getSecureRandom(),
+				$request
+			);
+		});
 	}
 
 	/**
@@ -641,6 +696,13 @@ class Server extends SimpleContainer implements IServerContainer {
 		return $this->query('AppConfig');
 	}
 
+	/**
+	 * @return \OCP\L10N\IFactory
+	 */
+	public function getL10NFactory() {
+		return $this->query('L10NFactory');
+	}
+
 	/**
 	 * get an L10N instance
 	 *
@@ -649,7 +711,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @return \OC_L10N
 	 */
 	public function getL10N($app, $lang = null) {
-		return $this->query('L10NFactory')->get($app, $lang);
+		return $this->getL10NFactory()->get($app, $lang);
 	}
 
 	/**
@@ -800,7 +862,7 @@ class Server extends SimpleContainer implements IServerContainer {
 			}
 			$userId = $user->getUID();
 		}
-		return new CertificateManager($userId, new \OC\Files\View());
+		return new CertificateManager($userId, new View(), $this->getConfig());
 	}
 
 	/**
@@ -958,6 +1020,15 @@ class Server extends SimpleContainer implements IServerContainer {
 		return $this->query('MimeTypeDetector');
 	}
 
+	/**
+	 * Get the MimeTypeLoader
+	 *
+	 * @return \OCP\Files\IMimeTypeLoader
+	 */
+	public function getMimeTypeLoader() {
+		return $this->query('MimeTypeLoader');
+	}
+
 	/**
 	 * Get the manager of all the capabilities
 	 *
@@ -976,4 +1047,53 @@ class Server extends SimpleContainer implements IServerContainer {
 	public function getEventDispatcher() {
 		return $this->query('EventDispatcher');
 	}
+
+	/**
+	 * Get the Notification Manager
+	 *
+	 * @return \OC\Notification\IManager
+	 * @since 8.2.0
+	 */
+	public function getNotificationManager() {
+		return $this->query('NotificationManager');
+	}
+
+	/**
+	 * @return \OC\Session\CryptoWrapper
+	 */
+	public function getSessionCryptoWrapper() {
+		return $this->query('CryptoWrapper');
+	}
+
+	/**
+	 * Not a public API as of 8.2, wait for 9.0
+	 * @return \OCA\Files_External\Service\BackendService
+	 */
+	public function getStoragesBackendService() {
+		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\BackendService');
+	}
+
+	/**
+	 * Not a public API as of 8.2, wait for 9.0
+	 * @return \OCA\Files_External\Service\GlobalStoragesService
+	 */
+	public function getGlobalStoragesService() {
+		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\GlobalStoragesService');
+	}
+
+	/**
+	 * Not a public API as of 8.2, wait for 9.0
+	 * @return \OCA\Files_External\Service\UserGlobalStoragesService
+	 */
+	public function getUserGlobalStoragesService() {
+		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserGlobalStoragesService');
+	}
+
+	/**
+	 * Not a public API as of 8.2, wait for 9.0
+	 * @return \OCA\Files_External\Service\UserStoragesService
+	 */
+	public function getUserStoragesService() {
+		return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserStoragesService');
+	}
 }
diff --git a/lib/private/session/cryptosessiondata.php b/lib/private/session/cryptosessiondata.php
new file mode 100644
index 0000000000..6826ede5e3
--- /dev/null
+++ b/lib/private/session/cryptosessiondata.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Session;
+
+use OCP\ISession;
+use OCP\Security\ICrypto;
+
+/**
+ * Class CryptoSessionData
+ *
+ * @package OC\Session
+ */
+class CryptoSessionData implements \ArrayAccess, ISession {
+	/** @var ISession */
+	protected $session;
+	/** @var \OCP\Security\ICrypto */
+	protected $crypto;
+	/** @var string */
+	protected $passphrase;
+	/** @var array */
+	protected $sessionValues;
+	/** @var bool */
+	protected $isModified = false;
+	CONST encryptedSessionName = 'encrypted_session_data';
+
+	/**
+	 * @param ISession $session
+	 * @param ICrypto $crypto
+	 * @param string $passphrase
+	 */
+	public function __construct(ISession $session,
+								ICrypto $crypto,
+								$passphrase) {
+		$this->crypto = $crypto;
+		$this->session = $session;
+		$this->passphrase = $passphrase;
+		$this->initializeSession();
+	}
+
+	/**
+	 * Close session if class gets destructed
+	 */
+	public function __destruct() {
+		$this->close();
+	}
+
+	protected function initializeSession() {
+		$encryptedSessionData = $this->session->get(self::encryptedSessionName);
+		try {
+			$this->sessionValues = json_decode(
+				$this->crypto->decrypt($encryptedSessionData, $this->passphrase),
+				true
+			);
+		} catch (\Exception $e) {
+			$this->sessionValues = [];
+		}
+	}
+
+	/**
+	 * Set a value in the session
+	 *
+	 * @param string $key
+	 * @param mixed $value
+	 */
+	public function set($key, $value) {
+		$this->sessionValues[$key] = $value;
+		$this->isModified = true;
+	}
+
+	/**
+	 * Get a value from the session
+	 *
+	 * @param string $key
+	 * @return string|null Either the value or null
+	 */
+	public function get($key) {
+		if(isset($this->sessionValues[$key])) {
+			return $this->sessionValues[$key];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Check if a named key exists in the session
+	 *
+	 * @param string $key
+	 * @return bool
+	 */
+	public function exists($key) {
+		return isset($this->sessionValues[$key]);
+	}
+
+	/**
+	 * Remove a $key/$value pair from the session
+	 *
+	 * @param string $key
+	 */
+	public function remove($key) {
+		$this->isModified = true;
+		unset($this->sessionValues[$key]);
+		$this->session->remove(self::encryptedSessionName);
+	}
+
+	/**
+	 * Reset and recreate the session
+	 */
+	public function clear() {
+		$this->sessionValues = [];
+		$this->isModified = true;
+		$this->session->clear();
+	}
+
+	/**
+	 * Close the session and release the lock, also writes all changed data in batch
+	 */
+	public function close() {
+		if($this->isModified) {
+			$encryptedValue = $this->crypto->encrypt(json_encode($this->sessionValues), $this->passphrase);
+			$this->session->set(self::encryptedSessionName, $encryptedValue);
+			$this->isModified = false;
+		}
+		$this->session->close();
+	}
+
+	/**
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists($offset) {
+		return $this->exists($offset);
+	}
+
+	/**
+	 * @param mixed $offset
+	 * @return mixed
+	 */
+	public function offsetGet($offset) {
+		return $this->get($offset);
+	}
+
+	/**
+	 * @param mixed $offset
+	 * @param mixed $value
+	 */
+	public function offsetSet($offset, $value) {
+		$this->set($offset, $value);
+	}
+
+	/**
+	 * @param mixed $offset
+	 */
+	public function offsetUnset($offset) {
+		$this->remove($offset);
+	}
+}
diff --git a/lib/private/session/cryptowrapper.php b/lib/private/session/cryptowrapper.php
new file mode 100644
index 0000000000..261514d683
--- /dev/null
+++ b/lib/private/session/cryptowrapper.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Session;
+
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\ISession;
+use OCP\Security\ICrypto;
+use OCP\Security\ISecureRandom;
+
+/**
+ * Class CryptoWrapper provides some rough basic level of additional security by
+ * storing the session data in an encrypted form.
+ *
+ * The content of the session is encrypted using another cookie sent by the browser.
+ * One should note that an adversary with access to the source code or the system
+ * memory is still able to read the original session ID from the users' request.
+ * This thus can not be considered a strong security measure one should consider
+ * it as an additional small security obfuscation layer to comply with compliance
+ * guidelines.
+ *
+ * TODO: Remove this in a future relase with an approach such as
+ * https://github.com/owncloud/core/pull/17866
+ *
+ * @package OC\Session
+ */
+class CryptoWrapper {
+	const COOKIE_NAME = 'oc_sessionPassphrase';
+
+	/** @var ISession */
+	protected $session;
+
+	/** @var \OCP\Security\ICrypto */
+	protected $crypto;
+
+	/** @var ISecureRandom */
+	protected $random;
+
+	/**
+	 * @param IConfig $config
+	 * @param ICrypto $crypto
+	 * @param ISecureRandom $random
+	 * @param IRequest $request
+	 */
+	public function __construct(IConfig $config,
+								ICrypto $crypto,
+								ISecureRandom $random,
+								IRequest $request) {
+		$this->crypto = $crypto;
+		$this->config = $config;
+		$this->random = $random;
+
+		if (!is_null($request->getCookie(self::COOKIE_NAME))) {
+			$this->passphrase = $request->getCookie(self::COOKIE_NAME);
+		} else {
+			$this->passphrase = $this->random->getMediumStrengthGenerator()->generate(128);
+			$secureCookie = $request->getServerProtocol() === 'https';
+			// FIXME: Required for CI
+			if (!defined('PHPUNIT_RUN')) {
+				$webRoot = \OC::$WEBROOT;
+				if($webRoot === '') {
+					$webRoot = '/';
+				}
+				setcookie(self::COOKIE_NAME, $this->passphrase, 0, $webRoot, '', $secureCookie, true);
+			}
+		}
+	}
+
+	/**
+	 * @param ISession $session
+	 * @return ISession
+	 */
+	public function wrapSession(ISession $session) {
+		if (!($session instanceof CryptoSessionData)) {
+			return new CryptoSessionData($session, $this->crypto, $this->passphrase);
+		}
+
+		return $session;
+	}
+}
diff --git a/lib/private/session/internal.php b/lib/private/session/internal.php
index 7719788775..8ee2127210 100644
--- a/lib/private/session/internal.php
+++ b/lib/private/session/internal.php
@@ -32,6 +32,10 @@ namespace OC\Session;
  * @package OC\Session
  */
 class Internal extends Session {
+	/**
+	 * @param string $name
+	 * @throws \Exception
+	 */
 	public function __construct($name) {
 		session_name($name);
 		set_error_handler(array($this, 'trapError'));
@@ -42,10 +46,6 @@ class Internal extends Session {
 		}
 	}
 
-	public function __destruct() {
-		$this->close();
-	}
-
 	/**
 	 * @param string $key
 	 * @param integer $value
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 9aea4677b5..6ad36d60fe 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -37,6 +37,7 @@
 
 namespace OC\Share;
 
+use OC\Files\Filesystem;
 use OCP\IUserSession;
 use OCP\IDBConnection;
 use OCP\IConfig;
@@ -120,6 +121,7 @@ class Share extends Constants {
 	 */
 	public static function getUsersSharingFile($path, $ownerUser, $includeOwner = false, $returnUserPaths = false) {
 
+		Filesystem::initMountPoints($ownerUser);
 		$shares = $sharePaths = $fileTargets = array();
 		$publicShare = false;
 		$remoteShare = false;
@@ -599,7 +601,7 @@ class Share extends Constants {
 		if ($backend->isShareTypeAllowed($shareType) === false) {
 			$message = 'Sharing %s failed, because the backend does not allow shares from type %i';
 			$message_t = $l->t('Sharing %s failed, because the backend does not allow shares from type %i', array($itemSourceName, $shareType));
-			\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareType), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareType), \OCP\Util::DEBUG);
 			throw new \Exception($message_t);
 		}
 
@@ -617,14 +619,14 @@ class Share extends Constants {
 			if (!$path) {
 				$message = 'Sharing %s failed, because the file does not exist';
 				$message_t = $l->t('Sharing %s failed, because the file does not exist', array($itemSourceName));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			// verify that the user has share permission
 			if (!\OC\Files\Filesystem::isSharable($path)) {
 				$message = 'You are not allowed to share %s';
 				$message_t = $l->t('You are not allowed to share %s', array($itemSourceName));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 		}
@@ -637,7 +639,7 @@ class Share extends Constants {
 			foreach ($mounts as $mount) {
 				if ($mount->getStorage()->instanceOfStorage('\OCA\Files_Sharing\ISharedStorage')) {
 					$message = 'Sharing "' . $itemSourceName . '" failed, because it contains files shared with you!';
-					\OCP\Util::writeLog('OCP\Share', $message, \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', $message, \OCP\Util::DEBUG);
 					throw new \Exception($message);
 				}
 
@@ -649,18 +651,33 @@ class Share extends Constants {
 			$permissions = (int)$permissions & ~\OCP\Constants::PERMISSION_DELETE;
 		}
 
+		//Validate expirationDate
+		if ($expirationDate !== null) {
+			try {
+				/*
+				 * Reuse the validateExpireDate.
+				 * We have to pass time() since the second arg is the time
+				 * the file was shared, since it is not shared yet we just use
+				 * the current time.
+				 */
+				$expirationDate = self::validateExpireDate($expirationDate->format('Y-m-d'), time(), $itemType, $itemSource);
+			} catch (\Exception $e) {
+				throw new \OC\HintException($e->getMessage(), $e->getMessage(), 404);
+			}
+		}
+
 		// Verify share type and sharing conditions are met
 		if ($shareType === self::SHARE_TYPE_USER) {
 			if ($shareWith == $uidOwner) {
 				$message = 'Sharing %s failed, because the user %s is the item owner';
 				$message_t = $l->t('Sharing %s failed, because the user %s is the item owner', array($itemSourceName, $shareWith));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			if (!\OC_User::userExists($shareWith)) {
 				$message = 'Sharing %s failed, because the user %s does not exist';
 				$message_t = $l->t('Sharing %s failed, because the user %s does not exist', array($itemSourceName, $shareWith));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			if ($shareWithinGroupOnly) {
@@ -669,7 +686,7 @@ class Share extends Constants {
 					$message = 'Sharing %s failed, because the user '
 						.'%s is not a member of any groups that %s is a member of';
 					$message_t = $l->t('Sharing %s failed, because the user %s is not a member of any groups that %s is a member of', array($itemSourceName, $shareWith, $uidOwner));
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith, $uidOwner), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith, $uidOwner), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				}
 			}
@@ -682,7 +699,19 @@ class Share extends Constants {
 				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
 					$message = 'Sharing %s failed, because this item is already shared with %s';
 					$message_t = $l->t('Sharing %s failed, because this item is already shared with %s', array($itemSourceName, $shareWith));
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
+					throw new \Exception($message_t);
+				}
+			}
+			if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_USER,
+				$shareWith, null, self::FORMAT_NONE, null, 1, true, true)) {
+				// Only allow the same share to occur again if it is the same
+				// owner and is not a user share, this use case is for increasing
+				// permissions for a specific user
+				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
+					$message = 'Sharing %s failed, because this item is already shared with user %s';
+					$message_t = $l->t('Sharing %s failed, because this item is already shared with user %s', array($itemSourceName, $shareWith));
+					\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OC_Log::ERROR);
 					throw new \Exception($message_t);
 				}
 			}
@@ -690,14 +719,14 @@ class Share extends Constants {
 			if (!\OC_Group::groupExists($shareWith)) {
 				$message = 'Sharing %s failed, because the group %s does not exist';
 				$message_t = $l->t('Sharing %s failed, because the group %s does not exist', array($itemSourceName, $shareWith));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			if ($shareWithinGroupOnly && !\OC_Group::inGroup($uidOwner, $shareWith)) {
 				$message = 'Sharing %s failed, because '
 					.'%s is not a member of the group %s';
 				$message_t = $l->t('Sharing %s failed, because %s is not a member of the group %s', array($itemSourceName, $uidOwner, $shareWith));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $uidOwner, $shareWith), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $uidOwner, $shareWith), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			// Check if the item source is already shared with the group, either from the same owner or a different user
@@ -710,7 +739,7 @@ class Share extends Constants {
 				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
 					$message = 'Sharing %s failed, because this item is already shared with %s';
 					$message_t = $l->t('Sharing %s failed, because this item is already shared with %s', array($itemSourceName, $shareWith));
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				}
 			}
@@ -736,7 +765,7 @@ class Share extends Constants {
 				}
 
 				// Generate hash of password - same method as user passwords
-				if (!empty($shareWith)) {
+				if (is_string($shareWith) && $shareWith !== '') {
 					self::verifyPassword($shareWith);
 					$shareWith = \OC::$server->getHasher()->hash($shareWith);
 				} else {
@@ -750,7 +779,7 @@ class Share extends Constants {
 				if (\OCP\Util::isPublicLinkPasswordRequired() && empty($shareWith)) {
 					$message = 'You need to provide a password to create a public link, only protected links are allowed';
 					$message_t = $l->t('You need to provide a password to create a public link, only protected links are allowed');
-					\OCP\Util::writeLog('OCP\Share', $message, \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', $message, \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				}
 
@@ -779,7 +808,7 @@ class Share extends Constants {
 			}
 			$message = 'Sharing %s failed, because sharing with links is not allowed';
 			$message_t = $l->t('Sharing %s failed, because sharing with links is not allowed', array($itemSourceName));
-			\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::DEBUG);
 			throw new \Exception($message_t);
 		} else if ($shareType === self::SHARE_TYPE_REMOTE) {
 
@@ -790,7 +819,7 @@ class Share extends Constants {
 				$shareWith, $uidOwner, self::FORMAT_NONE, null, 1, true, true)) {
 					$message = 'Sharing %s failed, because this item is already shared with %s';
 					$message_t = $l->t('Sharing %s failed, because this item is already shared with %s', array($itemSourceName, $shareWith));
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 			}
 
@@ -819,7 +848,7 @@ class Share extends Constants {
 			// Future share types need to include their own conditions
 			$message = 'Share type %s is not valid for %s';
 			$message_t = $l->t('Share type %s is not valid for %s', array($shareType, $itemSource));
-			\OCP\Util::writeLog('OCP\Share', sprintf($message, $shareType, $itemSource), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('OCP\Share', sprintf($message, $shareType, $itemSource), \OCP\Util::DEBUG);
 			throw new \Exception($message_t);
 		}
 
@@ -1047,7 +1076,7 @@ class Share extends Constants {
 					$message = 'Setting permissions for %s failed,'
 						.' because the permissions exceed permissions granted to %s';
 					$message_t = $l->t('Setting permissions for %s failed, because the permissions exceed permissions granted to %s', array($itemSource, \OC_User::getUser()));
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource, \OC_User::getUser()), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource, \OC_User::getUser()), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				}
 			}
@@ -1110,7 +1139,7 @@ class Share extends Constants {
 		$message = 'Setting permissions for %s failed, because the item was not found';
 		$message_t = $l->t('Setting permissions for %s failed, because the item was not found', array($itemSource));
 
-		\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource), \OCP\Util::ERROR);
+		\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource), \OCP\Util::DEBUG);
 		throw new \Exception($message_t);
 	}
 
@@ -2158,7 +2187,7 @@ class Share extends Constants {
 				$message = 'Sharing %s failed, because the user %s is the original sharer';
 				$message_t = $l->t('Sharing %s failed, because the user %s is the original sharer', array($itemSourceName, $shareWith));
 
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $shareWith), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 		}
@@ -2170,7 +2199,7 @@ class Share extends Constants {
 					$message = 'Sharing %s failed, because the permissions exceed permissions granted to %s';
 					$message_t = $l->t('Sharing %s failed, because the permissions exceed permissions granted to %s', array($itemSourceName, $uidOwner));
 
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $uidOwner), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName, $uidOwner), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				} else {
 					// TODO Don't check if inside folder
@@ -2196,7 +2225,7 @@ class Share extends Constants {
 				$message = 'Sharing %s failed, because resharing is not allowed';
 				$message_t = $l->t('Sharing %s failed, because resharing is not allowed', array($itemSourceName));
 
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSourceName), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 		} else {
@@ -2209,7 +2238,7 @@ class Share extends Constants {
 				$message = 'Sharing %s failed, because the sharing backend for '
 					.'%s could not find its source';
 				$message_t = $l->t('Sharing %s failed, because the sharing backend for %s could not find its source', array($itemSource, $itemType));
-				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource, $itemType), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource, $itemType), \OCP\Util::DEBUG);
 				throw new \Exception($message_t);
 			}
 			if ($backend instanceof \OCP\Share_Backend_File_Dependent) {
@@ -2224,7 +2253,7 @@ class Share extends Constants {
 					$message = 'Sharing %s failed, because the file could not be found in the file cache';
 					$message_t = $l->t('Sharing %s failed, because the file could not be found in the file cache', array($itemSource));
 
-					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('OCP\Share', sprintf($message, $itemSource), \OCP\Util::DEBUG);
 					throw new \Exception($message_t);
 				}
 			} else {
diff --git a/lib/private/template.php b/lib/private/template.php
index e7acc778de..920be71abb 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -233,7 +233,7 @@ class OC_Template extends \OC\Template\Base {
 		$content->assign('file', $exception->getFile());
 		$content->assign('line', $exception->getLine());
 		$content->assign('trace', $exception->getTraceAsString());
-		$content->assign('debugMode', defined('DEBUG') && DEBUG === true);
+		$content->assign('debugMode', \OC::$server->getSystemConfig()->getValue('debug', false));
 		$content->assign('remoteAddr', $request->getRemoteAddress());
 		$content->assign('requestID', $request->getId());
 		$content->printPage();
diff --git a/lib/private/tempmanager.php b/lib/private/tempmanager.php
index b8cef8e036..cc7c51d856 100644
--- a/lib/private/tempmanager.php
+++ b/lib/private/tempmanager.php
@@ -25,6 +25,7 @@
 namespace OC;
 
 use OCP\ILogger;
+use OCP\IConfig;
 use OCP\ITempManager;
 
 class TempManager implements ITempManager {
@@ -34,16 +35,20 @@ class TempManager implements ITempManager {
 	protected $tmpBaseDir;
 	/** @var ILogger */
 	protected $log;
+	/** @var IConfig */
+	protected $config;
+
 	/** Prefix */
 	const TMP_PREFIX = 'oc_tmp_';
 
 	/**
-	 * @param string $baseDir
 	 * @param \OCP\ILogger $logger
+	 * @param \OCP\IConfig $config
 	 */
-	public function __construct($baseDir, ILogger $logger) {
-		$this->tmpBaseDir = $baseDir;
+	public function __construct(ILogger $logger, IConfig $config) {
 		$this->log = $logger;
+		$this->config = $config;
+		$this->tmpBaseDir = $this->getTempBaseDir();
 	}
 
 	/**
@@ -190,4 +195,79 @@ class TempManager implements ITempManager {
 		}
 		return $files;
 	}
+
+	/**
+	 * Get the temporary base directory configured on the server
+	 *
+	 * @return string Path to the temporary directory or null
+	 * @throws \UnexpectedValueException
+	 */
+	public function getTempBaseDir() {
+		if ($this->tmpBaseDir) {
+			return $this->tmpBaseDir;
+		}
+
+		$directories = [];
+		if ($temp = $this->config->getSystemValue('tempdirectory', null)) {
+			$directories[] = $temp;
+		}
+		if ($temp = ini_get('upload_tmp_dir')) {
+			$directories[] = $temp;
+		}
+		if ($temp = getenv('TMP')) {
+			$directories[] = $temp;
+		}
+		if ($temp = getenv('TEMP')) {
+			$directories[] = $temp;
+		}
+		if ($temp = getenv('TMPDIR')) {
+			$directories[] = $temp;
+		}
+		$temp = tempnam(__FILE__, '');
+		if (file_exists($temp)) {
+			unlink($temp);
+			$directories[] = dirname($temp);
+		}
+		if ($temp = sys_get_temp_dir()) {
+			$directories[] = $temp;
+		}
+
+		foreach ($directories as $dir) {
+			if ($this->checkTemporaryDirectory($dir)) {
+				return $dir;
+			}
+		}
+		throw new \UnexpectedValueException('Unable to detect system temporary directory');
+	}
+
+	/**
+	 * Check if a temporary directory is ready for use
+	 *
+	 * @param mixed $directory
+	 * @return bool
+	 */
+	private function checkTemporaryDirectory($directory) {
+		// surpress any possible errors caused by is_writable
+		// checks missing or invalid path or characters, wrong permissions ect
+		try {
+			if (is_writeable($directory)) {
+				return true;
+			}
+		} catch (Exception $e) {
+		}
+		$this->log->warning('Temporary directory {dir} is not present or writable',
+			['dir' => $directory]
+		);
+		return false;
+	}
+
+	/**
+	 * Override the temporary base directory
+	 *
+	 * @param string $directory
+	 */
+	public function overrideTempBaseDir($directory) {
+		$this->tmpBaseDir = $directory;
+	}
+
 }
diff --git a/lib/private/updater.php b/lib/private/updater.php
index f73fa8ff65..71e9732c30 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -211,20 +211,27 @@ class Updater extends BasicEmitter {
 		return $success;
 	}
 
+	/**
+	 * Return version from which this version is allowed to upgrade from
+	 *
+	 * @return string allowed previous version
+	 */
+	private function getAllowedPreviousVersion() {
+		// this should really be a JSON file
+		require \OC::$SERVERROOT . '/version.php';
+		return implode('.', $OC_VersionCanBeUpgradedFrom);
+	}
+
 	/**
 	 * Whether an upgrade to a specified version is possible
 	 * @param string $oldVersion
 	 * @param string $newVersion
+	 * @param string $allowedPreviousVersion
 	 * @return bool
 	 */
-	public function isUpgradePossible($oldVersion, $newVersion) {
-		$oldVersion = explode('.', $oldVersion);
-		$newVersion = explode('.', $newVersion);
-
-		if($newVersion[0] > ($oldVersion[0] + 1) || $oldVersion[0] > $newVersion[0]) {
-			return false;
-		}
-		return true;
+	public function isUpgradePossible($oldVersion, $newVersion, $allowedPreviousVersion) {
+		return (version_compare($allowedPreviousVersion, $oldVersion, '<=')
+			&& version_compare($oldVersion, $newVersion, '<='));
 	}
 
 	/**
@@ -259,8 +266,9 @@ class Updater extends BasicEmitter {
 	 */
 	private function doUpgrade($currentVersion, $installedVersion) {
 		// Stop update if the update is over several major versions
-		if (!self::isUpgradePossible($installedVersion, $currentVersion)) {
-			throw new \Exception('Updates between multiple major versions are unsupported.');
+		$allowedPreviousVersion = $this->getAllowedPreviousVersion();
+		if (!self::isUpgradePossible($installedVersion, $currentVersion, $allowedPreviousVersion)) {
+			throw new \Exception('Updates between multiple major versions and downgrades are unsupported.');
 		}
 
 		// Update .htaccess files
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 75a884fb45..baceeb4395 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -297,8 +297,8 @@ class Session implements IUserSession, Emitter {
 	 * Remove cookie for "remember username"
 	 */
 	public function unsetMagicInCookie() {
-		//TODO: DI for cookies and OC_Config
-		$secureCookie = \OC_Config::getValue('forcessl', false);
+		//TODO: DI for cookies and IRequest
+		$secureCookie = \OC::$server->getRequest()->getServerProtocol() === 'https';
 
 		unset($_COOKIE["oc_username"]); //TODO: DI
 		unset($_COOKIE["oc_token"]);
diff --git a/lib/private/util.php b/lib/private/util.php
index 501dbf5c4c..eb1de5be5a 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1054,10 +1054,12 @@ class OC_Util {
 		return $id;
 	}
 
+	protected static $encryptedToken;
 	/**
 	 * Register an get/post call. Important to prevent CSRF attacks.
 	 *
-	 * @return string Generated token.
+	 * @return string The encrypted CSRF token, the shared secret is appended after the `:`.
+	 *
 	 * @description
 	 * Creates a 'request token' (random) and stores it inside the session.
 	 * Ever subsequent (ajax) request must use such a valid token to succeed,
@@ -1065,6 +1067,11 @@ class OC_Util {
 	 * @see OC_Util::isCallRegistered()
 	 */
 	public static function callRegister() {
+		// Use existing token if function has already been called
+		if(isset(self::$encryptedToken)) {
+			return self::$encryptedToken;
+		}
+
 		// Check if a token exists
 		if (!\OC::$server->getSession()->exists('requesttoken')) {
 			// No valid token found, generate a new one.
@@ -1074,7 +1081,11 @@ class OC_Util {
 			// Valid token already exists, send it
 			$requestToken = \OC::$server->getSession()->get('requesttoken');
 		}
-		return ($requestToken);
+
+		// Encrypt the token to mitigate breach-like attacks
+		$sharedSecret = \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->generate(10);
+		self::$encryptedToken = \OC::$server->getCrypto()->encrypt($requestToken, $sharedSecret) . ':' . $sharedSecret;
+		return self::$encryptedToken;
 	}
 
 	/**
@@ -1141,6 +1152,7 @@ class OC_Util {
 	 * @throws \OC\HintException If the test file can't get written.
 	 */
 	public function isHtaccessWorking(\OCP\IConfig $config) {
+
 		if (\OC::$CLI || !$config->getSystemValue('check_for_working_htaccess', true)) {
 			return true;
 		}
@@ -1444,8 +1456,12 @@ class OC_Util {
 		if ($config->getSystemValue('installed', false)) {
 			$installedVersion = $config->getSystemValue('version', '0.0.0');
 			$currentVersion = implode('.', OC_Util::getVersion());
-			if (version_compare($currentVersion, $installedVersion, '>')) {
+			$versionDiff = version_compare($currentVersion, $installedVersion);
+			if ($versionDiff > 0) {
 				return true;
+			} else if ($versionDiff < 0) {
+				// downgrade attempt, throw exception
+				throw new \OC\HintException('Downgrading is not supported and is likely to cause unpredictable issues (from ' . $installedVersion . ' to ' . $currentVersion . ')');
 			}
 
 			// also check for upgrades for apps (independently from the user)
diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php
index 456a5616d4..1a509200dd 100644
--- a/lib/public/appframework/http/jsonresponse.php
+++ b/lib/public/appframework/http/jsonresponse.php
@@ -64,7 +64,7 @@ class JSONResponse extends Response {
 	 * @throws \Exception If data could not get encoded
 	 */
 	public function render() {
-		$response = json_encode($this->data);
+		$response = json_encode($this->data, JSON_HEX_TAG);
 		if($response === false) {
 			throw new \Exception(sprintf('Could not json_encode due to invalid ' .
 				'non UTF-8 characters in the array: %s', var_export($this->data, true)));
diff --git a/lib/public/autoloadnotallowedexception.php b/lib/public/autoloadnotallowedexception.php
new file mode 100644
index 0000000000..edb7121c06
--- /dev/null
+++ b/lib/public/autoloadnotallowedexception.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCP;
+
+/**
+ * Exception for when a not allowed path is attempted to be autoloaded
+ * @since 8.2.0
+ */
+class AutoloadNotAllowedException extends \DomainException {
+	/**
+	 * @param string $path
+	 * @since 8.2.0
+	 */
+	public function __construct($path) {
+		parent::__construct('Autoload path not allowed: '.$path);
+	}
+}
+
diff --git a/lib/public/encryption/iencryptionmodule.php b/lib/public/encryption/iencryptionmodule.php
index 183b322e71..0fa0dc570d 100644
--- a/lib/public/encryption/iencryptionmodule.php
+++ b/lib/public/encryption/iencryptionmodule.php
@@ -23,6 +23,8 @@
  */
 
 namespace OCP\Encryption;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Interface IEncryptionModule
@@ -134,4 +136,13 @@ interface IEncryptionModule {
 	 */
 	public function isReadable($path, $uid);
 
+	/**
+	 * Initial encryption of all files
+	 *
+	 * @param InputInterface $input
+	 * @param OutputInterface $output write some status information to the terminal during encryption
+	 * @since 8.2.0
+	 */
+	public function encryptAll(InputInterface $input, OutputInterface $output);
+
 }
diff --git a/lib/public/files/imimetypeloader.php b/lib/public/files/imimetypeloader.php
new file mode 100644
index 0000000000..6d00c4a0b3
--- /dev/null
+++ b/lib/public/files/imimetypeloader.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCP\Files;
+
+/**
+ * Interface IMimeTypeLoader
+ * @package OCP\Files
+ * @since 8.2.0
+ *
+ * Interface to load mimetypes
+ **/
+interface IMimeTypeLoader {
+
+	/**
+	 * Get a mimetype from its ID
+	 *
+	 * @param int $id
+	 * @return string|null
+	 * @since 8.2.0
+	 */
+	public function getMimetypeById($id);
+
+	/**
+	 * Get a mimetype ID, adding the mimetype to the DB if it does not exist
+	 *
+	 * @param string $mimetype
+	 * @return int
+	 * @since 8.2.0
+	 */
+	public function getId($mimetype);
+
+	/**
+	 * Test if a mimetype exists in the database
+	 *
+	 * @param string $mimetype
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function exists($mimetype);
+
+	/**
+	 * Clear all loaded mimetypes, allow for re-loading
+	 *
+	 * @since 8.2.0
+	 */
+	public function reset();
+}
diff --git a/lib/public/http/client/iclient.php b/lib/public/http/client/iclient.php
index aadb9efd1b..494ca7d419 100644
--- a/lib/public/http/client/iclient.php
+++ b/lib/public/http/client/iclient.php
@@ -80,6 +80,7 @@ interface IClient {
 	 *              'verify' => true, // bool or string to CA file
 	 *              'debug' => true,
 	 * @return IResponse
+	 * @throws \Exception If the request could not get completed
 	 * @since 8.1.0
 	 */
 	public function head($uri, $options = []);
@@ -109,6 +110,7 @@ interface IClient {
 	 *              'verify' => true, // bool or string to CA file
 	 *              'debug' => true,
 	 * @return IResponse
+	 * @throws \Exception If the request could not get completed
 	 * @since 8.1.0
 	 */
 	public function post($uri, array $options = []);
@@ -138,6 +140,7 @@ interface IClient {
 	 *              'verify' => true, // bool or string to CA file
 	 *              'debug' => true,
 	 * @return IResponse
+	 * @throws \Exception If the request could not get completed
 	 * @since 8.1.0
 	 */
 	public function put($uri, array $options = []);
@@ -167,6 +170,7 @@ interface IClient {
 	 *              'verify' => true, // bool or string to CA file
 	 *              'debug' => true,
 	 * @return IResponse
+	 * @throws \Exception If the request could not get completed
 	 * @since 8.1.0
 	 */
 	public function delete($uri, array $options = []);
@@ -196,6 +200,7 @@ interface IClient {
 	 *              'verify' => true, // bool or string to CA file
 	 *              'debug' => true,
 	 * @return IResponse
+	 * @throws \Exception If the request could not get completed
 	 * @since 8.1.0
 	 */
 	public function options($uri, array $options = []);
diff --git a/lib/public/http/client/iresponse.php b/lib/public/http/client/iresponse.php
index 0e0ef4c501..92bb7af82d 100644
--- a/lib/public/http/client/iresponse.php
+++ b/lib/public/http/client/iresponse.php
@@ -30,7 +30,7 @@ namespace OCP\Http\Client;
  */
 interface IResponse {
 	/**
-	 * @return string
+	 * @return string|resource
 	 * @since 8.1.0
 	 */
 	public function getBody();
diff --git a/lib/public/icontainer.php b/lib/public/icontainer.php
index 75ff5e97b6..ffd1d16c97 100644
--- a/lib/public/icontainer.php
+++ b/lib/public/icontainer.php
@@ -43,6 +43,16 @@ use Closure;
  */
 interface IContainer {
 
+	/**
+	 * If a parameter is not registered in the container try to instantiate it
+	 * by using reflection to find out how to build the class
+	 * @param string $name the class name to resolve
+	 * @return \stdClass
+	 * @since 8.2.0
+	 * @throws QueryException if the class could not be found or instantiated
+	 */
+	public function resolve($name);
+
 	/**
 	 * Look up a service for a given name in the container.
 	 *
diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php
index 0d04c43d73..6a4373583f 100644
--- a/lib/public/idbconnection.php
+++ b/lib/public/idbconnection.php
@@ -114,6 +114,14 @@ interface IDBConnection {
 	 */
 	public function beginTransaction();
 
+	/**
+	 * Check if a transaction is active
+	 *
+	 * @return bool
+	 * @since 8.2.0
+	 */
+	public function inTransaction();
+
 	/**
 	 * Commit the database changes done during a transaction that is in progress
 	 * @since 6.0.0
diff --git a/lib/public/il10n.php b/lib/public/il10n.php
index e1d0102105..c6e076a21f 100644
--- a/lib/public/il10n.php
+++ b/lib/public/il10n.php
@@ -100,7 +100,7 @@ interface IL10N {
 
 
 	/**
-	 * The code (en, de, ...) of the language that is used for this OC_L10N object
+	 * The code (en, de, ...) of the language that is used for this IL10N object
 	 *
 	 * @return string language
 	 * @since 7.0.0
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index a6d83156de..8be23dff21 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -440,6 +440,13 @@ interface IServerContainer {
 	 */
 	public function getMimeTypeDetector();
 
+	/**
+	 * Get the MimeTypeLoader
+	 *
+	 * @return \OCP\Files\IMimeTypeLoader
+	 * @since 8.2.0
+	 */
+	public function getMimeTypeLoader();
 
 	/**
 	 * Get the EventDispatcher
@@ -448,4 +455,12 @@ interface IServerContainer {
 	 * @since 8.2.0
 	 */
 	public function getEventDispatcher();
+
+	/**
+	 * Get the Notification Manager
+	 *
+	 * @return \OC\Notification\IManager
+	 * @since 8.2.0
+	 */
+	public function getNotificationManager();
 }
diff --git a/lib/public/itempmanager.php b/lib/public/itempmanager.php
index 7ba5b1e7bf..6364fa7191 100644
--- a/lib/public/itempmanager.php
+++ b/lib/public/itempmanager.php
@@ -58,4 +58,12 @@ interface ITempManager {
 	 * @since 8.0.0
 	 */
 	public function cleanOld();
+
+	/**
+	 * Get the temporary base directory
+	 *
+	 * @return string
+	 * @since 8.2.0
+	 */
+	public function getTempBaseDir();
 }
diff --git a/lib/public/l10n/ifactory.php b/lib/public/l10n/ifactory.php
new file mode 100644
index 0000000000..b784505a68
--- /dev/null
+++ b/lib/public/l10n/ifactory.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 OCP\L10N;
+
+/**
+ * @since 8.2.0
+ */
+interface IFactory {
+	/**
+	 * Get a language instance
+	 *
+	 * @param string $app
+	 * @param string|null $lang
+	 * @return \OCP\IL10N
+	 * @since 8.2.0
+	 */
+	public function get($app, $lang = null);
+}
diff --git a/ocs/routes.php b/ocs/routes.php
index f8e6f33c48..9a8625bcc3 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -104,31 +104,33 @@ API::register(
 );
 
 // Server-to-Server Sharing
-$s2s = new \OCA\Files_Sharing\API\Server2Server();
-API::register('post',
+if (\OC::$server->getAppManager()->isEnabledForUser('files_sharing')) {
+	$s2s = new \OCA\Files_Sharing\API\Server2Server();
+	API::register('post',
 		'/cloud/shares',
 		array($s2s, 'createShare'),
 		'files_sharing',
 		API::GUEST_AUTH
-);
+	);
 
-API::register('post',
+	API::register('post',
 		'/cloud/shares/{id}/accept',
 		array($s2s, 'acceptShare'),
 		'files_sharing',
 		API::GUEST_AUTH
-);
+	);
 
-API::register('post',
+	API::register('post',
 		'/cloud/shares/{id}/decline',
 		array($s2s, 'declineShare'),
 		'files_sharing',
 		API::GUEST_AUTH
-);
+	);
 
-API::register('post',
+	API::register('post',
 		'/cloud/shares/{id}/unshare',
 		array($s2s, 'unshare'),
 		'files_sharing',
 		API::GUEST_AUTH
-);
+	);
+}
diff --git a/settings/admin.php b/settings/admin.php
index 8410a6671e..38683438f3 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -193,10 +193,13 @@ $template->assign('fileSharingSettings', $fileSharingSettings);
 $template->assign('filesExternal', $filesExternal);
 $template->assign('updaterAppPanel', $updaterAppPanel);
 $template->assign('ocDefaultEncryptionModulePanel', $ocDefaultEncryptionModulePanel);
-if (\OC::$server->getLockingProvider() instanceof NoopLockingProvider) {
-	$template->assign('fileLockingEnabled', false);
+$lockingProvider = \OC::$server->getLockingProvider();
+if ($lockingProvider instanceof NoopLockingProvider) {
+	$template->assign('fileLockingType', 'none');
+} else if ($lockingProvider instanceof \OC\Lock\DBLockingProvider) {
+	$template->assign('fileLockingType', 'db');
 } else {
-	$template->assign('fileLockingEnabled', true);
+	$template->assign('fileLockingType', 'cache');
 }
 
 $formsMap = array_map(function ($form) {
@@ -223,7 +226,6 @@ $formsAndMore = array_merge($formsAndMore, $formsMap);
 $formsAndMore[] = ['anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron')];
 $formsAndMore[] = ['anchor' => 'mail_general_settings', 'section-name' => $l->t('Email server')];
 $formsAndMore[] = ['anchor' => 'log-section', 'section-name' => $l->t('Log')];
-$formsAndMore[] = ['anchor' => 'server-status', 'section-name' => $l->t('Server status')];
 $formsAndMore[] = ['anchor' => 'admin-tips', 'section-name' => $l->t('Tips & tricks')];
 if ($updaterAppPanel) {
 	$formsAndMore[] = ['anchor' => 'updater', 'section-name' => $l->t('Updates')];
diff --git a/settings/controller/certificatecontroller.php b/settings/controller/certificatecontroller.php
index 92d0961efb..4c129dcd58 100644
--- a/settings/controller/certificatecontroller.php
+++ b/settings/controller/certificatecontroller.php
@@ -120,8 +120,8 @@ class CertificateController extends Controller {
 	protected function isCertificateImportAllowed() {
 		$externalStorageEnabled = $this->appManager->isEnabledForUser('files_external');
 		if ($externalStorageEnabled) {
-			$backends = \OC_Mount_Config::getPersonalBackends();
-			if (!empty($backends)) {
+			$backendService = \OC_Mount_Config::$app->getContainer()->query('OCA\Files_External\Service\BackendService');
+			if ($backendService->getBackendsVisibleFor(\OCA\Files_External\Service\BackendService::VISIBILITY_PERSONAL)) {
 				return true;
 			}
 		}
diff --git a/settings/controller/checksetupcontroller.php b/settings/controller/checksetupcontroller.php
index 33f94fe423..ca4eb255f6 100644
--- a/settings/controller/checksetupcontroller.php
+++ b/settings/controller/checksetupcontroller.php
@@ -143,7 +143,7 @@ class CheckSetupController extends Controller {
 		}
 
 		$features = (string)$this->l10n->t('installing and updating apps via the app store or Federated Cloud Sharing');
-		if(OC_Util::getEditionString() !== '') {
+		if(!$this->config->getSystemValue('appstoreenabled', true)) {
 			$features = (string)$this->l10n->t('Federated Cloud Sharing');
 		}
 
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 9bd342ca6f..5fa9b30a64 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -316,7 +316,7 @@ span.version {
 }
 
 #app-category-1 {
-	border-bottom: 1px solid #e8e8e8;
+	margin-bottom: 18px;
 }
 /* capitalize "Other" category */
 #app-category-925 {
@@ -361,6 +361,11 @@ table.grid td.date{
 	list-style: initial;
 	margin: 10px 0;
 }
+#security-warning-state span {
+	padding-left: 25px;
+	background-position: 5px center;
+	margin-left: -5px;
+}
 
 #shareAPI p { padding-bottom: 0.8em; }
 #shareAPI input#shareapiExpireAfterNDays {width: 25px;}
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 80d3dff290..7117c7b46c 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -179,6 +179,10 @@ $(document).ready(function(){
 		var $el = $('#postsetupchecks');
 		$el.find('.loading').addClass('hidden');
 		if (messages.length === 0) {
+			var securityWarning = $('#security-warning');
+			if (securityWarning.children('ul').children().length === 0) {
+				$('#security-warning-state').find('span').removeClass('hidden');
+			}
 		} else {
 			var $errorsEl = $el.find('.errors');
 			var $warningsEl = $el.find('.warnings');
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 9e4dd54090..33746d22ac 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -321,7 +321,7 @@ $(document).ready(function () {
 	var url = OC.generateUrl(
 		'/avatar/{user}/{size}',
 		{user: OC.currentUser, size: 1}
-	) + '?requesttoken=' + encodeURIComponent(oc_requesttoken);
+	);
 	$.get(url, function (result) {
 		if (typeof(result) === 'object') {
 			$('#removeavatar').hide();
diff --git a/settings/l10n/az.js b/settings/l10n/az.js
index eb6dc71bc6..9655001420 100644
--- a/settings/l10n/az.js
+++ b/settings/l10n/az.js
@@ -212,7 +212,6 @@ OC.L10N.register(
     "Create" : "Yarat",
     "Admin Recovery Password" : "İnzibatçı bərpa şifrəsi",
     "Enter the recovery password in order to recover the users files during password change" : "Şifrə dəyişilməsi müddətində, səliqə ilə bərpa açarını daxil et ki, istifadəçi fayllları bərpa edilsin. ",
-    "Search Users" : "İstifadəçiləri axtar",
     "Add Group" : "Qrup əlavə et",
     "Group" : "Qrup",
     "Everyone" : "Hamı",
diff --git a/settings/l10n/az.json b/settings/l10n/az.json
index 68ed9c3926..5664b44880 100644
--- a/settings/l10n/az.json
+++ b/settings/l10n/az.json
@@ -210,7 +210,6 @@
     "Create" : "Yarat",
     "Admin Recovery Password" : "İnzibatçı bərpa şifrəsi",
     "Enter the recovery password in order to recover the users files during password change" : "Şifrə dəyişilməsi müddətində, səliqə ilə bərpa açarını daxil et ki, istifadəçi fayllları bərpa edilsin. ",
-    "Search Users" : "İstifadəçiləri axtar",
     "Add Group" : "Qrup əlavə et",
     "Group" : "Qrup",
     "Everyone" : "Hamı",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 13ac183a12..10766ffc36 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -211,7 +211,6 @@ OC.L10N.register(
     "Create" : "Създаване",
     "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
     "Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
-    "Search Users" : "Търси Потребители",
     "Add Group" : "Добави Група",
     "Group" : "Група",
     "Everyone" : "Всички",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index 639998e841..7e419c07a1 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -209,7 +209,6 @@
     "Create" : "Създаване",
     "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
     "Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
-    "Search Users" : "Търси Потребители",
     "Add Group" : "Добави Група",
     "Group" : "Група",
     "Everyone" : "Всички",
diff --git a/settings/l10n/bs.js b/settings/l10n/bs.js
index bcf27bd82f..b98bc00fd6 100644
--- a/settings/l10n/bs.js
+++ b/settings/l10n/bs.js
@@ -178,7 +178,6 @@ OC.L10N.register(
     "Create" : "Kreiraj",
     "Admin Recovery Password" : "Admin lozinka za oporavak",
     "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tokom promjene lozinke",
-    "Search Users" : "Traži Korisnike",
     "Add Group" : "Dodaj Grupu",
     "Group" : "Grupa",
     "Everyone" : "Svi",
diff --git a/settings/l10n/bs.json b/settings/l10n/bs.json
index 5a8f070ad6..25b5ec57d4 100644
--- a/settings/l10n/bs.json
+++ b/settings/l10n/bs.json
@@ -176,7 +176,6 @@
     "Create" : "Kreiraj",
     "Admin Recovery Password" : "Admin lozinka za oporavak",
     "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tokom promjene lozinke",
-    "Search Users" : "Traži Korisnike",
     "Add Group" : "Dodaj Grupu",
     "Group" : "Grupa",
     "Everyone" : "Svi",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 23ea923f42..2641096930 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Desintal·lant ...",
     "Error while uninstalling app" : "Error en desinstal·lar l'aplicació",
     "Uninstall" : "Desinstal·la",
+    "An error occurred: {message}" : "S'ha produït un error: {message}",
     "Select a profile picture" : "Seleccioneu una imatge de perfil",
     "Very weak password" : "Contrasenya massa feble",
     "Weak password" : "Contrasenya feble",
@@ -120,6 +121,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si la seva instal·lació no està situada en l'arrel del domini i usa el sistema cron, pot haver-hi problemes en generar-se els URL. Per evitar-los, configuri l'opció \"overwrite.cli.url\" en el seu arxiu config.php perquè usi la ruta de l'arrel del lloc web de la seva instal·lació (suggeriment: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No va ser possible executar cronjob via CLI. Han aparegut els següents errors tècnics:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Per favor, torni a comprovar les <a target=\"_blank\" href=\"%s\">guies d'instal·lació ↗ </a>, i verifiqui que no existeixen errors o advertiments en el <a href=\"#log-section\">log</a>.",
+    "Open documentation" : "Obre la documentació",
     "Allow apps to use the Share API" : "Permet que les aplicacions utilitzin l'API de compartir",
     "Allow users to share via link" : "Permet als usuaris compartir a través d'enllaços",
     "Enforce password protection" : "Reforça la protecció amb contrasenya",
@@ -169,11 +171,12 @@ OC.L10N.register(
     "How to do backups" : "Com fer còpies de seguretat",
     "Advanced monitoring" : "Supervisió avançada",
     "Performance tuning" : "Ajust del rendiment",
-    "Improving the config.php" : "Mejorar el config.php",
+    "Improving the config.php" : "Millorant el config.php",
     "Theming" : "Tematització",
     "Hardening and security guidance" : "Guia de protecció i seguretat",
     "Version" : "Versió",
     "Developer documentation" : "Documentació para desenvolupadors",
+    "Experimental applications ahead" : "A partir d'aquest punt hi ha aplicacions experimentals",
     "by" : "per",
     "licensed" : "llicenciat/da",
     "Documentation:" : "Documentació:",
@@ -235,7 +238,6 @@ OC.L10N.register(
     "Create" : "Crea",
     "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
-    "Search Users" : "Buscar usuaris",
     "Add Group" : "Afegeix grup",
     "Group" : "Grup",
     "Everyone" : "Tothom",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index 1d6b383d1d..05a02f5e36 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -69,6 +69,7 @@
     "Uninstalling ...." : "Desintal·lant ...",
     "Error while uninstalling app" : "Error en desinstal·lar l'aplicació",
     "Uninstall" : "Desinstal·la",
+    "An error occurred: {message}" : "S'ha produït un error: {message}",
     "Select a profile picture" : "Seleccioneu una imatge de perfil",
     "Very weak password" : "Contrasenya massa feble",
     "Weak password" : "Contrasenya feble",
@@ -118,6 +119,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si la seva instal·lació no està situada en l'arrel del domini i usa el sistema cron, pot haver-hi problemes en generar-se els URL. Per evitar-los, configuri l'opció \"overwrite.cli.url\" en el seu arxiu config.php perquè usi la ruta de l'arrel del lloc web de la seva instal·lació (suggeriment: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No va ser possible executar cronjob via CLI. Han aparegut els següents errors tècnics:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Per favor, torni a comprovar les <a target=\"_blank\" href=\"%s\">guies d'instal·lació ↗ </a>, i verifiqui que no existeixen errors o advertiments en el <a href=\"#log-section\">log</a>.",
+    "Open documentation" : "Obre la documentació",
     "Allow apps to use the Share API" : "Permet que les aplicacions utilitzin l'API de compartir",
     "Allow users to share via link" : "Permet als usuaris compartir a través d'enllaços",
     "Enforce password protection" : "Reforça la protecció amb contrasenya",
@@ -167,11 +169,12 @@
     "How to do backups" : "Com fer còpies de seguretat",
     "Advanced monitoring" : "Supervisió avançada",
     "Performance tuning" : "Ajust del rendiment",
-    "Improving the config.php" : "Mejorar el config.php",
+    "Improving the config.php" : "Millorant el config.php",
     "Theming" : "Tematització",
     "Hardening and security guidance" : "Guia de protecció i seguretat",
     "Version" : "Versió",
     "Developer documentation" : "Documentació para desenvolupadors",
+    "Experimental applications ahead" : "A partir d'aquest punt hi ha aplicacions experimentals",
     "by" : "per",
     "licensed" : "llicenciat/da",
     "Documentation:" : "Documentació:",
@@ -233,7 +236,6 @@
     "Create" : "Crea",
     "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
-    "Search Users" : "Buscar usuaris",
     "Add Group" : "Afegeix grup",
     "Group" : "Grup",
     "Everyone" : "Tothom",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 482c62b012..17f02402ae 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Emailový server",
     "Log" : "Záznam",
-    "Server status" : "Stav serveru",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizace",
     "Authentication error" : "Chyba přihlášení",
@@ -119,7 +118,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php není nejspíše správně nastaveno pro dotazování na proměnné hodnoty systému. Test s getenv(\"PATH\") vrací pouze prázdnou odpověď.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Zkontrolujte prosím konfiguraci php podle instalační dokumentace a php konfiguraci na serveru, hlavně při použití php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfigurace je nastavena pouze pro čtení. Toto znemožňuje některá nastavení přes webové rozhraní. Dále musí být pro každou změnu povolen zápis do konfiguračního souboru ručně.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
@@ -132,6 +130,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Instalace mimo kořenový adresář domény a používání systémového příkazu cron může způsobit problém s generováním správné URL. Pro zabránění těmto chybám nastavte prosím správnou cestu ve svém config.php souboru v hodnotě \"overwrite.cli.url\" (Je doporučena tato: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Nebylo možné spustit službu cron v CLI. Došlo k následujícím technickým chybám:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Ověřte znovu prosím informace z <a target=\"_blank\" href=\"%s\">instalační příručky ↗</a> a zkontrolujte <a href=\"#log-section\">log</a> na výskyt chyb a varování.",
+    "All checks passed." : "Všechny testy byly úspěšné.",
     "Open documentation" : "Otevřít dokumentaci",
     "Allow apps to use the Share API" : "Povolit aplikacím používat API sdílení",
     "Allow users to share via link" : "Povolit uživatelům sdílení pomocí odkazů",
@@ -154,7 +153,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
     "Enable server-side encryption" : "Povolit šifrování na straně serveru",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Zašifrování je nevratný proces. Po zapnutí šifrování jsou poté všechny soubory na serveru šifrovány a to již poté nelze vypnout. Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
+    "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Šifrování dat na serveru je nevratný proces. Po zapnutí šifrování jsou všechny datové soubory zašifrovány a toto již poté nelze vypnout",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Kdokoliv s administrátorským přístupem k tomuto ownCloud serveru má možnost dešifrovat data, buď zachycením požadavků nebo získáním uživatelských hesel, která jsou uložena v čitelné podobě v souborech sezení. Šifrování dat na serveru proto nechrání před administrátory serveru, ale je užitečné jako ochrana vašich dat na externě hostovaném úložišti.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "V závislosti na použitém šifrovacím modulu je velikost zašifrovaných souborů navýšena (o 35%% nebo více při použití výchozího modulu)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Pro zabránění ztráty dat je třeba pravidelně zálohovat všechny šifrovací klíče (data/<user>/files_encryption a data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
     "Enable encryption" : "Povolit šifrování",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.",
     "Select default encryption module:" : "Vybrat výchozí šifrovací modul:",
@@ -181,8 +185,6 @@ OC.L10N.register(
     "More" : "Více",
     "Less" : "Méně",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!",
-    "Transactional File Locking is enabled." : "Transakční zamykání souboru je povoleno.",
-    "Transactional File Locking is disabled." : "Transakční zamykání souboru není povoleno.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Je použita databáze SQLite. Pro větší instalace doporučujeme přejít na robustnější databázi.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Pro migraci na jinou databázi lze použít aplikaci pro příkazový řádek: 'occ db:convert-type', nebo nahlédněte do <a target=\"_blank\" href=\"%s\">dokumentace ↗</a>.",
@@ -261,7 +263,6 @@ OC.L10N.register(
     "Create" : "Vytvořit",
     "Admin Recovery Password" : "Heslo obnovy správce",
     "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
-    "Search Users" : "Hledat uživatele",
     "Add Group" : "Přidat skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všichni",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 630bf5e635..455280dbeb 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Emailový server",
     "Log" : "Záznam",
-    "Server status" : "Stav serveru",
     "Tips & tricks" : "Tipy a triky",
     "Updates" : "Aktualizace",
     "Authentication error" : "Chyba přihlášení",
@@ -117,7 +116,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php není nejspíše správně nastaveno pro dotazování na proměnné hodnoty systému. Test s getenv(\"PATH\") vrací pouze prázdnou odpověď.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Zkontrolujte prosím konfiguraci php podle instalační dokumentace a php konfiguraci na serveru, hlavně při použití php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfigurace je nastavena pouze pro čtení. Toto znemožňuje některá nastavení přes webové rozhraní. Dále musí být pro každou změnu povolen zápis do konfiguračního souboru ručně.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je patrně nastaveno tak, aby odstraňovalo bloky komentářů. Toto bude mít za následek nedostupnost množství hlavních aplikací.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Toto je pravděpodobně způsobeno aplikacemi pro urychlení načítání jako jsou Zend OPcache nebo eAccelerator.",
@@ -130,6 +128,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Instalace mimo kořenový adresář domény a používání systémového příkazu cron může způsobit problém s generováním správné URL. Pro zabránění těmto chybám nastavte prosím správnou cestu ve svém config.php souboru v hodnotě \"overwrite.cli.url\" (Je doporučena tato: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Nebylo možné spustit službu cron v CLI. Došlo k následujícím technickým chybám:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Ověřte znovu prosím informace z <a target=\"_blank\" href=\"%s\">instalační příručky ↗</a> a zkontrolujte <a href=\"#log-section\">log</a> na výskyt chyb a varování.",
+    "All checks passed." : "Všechny testy byly úspěšné.",
     "Open documentation" : "Otevřít dokumentaci",
     "Allow apps to use the Share API" : "Povolit aplikacím používat API sdílení",
     "Allow users to share via link" : "Povolit uživatelům sdílení pomocí odkazů",
@@ -152,7 +151,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
     "Enable server-side encryption" : "Povolit šifrování na straně serveru",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Zašifrování je nevratný proces. Po zapnutí šifrování jsou poté všechny soubory na serveru šifrovány a to již poté nelze vypnout. Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
+    "Please read carefully before activating server-side encryption: " : "Pročtěte prosím důkladně před aktivací šifrování dat na serveru:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Šifrování dat na serveru je nevratný proces. Po zapnutí šifrování jsou všechny datové soubory zašifrovány a toto již poté nelze vypnout",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Kdokoliv s administrátorským přístupem k tomuto ownCloud serveru má možnost dešifrovat data, buď zachycením požadavků nebo získáním uživatelských hesel, která jsou uložena v čitelné podobě v souborech sezení. Šifrování dat na serveru proto nechrání před administrátory serveru, ale je užitečné jako ochrana vašich dat na externě hostovaném úložišti.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "V závislosti na použitém šifrovacím modulu je velikost zašifrovaných souborů navýšena (o 35%% nebo více při použití výchozího modulu)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Pro zabránění ztráty dat je třeba pravidelně zálohovat všechny šifrovací klíče (data/<user>/files_encryption a data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Toto je poslední varování: Opravdu si přejete zapnout šifrování?",
     "Enable encryption" : "Povolit šifrování",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Není načten žádný šifrovací modul, povolte ho prosím v menu aplikací.",
     "Select default encryption module:" : "Vybrat výchozí šifrovací modul:",
@@ -179,8 +183,6 @@
     "More" : "Více",
     "Less" : "Méně",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Soubor logu je větší než 100 MB. Jeho stažení zabere nějaký čas!",
-    "Transactional File Locking is enabled." : "Transakční zamykání souboru je povoleno.",
-    "Transactional File Locking is disabled." : "Transakční zamykání souboru není povoleno.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Je použita databáze SQLite. Pro větší instalace doporučujeme přejít na robustnější databázi.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Obzvláště při používání klientské aplikace pro synchronizaci s desktopem není SQLite doporučeno.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Pro migraci na jinou databázi lze použít aplikaci pro příkazový řádek: 'occ db:convert-type', nebo nahlédněte do <a target=\"_blank\" href=\"%s\">dokumentace ↗</a>.",
@@ -259,7 +261,6 @@
     "Create" : "Vytvořit",
     "Admin Recovery Password" : "Heslo obnovy správce",
     "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
-    "Search Users" : "Hledat uživatele",
     "Add Group" : "Přidat skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všichni",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 8aa7e3f7b5..9a2adf5c2a 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "E-mailserver",
     "Log" : "Log",
-    "Server status" : "ServerStatus",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "Opdateringer",
     "Authentication error" : "Adgangsfejl",
@@ -119,7 +118,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lader ikke til at være korrekt opsat til at forespørge miljøvariablerne i systemet. Testen med getenv(\"PATH\") returnerer blot et tomt svar.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tjek venligst dokumentationen til installation for noterne til konfiguration af php og konfigurationen af php for din server, særligt når php-fpm anvendes.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfiguration er blevet slået til. Dette forhindrer indstillinger af nogle konfigurationer via webgrænsefladen. I tillæg skal filen gøres skrivbar manuelt for hver opdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
@@ -132,6 +130,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis din installation ikke er installeret i roden af domænet, og bruger systemets cron, så kan der være problemer med URL-oprettelsen. For at undgå disse problemer, så angiv tilvalget \"overwrite.cli.url\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke muligt at udføre cronjobbet via kommandolinjefladen CLI. Følgende tekniske fejl fremkom:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Dobbelttjek venligst  <a target=\"_blank\" href=\"%s\">, og tjek om der er fejl eller advarsler i <a href=\"#log-section\">loggen</a>.",
+    "All checks passed." : "Alle tjek blev gennemført.",
     "Open documentation" : "Åben dokumentation",
     "Allow apps to use the Share API" : "Tillad apps til at bruge Share API",
     "Allow users to share via link" : "Tillad brugere at dele via link",
@@ -154,7 +153,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
     "Enable server-side encryption" : "Slå kryptering til på serversiden",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Kryptering er en ensrettet proces. Når krypteringen er slået til, så vil alle filer fra dette punkt og fremefter blive krypteret på serveren, og det vil ikke være muligt at slå krypteringen fra på et senere tidspunkt. Dette er den sidste advarsel: Er du sikker på, at du vil slå kryptering til?",
+    "Please read carefully before activating server-side encryption: " : "Læs venligst dette omhyggeligt, før der aktivere kryptering på serversiden:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Kryptering på serversiden er en envejsproces. Når krypteringen slås til, så vil alle filer fremefter blive krypteret på serveren, og det vil ikke være muligt at slå kryptering fra efterfølgende",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Enhver med priviligeret adgang til din ownCloud-server kan dekryptere dine filer, enten ved at opsnappe forespørgsler eller aflæse brugerkodeord, der bliver lagret i sessionsfiler med klartekst. Kryptering af serversiden beskytter derfor ikke mod ondsindede administratorer, men kan hjælpe til at beskytte dine data når de lagres hos eksterne værter.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhængig af det faktiske krypteringsmodul, så øges den generelle filstørrelse (med 35%% eller mere ved brug af standardmodulet)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør jævnligt foretage sikkerhedskopiering af alle krypteringsnøgler, for at forhindre permanente tab af data (data/<user>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dette er den sidste advarsel: Sikker på at du vil slå kryptering til?",
     "Enable encryption" : "Slå kryptering til",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Der er ikke indlæst et krypteringsmodul - slå venligst et krypteringsmodul til i app-menuen.",
     "Select default encryption module:" : "Vælg standardmodulet til kryptering:",
@@ -181,8 +185,6 @@ OC.L10N.register(
     "More" : "Mere",
     "Less" : "Mindre",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logfilen er større end 100 MB. Det kan tage en del tid at hente den!",
-    "Transactional File Locking is enabled." : "Transaktionel fillåsning er slået til.",
-    "Transactional File Locking is disabled." : "Transaktionel fillåsning er slået fra.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite bruges som database. Til større installationer anbefaler vi at skifte til en anden database-backend.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Brug af SQLite frarådes især når skrivebordsklienten anvendes til filsynkronisering.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For at migrere til en anden database, så brug kommandolinjeværktøjet: \"occ db:convert-type\" eller se <a target=\"_blank\" href=\"%s\">dokumentationen ↗</a>.",
@@ -239,6 +241,7 @@ OC.L10N.register(
     "Upload new" : "Upload nyt",
     "Select new from Files" : "Vælg nyt fra Filer",
     "Remove image" : "Fjern billede",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Enten png eller jpg. Ideelt kvadratisk men du har mulighed for at beskære det. Filen må ikke overskride maksimumgrænsen på 20 MB.",
     "Your avatar is provided by your original account." : "Din avatar kommer fra din oprindelige konto.",
     "Cancel" : "Annuller",
     "Choose as profile image" : "Vælg som profilbillede",
@@ -260,7 +263,6 @@ OC.L10N.register(
     "Create" : "Ny",
     "Admin Recovery Password" : "Administrator gendannelse kodeord",
     "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
-    "Search Users" : "Søg efter brugere",
     "Add Group" : "Tilføj Gruppe",
     "Group" : "Gruppe",
     "Everyone" : "Alle",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index eef597ae56..3ae0aeb173 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "E-mailserver",
     "Log" : "Log",
-    "Server status" : "ServerStatus",
     "Tips & tricks" : "Tips & tricks",
     "Updates" : "Opdateringer",
     "Authentication error" : "Adgangsfejl",
@@ -117,7 +116,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lader ikke til at være korrekt opsat til at forespørge miljøvariablerne i systemet. Testen med getenv(\"PATH\") returnerer blot et tomt svar.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tjek venligst dokumentationen til installation for noterne til konfiguration af php og konfigurationen af php for din server, særligt når php-fpm anvendes.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfiguration er blevet slået til. Dette forhindrer indstillinger af nogle konfigurationer via webgrænsefladen. I tillæg skal filen gøres skrivbar manuelt for hver opdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP opsætning blokere \"inline doc blocks\". dette gør at flere grundlæggende apps utilgængelige",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette er sansynligvis forårsaget af et accelerator eller cache som Zend OPcache eller eAccelerator",
@@ -130,6 +128,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis din installation ikke er installeret i roden af domænet, og bruger systemets cron, så kan der være problemer med URL-oprettelsen. For at undgå disse problemer, så angiv tilvalget \"overwrite.cli.url\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke muligt at udføre cronjobbet via kommandolinjefladen CLI. Følgende tekniske fejl fremkom:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Dobbelttjek venligst  <a target=\"_blank\" href=\"%s\">, og tjek om der er fejl eller advarsler i <a href=\"#log-section\">loggen</a>.",
+    "All checks passed." : "Alle tjek blev gennemført.",
     "Open documentation" : "Åben dokumentation",
     "Allow apps to use the Share API" : "Tillad apps til at bruge Share API",
     "Allow users to share via link" : "Tillad brugere at dele via link",
@@ -152,7 +151,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
     "Enable server-side encryption" : "Slå kryptering til på serversiden",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Kryptering er en ensrettet proces. Når krypteringen er slået til, så vil alle filer fra dette punkt og fremefter blive krypteret på serveren, og det vil ikke være muligt at slå krypteringen fra på et senere tidspunkt. Dette er den sidste advarsel: Er du sikker på, at du vil slå kryptering til?",
+    "Please read carefully before activating server-side encryption: " : "Læs venligst dette omhyggeligt, før der aktivere kryptering på serversiden:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Kryptering på serversiden er en envejsproces. Når krypteringen slås til, så vil alle filer fremefter blive krypteret på serveren, og det vil ikke være muligt at slå kryptering fra efterfølgende",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Enhver med priviligeret adgang til din ownCloud-server kan dekryptere dine filer, enten ved at opsnappe forespørgsler eller aflæse brugerkodeord, der bliver lagret i sessionsfiler med klartekst. Kryptering af serversiden beskytter derfor ikke mod ondsindede administratorer, men kan hjælpe til at beskytte dine data når de lagres hos eksterne værter.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhængig af det faktiske krypteringsmodul, så øges den generelle filstørrelse (med 35%% eller mere ved brug af standardmodulet)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør jævnligt foretage sikkerhedskopiering af alle krypteringsnøgler, for at forhindre permanente tab af data (data/<user>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dette er den sidste advarsel: Sikker på at du vil slå kryptering til?",
     "Enable encryption" : "Slå kryptering til",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Der er ikke indlæst et krypteringsmodul - slå venligst et krypteringsmodul til i app-menuen.",
     "Select default encryption module:" : "Vælg standardmodulet til kryptering:",
@@ -179,8 +183,6 @@
     "More" : "Mere",
     "Less" : "Mindre",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Logfilen er større end 100 MB. Det kan tage en del tid at hente den!",
-    "Transactional File Locking is enabled." : "Transaktionel fillåsning er slået til.",
-    "Transactional File Locking is disabled." : "Transaktionel fillåsning er slået fra.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite bruges som database. Til større installationer anbefaler vi at skifte til en anden database-backend.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Brug af SQLite frarådes især når skrivebordsklienten anvendes til filsynkronisering.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For at migrere til en anden database, så brug kommandolinjeværktøjet: \"occ db:convert-type\" eller se <a target=\"_blank\" href=\"%s\">dokumentationen ↗</a>.",
@@ -237,6 +239,7 @@
     "Upload new" : "Upload nyt",
     "Select new from Files" : "Vælg nyt fra Filer",
     "Remove image" : "Fjern billede",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Enten png eller jpg. Ideelt kvadratisk men du har mulighed for at beskære det. Filen må ikke overskride maksimumgrænsen på 20 MB.",
     "Your avatar is provided by your original account." : "Din avatar kommer fra din oprindelige konto.",
     "Cancel" : "Annuller",
     "Choose as profile image" : "Vælg som profilbillede",
@@ -258,7 +261,6 @@
     "Create" : "Ny",
     "Admin Recovery Password" : "Administrator gendannelse kodeord",
     "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
-    "Search Users" : "Søg efter brugere",
     "Add Group" : "Tilføj Gruppe",
     "Group" : "Gruppe",
     "Everyone" : "Alle",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 2f0127cf57..477b954f65 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -30,7 +30,9 @@ OC.L10N.register(
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "das Installieren und Aktualisieren von Apps durch den App-Store oder durch Federated Cloud Sharing",
     "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL verwendet eine veraltete %s Version (%s). Bitte aktualisiere dein Betriebsystem, da ansonsten Funktionen, wie z.B. %s, nicht zuverlässig funktionieren werden.",
     "A problem occurred, please check your log files (Error: %s)" : "Es ist ein Problem aufgetreten, bitte überprüfe Deine Logdateien (Fehler: %s)",
     "Migration Completed" : "Migration komplett",
     "Group already exists." : "Gruppe existiert bereits.",
@@ -75,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Deinstallieren…",
     "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
     "Uninstall" : "Deinstallieren",
+    "An error occurred: {message}" : "Ein Fehler ist aufgetreten: {message}",
     "Select a profile picture" : "Wähle ein Profilbild",
     "Very weak password" : "Sehr schwaches Passwort",
     "Weak password" : "Schwaches Passwort",
@@ -115,7 +118,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfe die Installationsdokumentation auf Hinweise zur PHP-Konfiguration sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
@@ -150,7 +152,6 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Verschlüsselung ist ein ein Prozess in eine Richtung. Wenn die Verschlüsselung aktiviert ist, werden alle Dateien von diesem Zeitpunkt an auf dem Server verschlüsselt und es wird nicht mehr möglich sein, die Verschlüsselung zu einem späteren Zeitpunkt zu deaktivieren. Dies ist die letzte Warnung: Möchtest Du die Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
     "Select default encryption module:" : "Bite Standard-Verschlüsselungs-Modul auswählen:",
@@ -177,8 +178,6 @@ OC.L10N.register(
     "More" : "Mehr",
     "Less" : "Weniger",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
-    "Transactional File Locking is enabled." : "Dateisperren bei Transaktionen sind aktiviert.",
-    "Transactional File Locking is disabled." : "Dateisperren bei Transaktionen sind deaktiviert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a> schauen.",
@@ -205,7 +204,7 @@ OC.L10N.register(
     "Enable experimental apps" : "Experimentelle Apps aktivieren",
     "No apps found for your version" : "Es wurden keine Apps für Deine Version gefunden",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.<br><br>Dein Benutzername: %s<br>Greife darauf zu: <a href=\"%s\">%s</a><br><br>",
-    "Cheers!" : "Hallo!",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.\n\nDein Benutzername: %s\nGreife darauf zu: %s\n\n",
     "Administrator documentation" : "Dokumentation für Administratoren",
     "Online documentation" : "Online-Dokumentation",
@@ -235,6 +234,7 @@ OC.L10N.register(
     "Upload new" : "Neues hochladen",
     "Select new from Files" : "Neues aus den Dateien wählen",
     "Remove image" : "Bild entfernen",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Entweder png oder jpg. Im Idealfall quadratisch, aber du kannst das Bild beschneiden. Es ist nicht erlaubt die Maximalgröße von 20 MB zu überschreiten.",
     "Your avatar is provided by your original account." : "Dein Avatar wird von Deinem ursprünglichen Konto bereitgestellt.",
     "Cancel" : "Abbrechen",
     "Choose as profile image" : "Als Profilbild wählen",
@@ -256,7 +256,6 @@ OC.L10N.register(
     "Create" : "Anlegen",
     "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
     "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während der Passwortänderung wiederherzustellen",
-    "Search Users" : "Benutzer suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 5850b609ea..1a7cbdc3c1 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -28,7 +28,9 @@
     "Unable to change password" : "Passwort konnte nicht geändert werden",
     "Enabled" : "Aktiviert",
     "Not enabled" : "Nicht aktiviert",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "das Installieren und Aktualisieren von Apps durch den App-Store oder durch Federated Cloud Sharing",
     "Federated Cloud Sharing" : "Federated-Cloud-Sharing",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL verwendet eine veraltete %s Version (%s). Bitte aktualisiere dein Betriebsystem, da ansonsten Funktionen, wie z.B. %s, nicht zuverlässig funktionieren werden.",
     "A problem occurred, please check your log files (Error: %s)" : "Es ist ein Problem aufgetreten, bitte überprüfe Deine Logdateien (Fehler: %s)",
     "Migration Completed" : "Migration komplett",
     "Group already exists." : "Gruppe existiert bereits.",
@@ -73,6 +75,7 @@
     "Uninstalling ...." : "Deinstallieren…",
     "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
     "Uninstall" : "Deinstallieren",
+    "An error occurred: {message}" : "Ein Fehler ist aufgetreten: {message}",
     "Select a profile picture" : "Wähle ein Profilbild",
     "Very weak password" : "Sehr schwaches Passwort",
     "Weak password" : "Schwaches Passwort",
@@ -113,7 +116,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfe die Installationsdokumentation auf Hinweise zur PHP-Konfiguration sowie die PHP-Konfiguration Deines Servers, insbesondere dann, wenn Du PHP-FPM einsetzt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
@@ -148,7 +150,6 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutze den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Verschlüsselung ist ein ein Prozess in eine Richtung. Wenn die Verschlüsselung aktiviert ist, werden alle Dateien von diesem Zeitpunkt an auf dem Server verschlüsselt und es wird nicht mehr möglich sein, die Verschlüsselung zu einem späteren Zeitpunkt zu deaktivieren. Dies ist die letzte Warnung: Möchtest Du die Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
     "Select default encryption module:" : "Bite Standard-Verschlüsselungs-Modul auswählen:",
@@ -175,8 +176,6 @@
     "More" : "Mehr",
     "Less" : "Weniger",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
-    "Transactional File Locking is enabled." : "Dateisperren bei Transaktionen sind aktiviert.",
-    "Transactional File Locking is disabled." : "Dateisperren bei Transaktionen sind deaktiviert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um zu einer anderen Datenbank zu migrieren, benutze bitte die Kommandozeile: 'occ db:convert-type', oder in die <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a> schauen.",
@@ -203,7 +202,7 @@
     "Enable experimental apps" : "Experimentelle Apps aktivieren",
     "No apps found for your version" : "Es wurden keine Apps für Deine Version gefunden",
     "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Hallo,<br><br>hier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.<br><br>Dein Benutzername: %s<br>Greife darauf zu: <a href=\"%s\">%s</a><br><br>",
-    "Cheers!" : "Hallo!",
+    "Cheers!" : "Noch einen schönen Tag!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hallo,\n\nhier nur kurz die Mitteilung, dass Du jetzt ein %s-Konto hast.\n\nDein Benutzername: %s\nGreife darauf zu: %s\n\n",
     "Administrator documentation" : "Dokumentation für Administratoren",
     "Online documentation" : "Online-Dokumentation",
@@ -233,6 +232,7 @@
     "Upload new" : "Neues hochladen",
     "Select new from Files" : "Neues aus den Dateien wählen",
     "Remove image" : "Bild entfernen",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Entweder png oder jpg. Im Idealfall quadratisch, aber du kannst das Bild beschneiden. Es ist nicht erlaubt die Maximalgröße von 20 MB zu überschreiten.",
     "Your avatar is provided by your original account." : "Dein Avatar wird von Deinem ursprünglichen Konto bereitgestellt.",
     "Cancel" : "Abbrechen",
     "Choose as profile image" : "Als Profilbild wählen",
@@ -254,7 +254,6 @@
     "Create" : "Anlegen",
     "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
     "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während der Passwortänderung wiederherzustellen",
-    "Search Users" : "Benutzer suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/de_CH.js b/settings/l10n/de_CH.js
deleted file mode 100644
index af913b8d81..0000000000
--- a/settings/l10n/de_CH.js
+++ /dev/null
@@ -1,102 +0,0 @@
-OC.L10N.register(
-    "settings",
-    {
-    "Enabled" : "Aktiviert",
-    "Authentication error" : "Authentifizierungs-Fehler",
-    "Group already exists" : "Die Gruppe existiert bereits",
-    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
-    "Email saved" : "E-Mail-Adresse gespeichert",
-    "Invalid email" : "Ungültige E-Mail-Adresse",
-    "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden",
-    "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden",
-    "Language changed" : "Sprache geändert",
-    "Invalid request" : "Ungültige Anforderung",
-    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
-    "Unable to add user to group %s" : "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
-    "Unable to remove user from group %s" : "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
-    "Couldn't update app." : "Die App konnte nicht aktualisiert werden.",
-    "Saved" : "Gespeichert",
-    "Email sent" : "Email gesendet",
-    "All" : "Alle",
-    "Please wait...." : "Bitte warten....",
-    "Error while disabling app" : "Fehler während der Deaktivierung der Anwendung",
-    "Disable" : "Deaktivieren",
-    "Enable" : "Aktivieren",
-    "Error while enabling app" : "Fehler während der Aktivierung der Anwendung",
-    "Updating...." : "Update...",
-    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
-    "Updated" : "Aktualisiert",
-    "Delete" : "Löschen",
-    "Decrypting files... Please wait, this can take some time." : "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
-    "Groups" : "Gruppen",
-    "undo" : "rückgängig machen",
-    "never" : "niemals",
-    "add group" : "Gruppe hinzufügen",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "Error creating user" : "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
-    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
-    "__language_name__" : "Deutsch (Schweiz)",
-    "SSL root certificates" : "SSL-Root-Zertifikate",
-    "Encryption" : "Verschlüsselung",
-    "Login" : "Anmelden",
-    "Security Warning" : "Sicherheitshinweis",
-    "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
-    "Setup Warning" : "Einrichtungswarnung",
-    "Module 'fileinfo' missing" : "Das Modul 'fileinfo' fehlt",
-    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
-    "Locale not working" : "Die Lokalisierung funktioniert nicht",
-    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
-    "Cron" : "Cron",
-    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
-    "Sharing" : "Teilen",
-    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
-    "Allow public uploads" : "Erlaube öffentliches hochladen",
-    "Allow resharing" : "Erlaube Weiterverteilen",
-    "Security" : "Sicherheit",
-    "Enforce HTTPS" : "HTTPS erzwingen",
-    "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
-    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
-    "Server address" : "Adresse des Servers",
-    "Port" : "Port",
-    "Log" : "Log",
-    "Log level" : "Log-Level",
-    "More" : "Mehr",
-    "Less" : "Weniger",
-    "Version" : "Version",
-    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
-    "More apps" : "Mehr Apps",
-    "by" : "von",
-    "User Documentation" : "Dokumentation für Benutzer",
-    "Administrator Documentation" : "Dokumentation für Administratoren",
-    "Online Documentation" : "Online-Dokumentation",
-    "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommerzieller Support",
-    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
-    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
-    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
-    "Password" : "Passwort",
-    "Your password was changed" : "Ihr Passwort wurde geändert.",
-    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
-    "Current password" : "Aktuelles Passwort",
-    "New password" : "Neues Passwort",
-    "Change password" : "Passwort ändern",
-    "Email" : "E-Mail",
-    "Your email address" : "Ihre E-Mail-Adresse",
-    "Cancel" : "Abbrechen",
-    "Language" : "Sprache",
-    "Help translate" : "Helfen Sie bei der Übersetzung",
-    "Import Root Certificate" : "Root-Zertifikate importieren",
-    "Log-in password" : "Login-Passwort",
-    "Decrypt all Files" : "Alle Dateien entschlüsseln",
-    "Login Name" : "Loginname",
-    "Create" : "Erstellen",
-    "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
-    "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-    "Unlimited" : "Unbegrenzt",
-    "Other" : "Andere",
-    "Username" : "Benutzername",
-    "set new password" : "Neues Passwort setzen",
-    "Default" : "Standard"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de_CH.json b/settings/l10n/de_CH.json
deleted file mode 100644
index ad7338d33b..0000000000
--- a/settings/l10n/de_CH.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{ "translations": {
-    "Enabled" : "Aktiviert",
-    "Authentication error" : "Authentifizierungs-Fehler",
-    "Group already exists" : "Die Gruppe existiert bereits",
-    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
-    "Email saved" : "E-Mail-Adresse gespeichert",
-    "Invalid email" : "Ungültige E-Mail-Adresse",
-    "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden",
-    "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden",
-    "Language changed" : "Sprache geändert",
-    "Invalid request" : "Ungültige Anforderung",
-    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
-    "Unable to add user to group %s" : "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
-    "Unable to remove user from group %s" : "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
-    "Couldn't update app." : "Die App konnte nicht aktualisiert werden.",
-    "Saved" : "Gespeichert",
-    "Email sent" : "Email gesendet",
-    "All" : "Alle",
-    "Please wait...." : "Bitte warten....",
-    "Error while disabling app" : "Fehler während der Deaktivierung der Anwendung",
-    "Disable" : "Deaktivieren",
-    "Enable" : "Aktivieren",
-    "Error while enabling app" : "Fehler während der Aktivierung der Anwendung",
-    "Updating...." : "Update...",
-    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
-    "Updated" : "Aktualisiert",
-    "Delete" : "Löschen",
-    "Decrypting files... Please wait, this can take some time." : "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
-    "Groups" : "Gruppen",
-    "undo" : "rückgängig machen",
-    "never" : "niemals",
-    "add group" : "Gruppe hinzufügen",
-    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
-    "Error creating user" : "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
-    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
-    "__language_name__" : "Deutsch (Schweiz)",
-    "SSL root certificates" : "SSL-Root-Zertifikate",
-    "Encryption" : "Verschlüsselung",
-    "Login" : "Anmelden",
-    "Security Warning" : "Sicherheitshinweis",
-    "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
-    "Setup Warning" : "Einrichtungswarnung",
-    "Module 'fileinfo' missing" : "Das Modul 'fileinfo' fehlt",
-    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
-    "Locale not working" : "Die Lokalisierung funktioniert nicht",
-    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
-    "Cron" : "Cron",
-    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
-    "Sharing" : "Teilen",
-    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
-    "Allow public uploads" : "Erlaube öffentliches hochladen",
-    "Allow resharing" : "Erlaube Weiterverteilen",
-    "Security" : "Sicherheit",
-    "Enforce HTTPS" : "HTTPS erzwingen",
-    "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
-    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
-    "Server address" : "Adresse des Servers",
-    "Port" : "Port",
-    "Log" : "Log",
-    "Log level" : "Log-Level",
-    "More" : "Mehr",
-    "Less" : "Weniger",
-    "Version" : "Version",
-    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
-    "More apps" : "Mehr Apps",
-    "by" : "von",
-    "User Documentation" : "Dokumentation für Benutzer",
-    "Administrator Documentation" : "Dokumentation für Administratoren",
-    "Online Documentation" : "Online-Dokumentation",
-    "Forum" : "Forum",
-    "Bugtracker" : "Bugtracker",
-    "Commercial Support" : "Kommerzieller Support",
-    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
-    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
-    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
-    "Password" : "Passwort",
-    "Your password was changed" : "Ihr Passwort wurde geändert.",
-    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
-    "Current password" : "Aktuelles Passwort",
-    "New password" : "Neues Passwort",
-    "Change password" : "Passwort ändern",
-    "Email" : "E-Mail",
-    "Your email address" : "Ihre E-Mail-Adresse",
-    "Cancel" : "Abbrechen",
-    "Language" : "Sprache",
-    "Help translate" : "Helfen Sie bei der Übersetzung",
-    "Import Root Certificate" : "Root-Zertifikate importieren",
-    "Log-in password" : "Login-Passwort",
-    "Decrypt all Files" : "Alle Dateien entschlüsseln",
-    "Login Name" : "Loginname",
-    "Create" : "Erstellen",
-    "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
-    "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-    "Unlimited" : "Unbegrenzt",
-    "Other" : "Andere",
-    "Username" : "Benutzername",
-    "set new password" : "Neues Passwort setzen",
-    "Default" : "Standard"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 3c28e3cb52..5c93150434 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfen Sie die Installationsdokumentation auf Hinweise zur PHP-Konfiguration sowie die PHP-Konfiguration Ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzen.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
@@ -150,7 +149,6 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Verschlüsselung ist ein ein Prozess in eine Richtung. Wenn die Verschlüsselung aktiviert ist, werden alle Dateien von diesem Zeitpunkt an auf dem Server verschlüsselt und es wird nicht mehr möglich sein, die Verschlüsselung zu einem späteren Zeitpunkt zu deaktivieren. Dies ist die letzte Warnung: Möchten Sie die Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
     "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",
@@ -177,8 +175,6 @@ OC.L10N.register(
     "More" : "Mehr",
     "Less" : "Weniger",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
-    "Transactional File Locking is enabled." : "Dateisperren bei Transaktionen sind aktiviert.",
-    "Transactional File Locking is disabled." : "Dateisperren bei Transaktionen sind deaktiviert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um auf eine andere Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: „occ db:convert-type“ oder konsultieren Sie die <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a>.",
@@ -256,7 +252,6 @@ OC.L10N.register(
     "Create" : "Erstellen",
     "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
     "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während der Passwortänderung wiederherzustellen",
-    "Search Users" : "Benutzer suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index e912d74525..0518e75c4e 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -113,7 +113,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP scheint zur Abfrage von Systemumgebungsvariablen nicht richtig eingerichtet zu sein. Der Test mit getenv (\"PATH\") liefert nur eine leere Antwort zurück.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Bitten überprüfen Sie die Installationsdokumentation auf Hinweise zur PHP-Konfiguration sowie die PHP-Konfiguration Ihres Servers, insbesondere dann, wenn Sie PHP-FPM einsetzen.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Die schreibgeschützte Konfiguration wurde aktiviert. Dies verhindert das Setzen einiger Einstellungen über die Web-Schnittstelle. Weiterhin muss bei jedem Update der Schreibzugriff auf die Datei händisch aktiviert werden.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ist offenbar so konfiguriert, dass PHPDoc-Blöcke in der Anweisung entfernt werden. Dadurch sind mehrere Kern-Apps nicht erreichbar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dies wird wahrscheinlich durch Zwischenspeicher/Beschleuniger wie etwa Zend OPcache oder eAccelerator verursacht.",
@@ -148,7 +147,6 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den systemeigenen Cron-Dienst, um die cron.php alle 15 Minuten aufzurufen.",
     "Enable server-side encryption" : "Serverseitige Verschlüsselung aktivieren",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Verschlüsselung ist ein ein Prozess in eine Richtung. Wenn die Verschlüsselung aktiviert ist, werden alle Dateien von diesem Zeitpunkt an auf dem Server verschlüsselt und es wird nicht mehr möglich sein, die Verschlüsselung zu einem späteren Zeitpunkt zu deaktivieren. Dies ist die letzte Warnung: Möchten Sie die Verschlüsselung wirklich aktivieren?",
     "Enable encryption" : "Verschlüsselung aktivieren",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Kein Verschlüsselungs-Modul geladen, bitte aktiviere ein Verschlüsselungs-Modul im Anwendungs-Menü.",
     "Select default encryption module:" : "Standard-Verschlüsselungs-Modul auswählen:",
@@ -175,8 +173,6 @@
     "More" : "Mehr",
     "Less" : "Weniger",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Die Logdatei ist größer als 100 MB. Es kann etwas Zeit beanspruchen, sie herunterzuladen!",
-    "Transactional File Locking is enabled." : "Dateisperren bei Transaktionen sind aktiviert.",
-    "Transactional File Locking is disabled." : "Dateisperren bei Transaktionen sind deaktiviert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wird als Datenbank verwendet. Bei größeren Installationen wird empfohlen, auf ein anderes Datenbank-Backend zu wechseln.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Insbesondere bei der Nutzung des Desktop Clients zur Dateisynchronisierung wird vom Einsatz von SQLite abgeraten.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Um auf eine andere Datenbank zu migrieren, benutzen Sie bitte die Kommandozeile: „occ db:convert-type“ oder konsultieren Sie die <a target=\"_blank\" href=\"%s\">Dokumentation ↗</a>.",
@@ -254,7 +250,6 @@
     "Create" : "Erstellen",
     "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
     "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während der Passwortänderung wiederherzustellen",
-    "Search Users" : "Benutzer suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 9c7cf9afd4..e1ca38deee 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -30,7 +30,9 @@ OC.L10N.register(
     "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
     "Enabled" : "Ενεργοποιημένο",
     "Not enabled" : "Μη ενεργοποιημένο",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "εγκατάσταση και ενημέρωση εφαρμογών μέσω του καταστήματος εφαρμογών ή του ",
     "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "Το cURL χρησιμοποιεί μια παρωχημένη %s έκδοση (%s). Παρακαλούμε αναβαθμίστε το λειτουργικό σας σύστημα αλλιώς δυνατότητες όπως %s δεν θα δουλέψουν αξιόπιστα.",
     "A problem occurred, please check your log files (Error: %s)" : "Παρουσιάστηκε πρόβλημα, παρακαλώ ελέγξτε τα αρχεία καταγραφής σας (Σφάλμα: %s)",
     "Migration Completed" : "Η μετάβαση ολοκληρώθηκε",
     "Group already exists." : "Η ομάδα υπάρχει ήδη.",
@@ -75,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Απεγκατάσταση ....",
     "Error while uninstalling app" : "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
     "Uninstall" : "Απεγκατάσταση",
+    "An error occurred: {message}" : "Παρουσιάστηκε σφάλμα: {message}",
     "Select a profile picture" : "Επιλογή εικόνας προφίλ",
     "Very weak password" : "Πολύ αδύναμο συνθηματικό",
     "Weak password" : "Αδύναμο συνθηματικό",
@@ -115,19 +118,22 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Η php δεν φαίνεται να είναι σωστά ρυθμισμένη για ερωτήματα σε μεταβλητές περιβάλλοντος του συστήματος. Η δοκιμή με την εντολή getenv(\"PATH\") επιστρέφει κενή απάντηση.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Παρακαλούμε ελέγξτε την τεκμηρίωση της εγκατάστασης για τις σημειώσεις σχετικά με τη διαμόρφωση της php και τη διαμόρφωση της php στο διακομιστή σας, ειδικά όταν χρησιμοποιείτε php-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Παρακαλούμε ελέγξτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση της εγκατάστασης ↗</a> για τις σημειώσεις σχετικά με τη διαμόρφωση της php και τη διαμόρφωση της php στο διακομιστή σας, ειδικά όταν χρησιμοποιείτε php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Η ρύθμιση  \"μόνο ανάγνωση\"  έχει ενεργοποιηθεί. Αυτό εμποδίζει τον καθορισμό κάποιων ρυθμίσεων μέσω της διεπαφής web. Επιπλέον, το αρχείο πρέπει να γίνει χειροκίνητα εγγράψιμο πριν από κάθε διαδικασία ενημέρωσης.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ο διακομιστής σας τρέχει σε Microsoft Windows. Συστήνουμε ιδιαίτερα Linux για τη βέλτιστη εμπειρία του χρήστη.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Είναι εγκατεστημένο το %1$s έκδοση %2$s, για λόγους σταθερότητας και απόδοσης συστήνουμε να αναβαθμίσετε σε νεότερη έκδοση του %1$s.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. ",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Το Transactional file locking είναι απενεργοποιημένο, αυτό μπορεί να οδηγήσει σε προβλήματα με τις race conditions. Ενεργοποιήστε το 'filelocking.enabled' στο config.php για να αποφύγετε αυτά τα προβλήματα. Δείτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση ↗</a> για περισσότερες πληροφορίες.",
     "System locale can not be set to a one which supports UTF-8." : "Οι ρυθμίσεις τοποθεσίας συστήματος δεν μπορούν να οριστούν σε κάποιες που δεν υποστηρίζουν UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Αυτό σημαίνει ότι μπορεί να υπάρχουν προβλήματα με κάποιους χαρακτήρες στα ονόματα αρχείων.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Προτείνουμε ανεπιφύλακτα να εγκαταστήσετε  στο σύστημά σας τα απαιτούμενα πακέτα έτσι ώστε να υποστηρίζεται μια από τις ακόλουθες ρυθμίσεις τοποθεσίας: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν έχει γίνει στο root του τομέα  και χρησιμοποιείται το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή  \"overwrite.cli.url\" στο αρχείο  config.php που βρίσκεται στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Δεν ήταν δυνατή η εκτέλεση της cronjob μέσω τερματικού. Εμφανίστηκαν τα παρακάτω τεχνικά σφάλματα:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Το Transactional file locking χρησιμοποιεί τη βάση δεδομένων ως locking backend, για καλύτερες επιδόσεις συστήνουμς τη διαμόρφωση μιας memcache για το κλείδωμα. Δείτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση ↗</a> για περισσότερες πληροφορίες.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Παρακαλώ ελέγξτε ξανά <a target=\"_blank\" href=\"%s\">τους οδηγούς εγκατάστασης,  καθώς επίσης και για τυχόν σφάλματα ή προειδοποιήσεις στο <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Όλοι οι έλεγχοι επιτυχείς.",
     "Open documentation" : "Ανοιχτή τεκμηρίωση.",
     "Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
     "Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
@@ -150,7 +156,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
     "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Η κρυπτογράφηση είναι μια μη αντιστρεπτή διαδικασία. Μόλις ενεργοποιηθεί, όλα τα αρχεία από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή και η κρυπτογράφηση δεν είναι δυνατόν να απενεργοποιηθεί αργότερα. Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
+    "Please read carefully before activating server-side encryption: " : "Παρακαλούμε διαβάστε προσεκτικά πριν ενεργοποιήσετε την κρυπτογράφηση στο διακομιστή:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Η κρυπτογράφηση είναι μια μη αντιστρεπτή διαδικασία. Μόλις ενεργοποιηθεί, όλα τα αρχεία από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή και η κρυπτογράφηση δεν είναι δυνατόν να απενεργοποιηθεί αργότερα",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Οποιοσδήποτε έχει αυξημένα δικαιώματα πρόσβασης στο διακομιστή του ownCloud σας μπορεί να αποκρυπτογραφήσει τα αρχεία σας είτε παγιδεύοντας τα αιτήματα ή διαβάζοντας τους κωδικούς χρηστών που είναι αποθηκευμένοι σε απλά αρχεία κειμένου. Η κρυπτογράφηση στο διακομιστή δεν προστατεύει επομένως από κακόβουλους διαχειριστές αλλά είναι χρήσιμη στο να προστατεύει τα δεδομένα σας σε εξωτερικούς διακομιστές αποθήκευσης.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Ανάλογα με το άρθρωμα που χρησιμοποιείται το μέγεθος αρχείων γενικά αυξάνεται (κατά 35%% ή και περισσότερο αν χρησιμοποιηθεί το προεπιλεγμένο άρθρωμα)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Θα πρέπει να λαμβάνετε τακτικά αντίγραφα ασφαλείας όλων των κλειδιών κρυπτογράφησης για να αποφύγετε μόνιμη απώλεια δεδομένων (data/<user>/files_encryption και data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Δεν έχει φορτωθεί μονάδα κρυπτογράφησης, παρακαλούμε φορτώστε μια μονάδα κρυπτογράφησης από το μενού εφαρμογών.",
     "Select default encryption module:" : "Επιλογή προεπιλεγμένης μονάδας κρυπτογράφησης:",
@@ -177,8 +188,6 @@ OC.L10N.register(
     "More" : "Περισσότερα",
     "Less" : "Λιγότερα",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Το αρχείο ιστορικού είναι μεγαλύτερο από 100ΜΒ. Η λήψη του ίσως πάρει λίγη ώρα!",
-    "Transactional File Locking is enabled." : "Το μεταβατικό κλείδωμα αρχείων είναι ενεργοποιημένο.",
-    "Transactional File Locking is disabled." : "Το μεταβατικό κλείδωμα αρχείων είναι απενεργοποιημένο.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Ως βάση δεδομένων χρησιμοποιείται η SQLite. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να επιλέξετε ένα διαφορετικό σύστημα υποστήριξης βάσης δεδομένων.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Ειδικά όταν χρησιμοποιείτε τον πελάτη για συγχρονισμό στον υπολογιστή σας, δεν συνίσταται η χρήση της SQLite.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Για να μετακινηθείτε σε άλλη βάση δεδομένων  χρησιμοποιήσετε το εργαλείο στη γραμμή εντολών:'occ db:convert-type', ή ανατρέξτε <a target=\"_blank\" href=\"%s\"> στις οδηγίες ↗ </a>.",
@@ -196,6 +205,7 @@ OC.L10N.register(
     "licensed" : "Άδεια",
     "Documentation:" : "Τεκμηρίωση:",
     "User documentation" : "Τεκμηρίωση Χρήστη",
+    "Admin documentation" : "Τεκμηρίωση Διαχειριστή",
     "Show description …" : "Εμφάνιση περιγραφής",
     "Hide description …" : "Απόκρυψη περιγραφής",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Αυτή η εφαρμογή δεν μπορεί να εγκατασταθεί διότι δεν εκπληρώνονται οι ακόλουθες εξαρτήσεις:",
@@ -234,6 +244,7 @@ OC.L10N.register(
     "Upload new" : "Μεταφόρτωση νέου",
     "Select new from Files" : "Επιλογή νέου από τα Αρχεία",
     "Remove image" : "Αφαίρεση εικόνας",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Είτε png ή jpg. Ιδανικά τετράγωνη αλλά θα είστε σε θέση να την περικόψετε. Το αρχείο δεν θα πρέπει να υπερβαίνει το μέγιστο μέγεθος των 20 MB.",
     "Your avatar is provided by your original account." : "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό.",
     "Cancel" : "Άκυρο",
     "Choose as profile image" : "Επιλογή εικόνας προφίλ",
@@ -255,7 +266,6 @@ OC.L10N.register(
     "Create" : "Δημιουργία",
     "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
     "Enter the recovery password in order to recover the users files during password change" : "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
-    "Search Users" : "Αναζήτηση χρηστών",
     "Add Group" : "Προσθήκη Ομάδας",
     "Group" : "Ομάδα",
     "Everyone" : "Όλοι",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 5c08bef36d..92873fb167 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -28,7 +28,9 @@
     "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
     "Enabled" : "Ενεργοποιημένο",
     "Not enabled" : "Μη ενεργοποιημένο",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "εγκατάσταση και ενημέρωση εφαρμογών μέσω του καταστήματος εφαρμογών ή του ",
     "Federated Cloud Sharing" : "Διαμοιρασμός σε ομόσπονδα σύννεφα ",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "Το cURL χρησιμοποιεί μια παρωχημένη %s έκδοση (%s). Παρακαλούμε αναβαθμίστε το λειτουργικό σας σύστημα αλλιώς δυνατότητες όπως %s δεν θα δουλέψουν αξιόπιστα.",
     "A problem occurred, please check your log files (Error: %s)" : "Παρουσιάστηκε πρόβλημα, παρακαλώ ελέγξτε τα αρχεία καταγραφής σας (Σφάλμα: %s)",
     "Migration Completed" : "Η μετάβαση ολοκληρώθηκε",
     "Group already exists." : "Η ομάδα υπάρχει ήδη.",
@@ -73,6 +75,7 @@
     "Uninstalling ...." : "Απεγκατάσταση ....",
     "Error while uninstalling app" : "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
     "Uninstall" : "Απεγκατάσταση",
+    "An error occurred: {message}" : "Παρουσιάστηκε σφάλμα: {message}",
     "Select a profile picture" : "Επιλογή εικόνας προφίλ",
     "Very weak password" : "Πολύ αδύναμο συνθηματικό",
     "Weak password" : "Αδύναμο συνθηματικό",
@@ -113,19 +116,22 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Η php δεν φαίνεται να είναι σωστά ρυθμισμένη για ερωτήματα σε μεταβλητές περιβάλλοντος του συστήματος. Η δοκιμή με την εντολή getenv(\"PATH\") επιστρέφει κενή απάντηση.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Παρακαλούμε ελέγξτε την τεκμηρίωση της εγκατάστασης για τις σημειώσεις σχετικά με τη διαμόρφωση της php και τη διαμόρφωση της php στο διακομιστή σας, ειδικά όταν χρησιμοποιείτε php-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Παρακαλούμε ελέγξτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση της εγκατάστασης ↗</a> για τις σημειώσεις σχετικά με τη διαμόρφωση της php και τη διαμόρφωση της php στο διακομιστή σας, ειδικά όταν χρησιμοποιείτε php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Η ρύθμιση  \"μόνο ανάγνωση\"  έχει ενεργοποιηθεί. Αυτό εμποδίζει τον καθορισμό κάποιων ρυθμίσεων μέσω της διεπαφής web. Επιπλέον, το αρχείο πρέπει να γίνει χειροκίνητα εγγράψιμο πριν από κάθε διαδικασία ενημέρωσης.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Ο PHP φαίνεται να είναι ρυθμισμένος ώστε να αφαιρεί μπλοκ εσωτερικών κειμένων (inline doc). Αυτό θα καταστήσει κύριες εφαρμογές μη-διαθέσιμες.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Αυτό πιθανόν προκλήθηκε από προσωρινή μνήμη (cache)/επιταχυντή όπως τη Zend OPcache ή τον eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Ο διακομιστής σας τρέχει σε Microsoft Windows. Συστήνουμε ιδιαίτερα Linux για τη βέλτιστη εμπειρία του χρήστη.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "Είναι εγκατεστημένο το %1$s έκδοση %2$s, για λόγους σταθερότητας και απόδοσης συστήνουμε να αναβαθμίσετε σε νεότερη έκδοση του %1$s.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. ",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Το Transactional file locking είναι απενεργοποιημένο, αυτό μπορεί να οδηγήσει σε προβλήματα με τις race conditions. Ενεργοποιήστε το 'filelocking.enabled' στο config.php για να αποφύγετε αυτά τα προβλήματα. Δείτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση ↗</a> για περισσότερες πληροφορίες.",
     "System locale can not be set to a one which supports UTF-8." : "Οι ρυθμίσεις τοποθεσίας συστήματος δεν μπορούν να οριστούν σε κάποιες που δεν υποστηρίζουν UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Αυτό σημαίνει ότι μπορεί να υπάρχουν προβλήματα με κάποιους χαρακτήρες στα ονόματα αρχείων.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Προτείνουμε ανεπιφύλακτα να εγκαταστήσετε  στο σύστημά σας τα απαιτούμενα πακέτα έτσι ώστε να υποστηρίζεται μια από τις ακόλουθες ρυθμίσεις τοποθεσίας: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν έχει γίνει στο root του τομέα  και χρησιμοποιείται το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή  \"overwrite.cli.url\" στο αρχείο  config.php που βρίσκεται στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Δεν ήταν δυνατή η εκτέλεση της cronjob μέσω τερματικού. Εμφανίστηκαν τα παρακάτω τεχνικά σφάλματα:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Το Transactional file locking χρησιμοποιεί τη βάση δεδομένων ως locking backend, για καλύτερες επιδόσεις συστήνουμς τη διαμόρφωση μιας memcache για το κλείδωμα. Δείτε την <a target=\"_blank\" href=\"%s\">τεκμηρίωση ↗</a> για περισσότερες πληροφορίες.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Παρακαλώ ελέγξτε ξανά <a target=\"_blank\" href=\"%s\">τους οδηγούς εγκατάστασης,  καθώς επίσης και για τυχόν σφάλματα ή προειδοποιήσεις στο <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Όλοι οι έλεγχοι επιτυχείς.",
     "Open documentation" : "Ανοιχτή τεκμηρίωση.",
     "Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
     "Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
@@ -148,7 +154,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
     "Enable server-side encryption" : "Ενεργοποίηση κρυπτογράφησης από το διακομιστή",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Η κρυπτογράφηση είναι μια μη αντιστρεπτή διαδικασία. Μόλις ενεργοποιηθεί, όλα τα αρχεία από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή και η κρυπτογράφηση δεν είναι δυνατόν να απενεργοποιηθεί αργότερα. Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
+    "Please read carefully before activating server-side encryption: " : "Παρακαλούμε διαβάστε προσεκτικά πριν ενεργοποιήσετε την κρυπτογράφηση στο διακομιστή:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Η κρυπτογράφηση είναι μια μη αντιστρεπτή διαδικασία. Μόλις ενεργοποιηθεί, όλα τα αρχεία από αυτό το σημείο και μετά θα κρυπτογραφηθούν στο διακομιστή και η κρυπτογράφηση δεν είναι δυνατόν να απενεργοποιηθεί αργότερα",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Οποιοσδήποτε έχει αυξημένα δικαιώματα πρόσβασης στο διακομιστή του ownCloud σας μπορεί να αποκρυπτογραφήσει τα αρχεία σας είτε παγιδεύοντας τα αιτήματα ή διαβάζοντας τους κωδικούς χρηστών που είναι αποθηκευμένοι σε απλά αρχεία κειμένου. Η κρυπτογράφηση στο διακομιστή δεν προστατεύει επομένως από κακόβουλους διαχειριστές αλλά είναι χρήσιμη στο να προστατεύει τα δεδομένα σας σε εξωτερικούς διακομιστές αποθήκευσης.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Ανάλογα με το άρθρωμα που χρησιμοποιείται το μέγεθος αρχείων γενικά αυξάνεται (κατά 35%% ή και περισσότερο αν χρησιμοποιηθεί το προεπιλεγμένο άρθρωμα)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Θα πρέπει να λαμβάνετε τακτικά αντίγραφα ασφαλείας όλων των κλειδιών κρυπτογράφησης για να αποφύγετε μόνιμη απώλεια δεδομένων (data/<user>/files_encryption και data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Αυτή είναι η τελευταία προειδοποίηση: Θέλετε πραγματικά να ενεργοποιήσετε την κρυπτογράφηση;",
     "Enable encryption" : "Ενεργοποίηση κρυπτογράφησης",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Δεν έχει φορτωθεί μονάδα κρυπτογράφησης, παρακαλούμε φορτώστε μια μονάδα κρυπτογράφησης από το μενού εφαρμογών.",
     "Select default encryption module:" : "Επιλογή προεπιλεγμένης μονάδας κρυπτογράφησης:",
@@ -175,8 +186,6 @@
     "More" : "Περισσότερα",
     "Less" : "Λιγότερα",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Το αρχείο ιστορικού είναι μεγαλύτερο από 100ΜΒ. Η λήψη του ίσως πάρει λίγη ώρα!",
-    "Transactional File Locking is enabled." : "Το μεταβατικό κλείδωμα αρχείων είναι ενεργοποιημένο.",
-    "Transactional File Locking is disabled." : "Το μεταβατικό κλείδωμα αρχείων είναι απενεργοποιημένο.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Ως βάση δεδομένων χρησιμοποιείται η SQLite. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να επιλέξετε ένα διαφορετικό σύστημα υποστήριξης βάσης δεδομένων.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Ειδικά όταν χρησιμοποιείτε τον πελάτη για συγχρονισμό στον υπολογιστή σας, δεν συνίσταται η χρήση της SQLite.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Για να μετακινηθείτε σε άλλη βάση δεδομένων  χρησιμοποιήσετε το εργαλείο στη γραμμή εντολών:'occ db:convert-type', ή ανατρέξτε <a target=\"_blank\" href=\"%s\"> στις οδηγίες ↗ </a>.",
@@ -194,6 +203,7 @@
     "licensed" : "Άδεια",
     "Documentation:" : "Τεκμηρίωση:",
     "User documentation" : "Τεκμηρίωση Χρήστη",
+    "Admin documentation" : "Τεκμηρίωση Διαχειριστή",
     "Show description …" : "Εμφάνιση περιγραφής",
     "Hide description …" : "Απόκρυψη περιγραφής",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Αυτή η εφαρμογή δεν μπορεί να εγκατασταθεί διότι δεν εκπληρώνονται οι ακόλουθες εξαρτήσεις:",
@@ -232,6 +242,7 @@
     "Upload new" : "Μεταφόρτωση νέου",
     "Select new from Files" : "Επιλογή νέου από τα Αρχεία",
     "Remove image" : "Αφαίρεση εικόνας",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Είτε png ή jpg. Ιδανικά τετράγωνη αλλά θα είστε σε θέση να την περικόψετε. Το αρχείο δεν θα πρέπει να υπερβαίνει το μέγιστο μέγεθος των 20 MB.",
     "Your avatar is provided by your original account." : "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό.",
     "Cancel" : "Άκυρο",
     "Choose as profile image" : "Επιλογή εικόνας προφίλ",
@@ -253,7 +264,6 @@
     "Create" : "Δημιουργία",
     "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
     "Enter the recovery password in order to recover the users files during password change" : "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
-    "Search Users" : "Αναζήτηση χρηστών",
     "Add Group" : "Προσθήκη Ομάδας",
     "Group" : "Ομάδα",
     "Everyone" : "Όλοι",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index a64b8a8bd0..3385448f4e 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -112,7 +112,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
@@ -146,7 +145,6 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
     "Enable server-side encryption" : "Enable server-side encryption",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?",
     "Enable encryption" : "Enable encryption",
     "No encryption module loaded, please enable an encryption module in the app menu." : "No encryption module loaded, please enable an encryption module in the app menu.",
     "Select default encryption module:" : "Select default encryption module:",
@@ -249,7 +247,6 @@ OC.L10N.register(
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
     "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
-    "Search Users" : "Search Users",
     "Add Group" : "Add Group",
     "Group" : "Group",
     "Everyone" : "Everyone",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index ca340dce2e..7a426bbc1f 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -110,7 +110,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.",
@@ -144,7 +143,6 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
     "Enable server-side encryption" : "Enable server-side encryption",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?",
     "Enable encryption" : "Enable encryption",
     "No encryption module loaded, please enable an encryption module in the app menu." : "No encryption module loaded, please enable an encryption module in the app menu.",
     "Select default encryption module:" : "Select default encryption module:",
@@ -247,7 +245,6 @@
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
     "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
-    "Search Users" : "Search Users",
     "Add Group" : "Add Group",
     "Group" : "Group",
     "Everyone" : "Everyone",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index e8836f169c..1ffc4e9fcf 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Servidor de correo electrónico",
     "Log" : "Registro",
-    "Server status" : "Estado del servidor",
     "Tips & tricks" : "Sugerencias y trucos",
     "Updates" : "Actualizaciones",
     "Authentication error" : "Error de autenticación",
@@ -119,12 +118,11 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique la documentación de instalación para las notas de configuración de php y la configuración de php en tu servidor, específicamente donde se está usando php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
-    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
-    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "nueva versión %1$s, la version %2$s está instalada, por cuestiones de estabilidad y rendimiento , recomendamos actualizar a la nueva versión %1$s .",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
+    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "nueva versión %1$s, la version %2$s está instalada, por cuestiones de estabilidad y rendimiento recomendamos actualizar a la nueva versión %1$s .",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
     "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.",
@@ -132,6 +130,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwrite.cli.url\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor revise las <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, y compruebe los errores o avisos en el <a ref=\"#log-section\">registro</a>.",
+    "All checks passed." : "Ha pasado todos los controles",
     "Open documentation" : "Documentación abierta",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
     "Allow users to share via link" : "Permite a los usuarios compartir por medio de enlaces",
@@ -154,7 +153,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar cifrado en el servidor",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "El cifrado es un proceso de una sola vía. Una vez el cifrado es habilitado, todos los archivos desde este punto en adelante serán cifrados en el servidor y no será posible deshabilitar el cifrado posteriormente. \nEsta es la advertencia final:\t¿Realmente quieres habilitar el cifrado?",
+    "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "El cifrado en el lado servidor es un proceso de una sola vía. Una vez el cifrado está habilitado, todos los archivos desde este punto en adelante serán cifrados en el servidor y no será posible deshabilitar el cifrado posteriormente. ",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Cualquiera que tenga acceso a este servidor ownCloud, puede descifrar estos archivos, simplemente leyendo la contraseña que se guarda en texto plano en los archivos de sesión. El cifrado del lado servidor, no protege por tanto de administradores malintencionados, pero es ùtil para proteger los datos en almacenes de datos externos de accesos no autorizados. ",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependiendo del módulo de cifrado seleccionado, el tamaño de los archivos se puede ver incrementado (hasta un 35%% o más para las opciones por defecto).",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Deberia salvar de forma regular las claves de cifrado para evitar la perdida de datos (data/<user>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
     "Enable encryption" : "Habilitar cifrado",
     "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
     "Select default encryption module:" : "Seleccione el módulo de cifrado por defecto:",
@@ -181,8 +185,6 @@ OC.L10N.register(
     "More" : "Más",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100 MB. Descargarlo puede tardar.",
-    "Transactional File Locking is enabled." : "Bloqueo de archivos transaccional está habilitado.",
-    "Transactional File Locking is disabled." : "Bloqueo de archivos transaccional está deshabilitado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite está desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar a otra base de datos use la herramienta de línea de comandos: 'occ db:convert-type', o consulte la <a target=\"_blank\" href=\"%s\">documentación ↗</a>.",
@@ -212,7 +214,7 @@ OC.L10N.register(
     "Cheers!" : "¡Saludos!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, ¿qué tal?,\n\nEste mensaje es para hacerle saber que ahora tiene una cuenta %s.\n\nSu nombre de usuario: %s\nAcceda en: %s\n\n",
     "Administrator documentation" : "Documentación del adminsitrador",
-    "Online documentation" : "Documentación en linea",
+    "Online documentation" : "Documentación en línea",
     "Forum" : "Foro",
     "Issue tracker" : "Seguidor de problemas:",
     "Commercial support" : "Soporte Comercial",
@@ -261,7 +263,6 @@ OC.L10N.register(
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
-    "Search Users" : "Buscar usuarios",
     "Add Group" : "Agregar grupo",
     "Group" : "Grupo",
     "Everyone" : "Todos",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 69573d70a1..b3ee25ce61 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Servidor de correo electrónico",
     "Log" : "Registro",
-    "Server status" : "Estado del servidor",
     "Tips & tricks" : "Sugerencias y trucos",
     "Updates" : "Actualizaciones",
     "Authentication error" : "Error de autenticación",
@@ -117,12 +116,11 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php parece que no está configurado correctamente para solicitar las variables de entorno del sistema. La prueba con getenv(\"PATH\") sólo retorna una respuesta vacía.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique la documentación de instalación para las notas de configuración de php y la configuración de php en tu servidor, específicamente donde se está usando php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Se ha habilitado la configuración de sólo lectura. Esto evita que ajustar algunas configuraciones a través de la interfaz web. Además, el archivo debe hacerse modificable manualmente para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado para eliminar bloques de documentos en línea. Esto hará que varias aplicaciones principales no estén accesibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto venga a causa de la caché o un acelerador, tales como Zend OPcache o eAccelerator.",
-    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
-    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "nueva versión %1$s, la version %2$s está instalada, por cuestiones de estabilidad y rendimiento , recomendamos actualizar a la nueva versión %1$s .",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Su servidor está operando con Microsoft Windows. Le recomendamos GNU/Linux encarecidamente para disfrutar una experiencia óptima como usuario.",
+    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "nueva versión %1$s, la version %2$s está instalada, por cuestiones de estabilidad y rendimiento recomendamos actualizar a la nueva versión %1$s .",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
     "System locale can not be set to a one which supports UTF-8." : "No se puede escoger una configuración regional que soporte UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos.",
@@ -130,6 +128,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si su instalación no está ubicada en la raíz del dominio y usa el cron del sistema, puede haber problemas al generarse los URL. Para evitarlos, configure la opción \"overwrite.cli.url\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "No fue posible ejecutar cronjob vía CLI. Han aparecido los siguientes errores técnicos:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor revise las <a target=\"_blank\" href=\"%s\">guías de instalación ↗</a>, y compruebe los errores o avisos en el <a ref=\"#log-section\">registro</a>.",
+    "All checks passed." : "Ha pasado todos los controles",
     "Open documentation" : "Documentación abierta",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
     "Allow users to share via link" : "Permite a los usuarios compartir por medio de enlaces",
@@ -152,7 +151,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar cifrado en el servidor",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "El cifrado es un proceso de una sola vía. Una vez el cifrado es habilitado, todos los archivos desde este punto en adelante serán cifrados en el servidor y no será posible deshabilitar el cifrado posteriormente. \nEsta es la advertencia final:\t¿Realmente quieres habilitar el cifrado?",
+    "Please read carefully before activating server-side encryption: " : "Por favor lea cuidadosamente antes de activar el cifrado del lado del servidor.",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "El cifrado en el lado servidor es un proceso de una sola vía. Una vez el cifrado está habilitado, todos los archivos desde este punto en adelante serán cifrados en el servidor y no será posible deshabilitar el cifrado posteriormente. ",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Cualquiera que tenga acceso a este servidor ownCloud, puede descifrar estos archivos, simplemente leyendo la contraseña que se guarda en texto plano en los archivos de sesión. El cifrado del lado servidor, no protege por tanto de administradores malintencionados, pero es ùtil para proteger los datos en almacenes de datos externos de accesos no autorizados. ",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependiendo del módulo de cifrado seleccionado, el tamaño de los archivos se puede ver incrementado (hasta un 35%% o más para las opciones por defecto).",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Deberia salvar de forma regular las claves de cifrado para evitar la perdida de datos (data/<user>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Esta es la advertencia final. ¿Realmente quiere activar el cifrado?",
     "Enable encryption" : "Habilitar cifrado",
     "No encryption module loaded, please enable an encryption module in the app menu." : "No se ha cargado el modulo de cifrado. Por favor habilite un modulo de cifrado en el menú de aplicaciones.",
     "Select default encryption module:" : "Seleccione el módulo de cifrado por defecto:",
@@ -179,8 +183,6 @@
     "More" : "Más",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "El archivo de registro es mayor de 100 MB. Descargarlo puede tardar.",
-    "Transactional File Locking is enabled." : "Bloqueo de archivos transaccional está habilitado.",
-    "Transactional File Locking is disabled." : "Bloqueo de archivos transaccional está deshabilitado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Se utiliza SQLite como base de datos. Para instalaciones mas grandes se recomiende cambiar a otro sistema de base de datos. ",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "El uso de SQLite está desaconsejado especialmente cuando se usa el cliente de escritorio para sincronizar los ficheros.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar a otra base de datos use la herramienta de línea de comandos: 'occ db:convert-type', o consulte la <a target=\"_blank\" href=\"%s\">documentación ↗</a>.",
@@ -210,7 +212,7 @@
     "Cheers!" : "¡Saludos!",
     "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Hola, ¿qué tal?,\n\nEste mensaje es para hacerle saber que ahora tiene una cuenta %s.\n\nSu nombre de usuario: %s\nAcceda en: %s\n\n",
     "Administrator documentation" : "Documentación del adminsitrador",
-    "Online documentation" : "Documentación en linea",
+    "Online documentation" : "Documentación en línea",
     "Forum" : "Foro",
     "Issue tracker" : "Seguidor de problemas:",
     "Commercial support" : "Soporte Comercial",
@@ -259,7 +261,6 @@
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
-    "Search Users" : "Buscar usuarios",
     "Add Group" : "Agregar grupo",
     "Group" : "Grupo",
     "Everyone" : "Todos",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index f150878c1a..56e3a7482c 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -108,6 +108,7 @@ OC.L10N.register(
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel.",
     "System locale can not be set to a one which supports UTF-8." : "Süsteemi lokaliseeringuks ei saa panna sellist, mis toetab UTF-8-t.",
     "This means that there might be problems with certain characters in file names." : "See tähendab, et võib esineda probleeme failide nimedes mõnede sümbolitega.",
+    "All checks passed." : "Kõik kontrollid on läbitud.",
     "Open documentation" : "Ava dokumentatsioon",
     "Allow apps to use the Share API" : "Luba rakendustel kasutada Share API-t",
     "Allow users to share via link" : "Luba kasutajatel lingiga jagamist ",
@@ -164,6 +165,7 @@ OC.L10N.register(
     "licensed" : "litsenseeritud",
     "Documentation:" : "Dokumentatsioon:",
     "User documentation" : "Kasutaja dokumentatsioon",
+    "Admin documentation" : "Administraatori dokumentatsioon",
     "Show description …" : "Näita kirjeldist ...",
     "Hide description …" : "Peida kirjeldus ...",
     "Enable only for specific groups" : "Luba ainult kindlad grupid",
@@ -216,7 +218,6 @@ OC.L10N.register(
     "Create" : "Lisa",
     "Admin Recovery Password" : "Admini parooli taastamine",
     "Enter the recovery password in order to recover the users files during password change" : "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
-    "Search Users" : "Otsi kasutajaid",
     "Add Group" : "Lisa grupp",
     "Group" : "Grupp",
     "Everyone" : "Igaüks",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 91badcd9fe..91d078142b 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -106,6 +106,7 @@
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel.",
     "System locale can not be set to a one which supports UTF-8." : "Süsteemi lokaliseeringuks ei saa panna sellist, mis toetab UTF-8-t.",
     "This means that there might be problems with certain characters in file names." : "See tähendab, et võib esineda probleeme failide nimedes mõnede sümbolitega.",
+    "All checks passed." : "Kõik kontrollid on läbitud.",
     "Open documentation" : "Ava dokumentatsioon",
     "Allow apps to use the Share API" : "Luba rakendustel kasutada Share API-t",
     "Allow users to share via link" : "Luba kasutajatel lingiga jagamist ",
@@ -162,6 +163,7 @@
     "licensed" : "litsenseeritud",
     "Documentation:" : "Dokumentatsioon:",
     "User documentation" : "Kasutaja dokumentatsioon",
+    "Admin documentation" : "Administraatori dokumentatsioon",
     "Show description …" : "Näita kirjeldist ...",
     "Hide description …" : "Peida kirjeldus ...",
     "Enable only for specific groups" : "Luba ainult kindlad grupid",
@@ -214,7 +216,6 @@
     "Create" : "Lisa",
     "Admin Recovery Password" : "Admini parooli taastamine",
     "Enter the recovery password in order to recover the users files during password change" : "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
-    "Search Users" : "Otsi kasutajaid",
     "Add Group" : "Lisa grupp",
     "Group" : "Grupp",
     "Everyone" : "Igaüks",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index 9075fe7329..0c835b5b23 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -188,7 +188,6 @@ OC.L10N.register(
     "Create" : "Sortu",
     "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
     "Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
-    "Search Users" : "Bilatu Erabiltzaileak",
     "Add Group" : "Gehitu taldea",
     "Group" : "Taldea",
     "Everyone" : "Edonor",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index 631adb886c..1ade6fad49 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -186,7 +186,6 @@
     "Create" : "Sortu",
     "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
     "Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
-    "Search Users" : "Bilatu Erabiltzaileak",
     "Add Group" : "Gehitu taldea",
     "Group" : "Taldea",
     "Everyone" : "Edonor",
diff --git a/settings/l10n/eu_ES.js b/settings/l10n/eu_ES.js
deleted file mode 100644
index b568513953..0000000000
--- a/settings/l10n/eu_ES.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "settings",
-    {
-    "Invalid request" : "Eskakizun baliogabea",
-    "Delete" : "Ezabatu",
-    "Cancel" : "Ezeztatu",
-    "Other" : "Bestea"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/eu_ES.json b/settings/l10n/eu_ES.json
deleted file mode 100644
index 062f410b0e..0000000000
--- a/settings/l10n/eu_ES.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Invalid request" : "Eskakizun baliogabea",
-    "Delete" : "Ezabatu",
-    "Cancel" : "Ezeztatu",
-    "Other" : "Bestea"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index ca8d2b4108..96a724cae1 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -110,6 +110,9 @@ OC.L10N.register(
     "Cheers!" : "سلامتی!",
     "Forum" : "انجمن",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
+    "Desktop client" : "نرم افزار دسکتاپ",
+    "Android app" : "اپ اندروید",
+    "iOS app" : "اپ iOS",
     "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>",
     "Password" : "گذرواژه",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index 9dc390ea8c..354e56e1ff 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -108,6 +108,9 @@
     "Cheers!" : "سلامتی!",
     "Forum" : "انجمن",
     "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
+    "Desktop client" : "نرم افزار دسکتاپ",
+    "Android app" : "اپ اندروید",
+    "iOS app" : "اپ iOS",
     "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>",
     "Password" : "گذرواژه",
diff --git a/settings/l10n/fi.js b/settings/l10n/fi.js
deleted file mode 100644
index bf1854567a..0000000000
--- a/settings/l10n/fi.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "settings",
-    {
-    "Delete" : "Poista",
-    "More" : "Lisää",
-    "Password" : "Salasana",
-    "Cancel" : "Peruuta",
-    "Username" : "Käyttäjätunnus",
-    "Create" : "Luo"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/fi.json b/settings/l10n/fi.json
deleted file mode 100644
index 58852d5669..0000000000
--- a/settings/l10n/fi.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "Delete" : "Poista",
-    "More" : "Lisää",
-    "Password" : "Salasana",
-    "Cancel" : "Peruuta",
-    "Username" : "Käyttäjätunnus",
-    "Create" : "Luo"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index 34baad8513..c670d7abb5 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Sähköpostipalvelin",
     "Log" : "Loki",
-    "Server status" : "Palvelimen tila",
     "Tips & tricks" : "Vinkit",
     "Updates" : "Päivitykset",
     "Authentication error" : "Tunnistautumisvirhe",
@@ -115,6 +114,7 @@ OC.L10N.register(
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tarkista <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a> PHP-asetusten osalta, erityisesti jos käytössäsi on php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s alta version %2$s on asennettu. Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään uudempaan versioon %1$s.",
@@ -124,6 +124,7 @@ OC.L10N.register(
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Suosittelemme asentamaan vaaditut paketit järjestelmään, jotta järjestelmässä on tuki yhdelle seuraavista maa-asetuksista: %s.",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Cron-työn suorittaminen komentorivin kautta ei onnistunut. Ilmeni seuraavia teknisiä virheitä:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lue tarkasti <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a>, tarkista myös mahdolliset virheet ja varoitukset <a href=\"#log-section\">lokitiedostosta</a>.",
+    "All checks passed." : "Läpäistiin kaikki tarkistukset.",
     "Open documentation" : "Avaa dokumentaatio",
     "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
     "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
@@ -146,10 +147,14 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
     "Enable server-side encryption" : "Käytä palvelinpään salausta",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Salausta ei voi perua. Kun salaus on käytössä, kaikki tiedostot palvelimella on salattu, eikä salausta voi enää poistaa käytöstä. Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
+    "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Salausta ei voi perua. Kun salaus on käytössä, kaikki tiedostot siitä hetkestä eteenpäin palvelimella on salattu, eikä salausta voi enää poistaa käytöstä.",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Varmista, että otat säännöllisesti varmuuskopiot salausavaimista, jotta et menetä kaikkia tietoja pysyvästi (data/<käyttäjä>/files_encryption ja data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
     "Enable encryption" : "Käytä salausta",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Salausmoduulia ei ole käytössä. Ota salausmoduuli käyttöön sovellusvalikosta.",
     "Select default encryption module:" : "Valitse oletuksena käytettävä salausmoduuli:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen. Ota \"Default encryption module\" käyttöön ja suorita komento 'occ encryption:migrate'",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen.",
     "Start migration" : "Käynnistä migraatio",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
@@ -171,8 +176,6 @@ OC.L10N.register(
     "More" : "Enemmän",
     "Less" : "Vähemmän",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Lokitiedosto on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken.",
-    "Transactional File Locking is enabled." : "Transaktiopohjainen tiedostolukitus käytössä.",
-    "Transactional File Locking is disabled." : "Transaktiopohjainen tiedostolukitus on pois käytöstä.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLitea käytetään tietokantana. Suuria asennuksia varten on suositeltavaa vaihtaa muuhun tietokantaan.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Käytä komentorivityökalua toiseen tietokantaan migraation yhteydessä: 'occ db:convert-type', tai <a target=\"_blank\" href=\"%s\">lue toki myös dokumentaatio ↗</a>.",
@@ -229,6 +232,7 @@ OC.L10N.register(
     "Upload new" : "Lähetä uusi",
     "Select new from Files" : "Valitse uusi tiedostoista",
     "Remove image" : "Poista kuva",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Joko png- tai jpg-kuva. Mieluiten neliö, voit kuitenkin rajata kuvaa. Tiedosto voi olla korkeintaan 20 megatavun kokoinen.",
     "Your avatar is provided by your original account." : "Avatar-kuvasi pohjautuu alkuperäiseen tiliisi.",
     "Cancel" : "Peru",
     "Choose as profile image" : "Valitse profiilikuvaksi",
@@ -250,7 +254,6 @@ OC.L10N.register(
     "Create" : "Luo",
     "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
     "Enter the recovery password in order to recover the users files during password change" : "Anna palautussalasana, jotta käyttäjien tiedostot on mahdollista palauttaa salasanan muuttamisen yhteydessä",
-    "Search Users" : "Etsi käyttäjiä",
     "Add Group" : "Lisää ryhmä",
     "Group" : "Ryhmä",
     "Everyone" : "Kaikki",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index a0c610c94a..01b7944933 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Sähköpostipalvelin",
     "Log" : "Loki",
-    "Server status" : "Palvelimen tila",
     "Tips & tricks" : "Vinkit",
     "Updates" : "Päivitykset",
     "Authentication error" : "Tunnistautumisvirhe",
@@ -113,6 +112,7 @@
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Tarkista <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a> PHP-asetusten osalta, erityisesti jos käytössäsi on php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Vain luku -asetukset on otettu käyttöön. Tämä estää joidenkin asetusten määrittämisen selainkäyttöliittymän kautta. Lisäksi kyseinen tiedostoon tulee asettaa kirjoitusoikeus käsin joka päivityksen yhteydessä.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Palvelimesi käyttöjärjestelmä on Microsoft Windows. Suosittelemme käyttämään parhaan mahdollisen käyttökokemuksen saavuttamiseksi Linuxia.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s alta version %2$s on asennettu. Vakauden ja suorituskyvyn vuoksi suosittelemme päivittämään uudempaan versioon %1$s.",
@@ -122,6 +122,7 @@
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Suosittelemme asentamaan vaaditut paketit järjestelmään, jotta järjestelmässä on tuki yhdelle seuraavista maa-asetuksista: %s.",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Cron-työn suorittaminen komentorivin kautta ei onnistunut. Ilmeni seuraavia teknisiä virheitä:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lue tarkasti <a target=\"_blank\" href=\"%s\">asennusohjeet ↗</a>, tarkista myös mahdolliset virheet ja varoitukset <a href=\"#log-section\">lokitiedostosta</a>.",
+    "All checks passed." : "Läpäistiin kaikki tarkistukset.",
     "Open documentation" : "Avaa dokumentaatio",
     "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
     "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
@@ -144,10 +145,14 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
     "Enable server-side encryption" : "Käytä palvelinpään salausta",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Salausta ei voi perua. Kun salaus on käytössä, kaikki tiedostot palvelimella on salattu, eikä salausta voi enää poistaa käytöstä. Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
+    "Please read carefully before activating server-side encryption: " : "Lue tarkasti, ennen kuin otat palvelinpään salauksen käyttöön:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Salausta ei voi perua. Kun salaus on käytössä, kaikki tiedostot siitä hetkestä eteenpäin palvelimella on salattu, eikä salausta voi enää poistaa käytöstä.",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Varmista, että otat säännöllisesti varmuuskopiot salausavaimista, jotta et menetä kaikkia tietoja pysyvästi (data/<käyttäjä>/files_encryption ja data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Tämä on viimeinen varoitus: haluatko varmasti ottaa salauksen käyttöön?",
     "Enable encryption" : "Käytä salausta",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Salausmoduulia ei ole käytössä. Ota salausmoduuli käyttöön sovellusvalikosta.",
     "Select default encryption module:" : "Valitse oletuksena käytettävä salausmoduuli:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen. Ota \"Default encryption module\" käyttöön ja suorita komento 'occ encryption:migrate'",
     "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Sinun täytyy siirtää salausavaimet vanhasta salaustekniikasta (ownCloud <= 8.0) uuteen.",
     "Start migration" : "Käynnistä migraatio",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
@@ -169,8 +174,6 @@
     "More" : "Enemmän",
     "Less" : "Vähemmän",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Lokitiedosto on kooltaan yli 100 megatavua. Sen lataaminen saattaa kestää hetken.",
-    "Transactional File Locking is enabled." : "Transaktiopohjainen tiedostolukitus käytössä.",
-    "Transactional File Locking is disabled." : "Transaktiopohjainen tiedostolukitus on pois käytöstä.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLitea käytetään tietokantana. Suuria asennuksia varten on suositeltavaa vaihtaa muuhun tietokantaan.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Varsinkin työpöytäsovelluksen tiedostosynkronointia käyttäessä SQLiten käyttö ei ole suositeltavaa.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Käytä komentorivityökalua toiseen tietokantaan migraation yhteydessä: 'occ db:convert-type', tai <a target=\"_blank\" href=\"%s\">lue toki myös dokumentaatio ↗</a>.",
@@ -227,6 +230,7 @@
     "Upload new" : "Lähetä uusi",
     "Select new from Files" : "Valitse uusi tiedostoista",
     "Remove image" : "Poista kuva",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Joko png- tai jpg-kuva. Mieluiten neliö, voit kuitenkin rajata kuvaa. Tiedosto voi olla korkeintaan 20 megatavun kokoinen.",
     "Your avatar is provided by your original account." : "Avatar-kuvasi pohjautuu alkuperäiseen tiliisi.",
     "Cancel" : "Peru",
     "Choose as profile image" : "Valitse profiilikuvaksi",
@@ -248,7 +252,6 @@
     "Create" : "Luo",
     "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
     "Enter the recovery password in order to recover the users files during password change" : "Anna palautussalasana, jotta käyttäjien tiedostot on mahdollista palauttaa salasanan muuttamisen yhteydessä",
-    "Search Users" : "Etsi käyttäjiä",
     "Add Group" : "Lisää ryhmä",
     "Group" : "Ryhmä",
     "Everyone" : "Kaikki",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 5c772570ba..83b7d5f76d 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -77,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Désinstallation...",
     "Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
     "Uninstall" : "Désinstaller",
+    "An error occurred: {message}" : "Une erreur est survenue : {message}",
     "Select a profile picture" : "Selectionnez une photo de profil ",
     "Very weak password" : "Mot de passe de très faible sécurité",
     "Weak password" : "Mot de passe de faible sécurité",
@@ -117,7 +118,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php ne semble pas être configuré de manière à récupérer les valeurs des variables d’environnement. Le test de la commande getenv(\"PATH\") retourne seulement une réponse vide. ",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez verifier la documentation d'installation concernant les instructions de configuration de php ainsi que la configuration de votre serveur, en particulier dans le cas où vous utilisez php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
@@ -130,6 +130,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>,  et cherchez des erreurs ou avertissements dans  <a href=\"#log-section\">les logs</a>.",
+    "All checks passed." : "Tous les tests ont réussi.",
     "Open documentation" : "Voir la documentation",
     "Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
     "Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
@@ -152,7 +153,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Utilisez un service webcron pour exécuter cron.php toutes les 15 minutes par HTTP",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
     "Enable server-side encryption" : "Activer le chiffrement côté serveur",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Le chiffrement est un processus à sens unique. Une fois que le chiffrement est activé, tous les fichiers à partir de ce moment seront chiffrés sur le serveur et il ne sera pas possible de désactiver le chiffrement ultérieurement. Ceci est le dernier avertissement : Voulez-vous vraiment activer le chiffrement?",
+    "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Le chiffrement côté serveur est un processus à sens unique. Une fois le chiffrement activé, tous les fichiers seront dorénavant chiffrés sur le serveur, et il ne sera plus possible de désactiver le chiffrement.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Toute personne ayant un accès d'administrateur sur votre serveur ownCloud peut déchiffrer vos fichiers en interceptant les requêtes, ou en lisant les mots de passe des utilisateurs qui sont stockés dans les fichiers de sessions. Le chiffrement côté serveur n'empêche donc pas vos fichiers d'être lus par des administrateurs mal intentionnés, mais sert à protéger vos données stockées sur des espaces de stockages externes ou tiers.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Selon le module de chiffrement utilisé, la taille des fichiers peut augmenter (dans le cas du module par défaut, l'augmentation est de 35%% ou plus)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Vous devriez sauvegarder régulièrement les clés de chiffrement pour éviter toute perte de données irrémédiable (data/<user>/files_encryption et data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
     "Enable encryption" : "Activer le chiffrement",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.",
     "Select default encryption module:" : "Sélectionnez le module de chiffrement par défaut :",
@@ -179,8 +185,6 @@ OC.L10N.register(
     "More" : "Plus",
     "Less" : "Moins",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "La taille du fichier journal excède 100 Mo. Le télécharger peut prendre un certain temps!",
-    "Transactional File Locking is enabled." : "Le verrouillage transactionnel de fichiers est activé",
-    "Transactional File Locking is disabled." : "Le verrouillage transactionnel de fichiers est désactivé",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite est actuellement utilisé comme gestionnaire de base de données. Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "L'utilisation de SQLite est particulièrement déconseillée si vous utilisez le client de bureau pour synchroniser vos données.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type' ou consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a>.",
@@ -198,6 +202,7 @@ OC.L10N.register(
     "licensed" : "Sous licence",
     "Documentation:" : "Documentation :",
     "User documentation" : "Documentation utilisateur",
+    "Admin documentation" : "Documentation administrateur",
     "Show description …" : "Afficher la description...",
     "Hide description …" : "Masquer la description",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :",
@@ -236,6 +241,7 @@ OC.L10N.register(
     "Upload new" : "Nouvelle depuis votre ordinateur",
     "Select new from Files" : "Nouvelle depuis les Fichiers",
     "Remove image" : "Supprimer l'image",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Format png ou jpg de maximum 20 Mo. Idéalement carrée, mais vous pourrez la recadrer.",
     "Your avatar is provided by your original account." : "Votre avatar est fourni par votre compte original.",
     "Cancel" : "Annuler",
     "Choose as profile image" : "Choisir en tant que photo de profil ",
@@ -257,7 +263,6 @@ OC.L10N.register(
     "Create" : "Créer",
     "Admin Recovery Password" : "Mot de passe Administrateur de récupération",
     "Enter the recovery password in order to recover the users files during password change" : "Entrez le mot de passe de récupération pour récupérer les fichiers utilisateurs pendant le changement de mot de passe",
-    "Search Users" : "Recherche d'utilisateurs",
     "Add Group" : "Ajouter un groupe",
     "Group" : "Groupe",
     "Everyone" : "Tout le monde",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 62a39a6485..3cf724abc2 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -75,6 +75,7 @@
     "Uninstalling ...." : "Désinstallation...",
     "Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
     "Uninstall" : "Désinstaller",
+    "An error occurred: {message}" : "Une erreur est survenue : {message}",
     "Select a profile picture" : "Selectionnez une photo de profil ",
     "Very weak password" : "Mot de passe de très faible sécurité",
     "Weak password" : "Mot de passe de faible sécurité",
@@ -115,7 +116,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php ne semble pas être configuré de manière à récupérer les valeurs des variables d’environnement. Le test de la commande getenv(\"PATH\") retourne seulement une réponse vide. ",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Veuillez verifier la documentation d'installation concernant les instructions de configuration de php ainsi que la configuration de votre serveur, en particulier dans le cas où vous utilisez php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuration est en mode lecture seule. Ceci empêche la modification de certaines configurations via l'interface web. De plus, le fichier doit être passé manuellement en lecture-écriture avant chaque mise à jour.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP est apparemment configuré pour supprimer les blocs de documentation internes. Cela rendra plusieurs applications de base inaccessibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La raison est probablement l'utilisation d'un cache / accélérateur tel que Zend OPcache ou eAccelerator.",
@@ -128,6 +128,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si votre installation n'a pas été effectuée à la racine du domaine et qu'elle utilise le cron du système, il peut y avoir des problèmes avec la génération d'URL. Pour les éviter, veuillez configurer l'option \"overwrite.cli.url\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "La tâche cron n'a pu s'exécuter via CLI. Ces erreurs techniques sont apparues :",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Consultez les <a target=\"_blank\" href=\"%s\">guides d'installation ↗</a>,  et cherchez des erreurs ou avertissements dans  <a href=\"#log-section\">les logs</a>.",
+    "All checks passed." : "Tous les tests ont réussi.",
     "Open documentation" : "Voir la documentation",
     "Allow apps to use the Share API" : "Autoriser les applications à utiliser l'API de partage",
     "Allow users to share via link" : "Autoriser les utilisateurs à partager par lien",
@@ -150,7 +151,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Utilisez un service webcron pour exécuter cron.php toutes les 15 minutes par HTTP",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilisez le service cron du système pour appeler le fichier cron.php toutes les 15 minutes.",
     "Enable server-side encryption" : "Activer le chiffrement côté serveur",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Le chiffrement est un processus à sens unique. Une fois que le chiffrement est activé, tous les fichiers à partir de ce moment seront chiffrés sur le serveur et il ne sera pas possible de désactiver le chiffrement ultérieurement. Ceci est le dernier avertissement : Voulez-vous vraiment activer le chiffrement?",
+    "Please read carefully before activating server-side encryption: " : "Veuillez lire ceci avec attention avant d'activer le chiffrement :",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Le chiffrement côté serveur est un processus à sens unique. Une fois le chiffrement activé, tous les fichiers seront dorénavant chiffrés sur le serveur, et il ne sera plus possible de désactiver le chiffrement.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Toute personne ayant un accès d'administrateur sur votre serveur ownCloud peut déchiffrer vos fichiers en interceptant les requêtes, ou en lisant les mots de passe des utilisateurs qui sont stockés dans les fichiers de sessions. Le chiffrement côté serveur n'empêche donc pas vos fichiers d'être lus par des administrateurs mal intentionnés, mais sert à protéger vos données stockées sur des espaces de stockages externes ou tiers.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Selon le module de chiffrement utilisé, la taille des fichiers peut augmenter (dans le cas du module par défaut, l'augmentation est de 35%% ou plus)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Vous devriez sauvegarder régulièrement les clés de chiffrement pour éviter toute perte de données irrémédiable (data/<user>/files_encryption et data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dernier avertissement : Voulez-vous vraiment activer le chiffrement ?",
     "Enable encryption" : "Activer le chiffrement",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Aucun module de chiffrement n'est chargé. Merci d'activer un module de chiffrement dans le menu des applications.",
     "Select default encryption module:" : "Sélectionnez le module de chiffrement par défaut :",
@@ -177,8 +183,6 @@
     "More" : "Plus",
     "Less" : "Moins",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "La taille du fichier journal excède 100 Mo. Le télécharger peut prendre un certain temps!",
-    "Transactional File Locking is enabled." : "Le verrouillage transactionnel de fichiers est activé",
-    "Transactional File Locking is disabled." : "Le verrouillage transactionnel de fichiers est désactivé",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite est actuellement utilisé comme gestionnaire de base de données. Pour des installations plus volumineuses, nous vous conseillons d'utiliser un autre gestionnaire de base de données.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "L'utilisation de SQLite est particulièrement déconseillée si vous utilisez le client de bureau pour synchroniser vos données.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Pour migrer vers un autre type de base de données, utilisez la ligne de commande : 'occ db:convert-type' ou consultez la <a target=\"_blank\" href=\"%s\">documentation ↗</a>.",
@@ -196,6 +200,7 @@
     "licensed" : "Sous licence",
     "Documentation:" : "Documentation :",
     "User documentation" : "Documentation utilisateur",
+    "Admin documentation" : "Documentation administrateur",
     "Show description …" : "Afficher la description...",
     "Hide description …" : "Masquer la description",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Cette application ne peut être installée à cause de ces dépendances non satisfaites :",
@@ -234,6 +239,7 @@
     "Upload new" : "Nouvelle depuis votre ordinateur",
     "Select new from Files" : "Nouvelle depuis les Fichiers",
     "Remove image" : "Supprimer l'image",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Format png ou jpg de maximum 20 Mo. Idéalement carrée, mais vous pourrez la recadrer.",
     "Your avatar is provided by your original account." : "Votre avatar est fourni par votre compte original.",
     "Cancel" : "Annuler",
     "Choose as profile image" : "Choisir en tant que photo de profil ",
@@ -255,7 +261,6 @@
     "Create" : "Créer",
     "Admin Recovery Password" : "Mot de passe Administrateur de récupération",
     "Enter the recovery password in order to recover the users files during password change" : "Entrez le mot de passe de récupération pour récupérer les fichiers utilisateurs pendant le changement de mot de passe",
-    "Search Users" : "Recherche d'utilisateurs",
     "Add Group" : "Ajouter un groupe",
     "Group" : "Groupe",
     "Everyone" : "Tout le monde",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index 34bc57bfbf..60ea6e3c84 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Servidor de correo",
     "Log" : "Rexistro",
-    "Server status" : "Estado do servidor",
     "Tips & tricks" : "Trucos e consellos",
     "Updates" : "Actualizacións",
     "Authentication error" : "Produciuse un erro de autenticación",
@@ -119,7 +118,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Semella que PHP non está configurado correctamente para consultar as variábeis de entorno do sistema. A proba con getenv(\"PATH\") só devolve unha resposta baleira.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Consulte a documentación de instalación para ver as notas de configuración de PHP e a configuración PHP do servidor, especialmente se emprega php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Foi activada a restrición da configuración a só lectura. Isto impide o estabelecemento dalgunhas configuracións a través da interface web. Ademais, ten que facer escribíbel manualmente o ficheiro para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
@@ -154,7 +152,6 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Activar o cifrado na parte do servidor",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "O cifrado é un proceso dunha soa dirección. Unha vez activado o cifrado, cifraranse no servidor todos os ficheiros a partires dese momento e xa non será posíbel desactivalo no futuro. Este é o aviso final: Confirma que quere activar o cifrado?",
     "Enable encryption" : "Activar o cifrado",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Non hai cargado ningún módulo de cifrado, active un módulo de cifrado no menú de aplicacións.",
     "Select default encryption module:" : "Seleccionar o módulo predeterminado de cifrado:",
@@ -181,8 +178,6 @@ OC.L10N.register(
     "More" : "Máis",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O ficheiro de rexistro é maior de 100 MB. Pódelle levar un anaco descargalo!",
-    "Transactional File Locking is enabled." : "O bloque transaccional de ficheiros está activado.",
-    "Transactional File Locking is disabled." : "O bloque transaccional de ficheiros está  desactivado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Empregase SQLite como base de datos. Para instalacións grandes recomendámoslle que cambie a unha infraestrutura de base de datos diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconsellámoslle o uso de SQLite",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar cara outra base de datos, empregue a ferramenta en liña de ordes: «occ db:convert-type», ou vexa a <a target=\"_blank\" href=\"%s\">documentación ↗</a>.",
@@ -261,7 +256,6 @@ OC.L10N.register(
     "Create" : "Crear",
     "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
-    "Search Users" : "Busca de usuarios",
     "Add Group" : "Engadir un grupo",
     "Group" : "Grupo",
     "Everyone" : "Todos",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index 43d8f93a0c..16472c0ac3 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Servidor de correo",
     "Log" : "Rexistro",
-    "Server status" : "Estado do servidor",
     "Tips & tricks" : "Trucos e consellos",
     "Updates" : "Actualizacións",
     "Authentication error" : "Produciuse un erro de autenticación",
@@ -117,7 +116,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Semella que PHP non está configurado correctamente para consultar as variábeis de entorno do sistema. A proba con getenv(\"PATH\") só devolve unha resposta baleira.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Consulte a documentación de instalación para ver as notas de configuración de PHP e a configuración PHP do servidor, especialmente se emprega php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Foi activada a restrición da configuración a só lectura. Isto impide o estabelecemento dalgunhas configuracións a través da interface web. Ademais, ten que facer escribíbel manualmente o ficheiro para cada actualización.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Parece que PHP foi configuración para substituír bloques de documentos en liña. Isto fará que varias aplicacións sexan inaccesíbeis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto probabelmente se debe unha caché/acelerador como Zend OPcache ou eAccelerator.",
@@ -152,7 +150,6 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Activar o cifrado na parte do servidor",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "O cifrado é un proceso dunha soa dirección. Unha vez activado o cifrado, cifraranse no servidor todos os ficheiros a partires dese momento e xa non será posíbel desactivalo no futuro. Este é o aviso final: Confirma que quere activar o cifrado?",
     "Enable encryption" : "Activar o cifrado",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Non hai cargado ningún módulo de cifrado, active un módulo de cifrado no menú de aplicacións.",
     "Select default encryption module:" : "Seleccionar o módulo predeterminado de cifrado:",
@@ -179,8 +176,6 @@
     "More" : "Máis",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O ficheiro de rexistro é maior de 100 MB. Pódelle levar un anaco descargalo!",
-    "Transactional File Locking is enabled." : "O bloque transaccional de ficheiros está activado.",
-    "Transactional File Locking is disabled." : "O bloque transaccional de ficheiros está  desactivado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Empregase SQLite como base de datos. Para instalacións grandes recomendámoslle que cambie a unha infraestrutura de base de datos diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Concretamente, se emprega o cliente de escritorio para sincronización, desaconsellámoslle o uso de SQLite",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar cara outra base de datos, empregue a ferramenta en liña de ordes: «occ db:convert-type», ou vexa a <a target=\"_blank\" href=\"%s\">documentación ↗</a>.",
@@ -259,7 +254,6 @@
     "Create" : "Crear",
     "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
-    "Search Users" : "Busca de usuarios",
     "Add Group" : "Engadir un grupo",
     "Group" : "Grupo",
     "Everyone" : "Todos",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index 4ce16798ef..226ce7e01d 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -1,10 +1,16 @@
 OC.L10N.register(
     "settings",
     {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "Security & setup warnings" : "Biztonsági és telepítési figyelmeztetések",
     "Sharing" : "Megosztás",
+    "Server-side encryption" : "Szerveroldali titkosítás",
     "External Storage" : "Külső tárolási szolgáltatások becsatolása",
     "Cron" : "Ütemezett feladatok",
+    "Email server" : "E-mail szerver",
     "Log" : "Naplózás",
+    "Tips & tricks" : "Tippek és trükkök",
     "Updates" : "Frissítések",
     "Authentication error" : "Azonosítási hiba",
     "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
@@ -20,19 +26,42 @@ OC.L10N.register(
     "No user supplied" : "Nincs megadva felhasználó",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!",
     "Wrong admin recovery password. Please check the password and try again." : "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.",
     "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
-    "Enabled" : "Bekapcsolva",
+    "Enabled" : "Engedélyezve",
+    "Not enabled" : "Tiltva",
     "Federated Cloud Sharing" : "Megosztás Egyesített Felhőben",
+    "A problem occurred, please check your log files (Error: %s)" : "Probléma történt, kérjük nézd meg a naplófájlokat (Hiba: %s).",
+    "Migration Completed" : "Migráció kész!",
+    "Group already exists." : "A csoport már létezik.",
+    "Unable to add group." : "Nem lehet létrehozni a csoportot.",
+    "Unable to delete group." : "Nem lehet törölni a csoportot.",
     "Saved" : "Elmentve",
     "test email settings" : "e-mail beállítások ellenőrzése",
-    "Email sent" : "Az e-mailt elküldtük",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Hiba történt az e-mail küldésekor. Kérjük ellenőrizd a beállításokat! (Hiba: %s)",
+    "Email sent" : "Az e-mail elküldve!",
     "You need to set your user email before being able to send test emails." : "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
-    "Email saved" : "Elmentettük az e-mail címet",
+    "Invalid mail address" : "Érvénytelen e-mail cím",
+    "A user with that name already exists." : "Ilyen névvel már létezik felhasználó!",
+    "Unable to create user." : "Nem lehet létrehozni a felhasználót.",
+    "Your %s account was created" : "%s fiók létrehozva",
+    "Unable to delete user." : "Nem lehet törölni a felhasználót.",
+    "Forbidden" : "Tiltott",
+    "Invalid user" : "Érvénytelen felhasználó",
+    "Unable to change mail address" : "Nem lehet megváltoztatni az e-mail címet",
+    "Email saved" : "E-mail elmentve!",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?",
     "Add trusted domain" : "Megbízható tartomány hozzáadása",
+    "Migration in progress. Please wait until the migration is finished" : "Migráció folyamatban. Kérjük várj, míg a migráció befejeződik.",
+    "Migration started …" : "Migráció elindítva ...",
     "Sending..." : "Küldés...",
+    "Official" : "Hivatalos",
+    "Approved" : "Jóváhagyott",
+    "Experimental" : "Kísérleti",
     "All" : "Mind",
-    "Please wait...." : "Kérem várjon...",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ez az alkalmazás még nincs biztonságilag ellenőrizve és vagy új, vagy ismert instabil. Telepítés csak saját felelősségre!",
+    "Update to %s" : "Frissítés erre: %s",
+    "Please wait...." : "Kérjük várj...",
     "Error while disabling app" : "Hiba az alkalmazás letiltása közben",
     "Disable" : "Letiltás",
     "Enable" : "Engedélyezés",
@@ -43,12 +72,14 @@ OC.L10N.register(
     "Uninstalling ...." : "Eltávolítás ...",
     "Error while uninstalling app" : "Hiba történt az alkalmazás eltávolítása közben",
     "Uninstall" : "Eltávolítás",
+    "An error occurred: {message}" : "Hiba történt: {message}",
     "Select a profile picture" : "Válasszon profilképet!",
     "Very weak password" : "Nagyon gyenge jelszó",
     "Weak password" : "Gyenge jelszó",
     "So-so password" : "Nem túl jó jelszó",
     "Good password" : "Jó jelszó",
     "Strong password" : "Erős jelszó",
+    "Valid until {date}" : "Érvényes: {date}",
     "Delete" : "Törlés",
     "Groups" : "Csoportok",
     "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}",
@@ -56,13 +87,17 @@ OC.L10N.register(
     "A valid group name must be provided" : "Érvényes csoportnevet kell megadni",
     "deleted {groupName}" : "törölve: {groupName}",
     "undo" : "visszavonás",
+    "no group" : "nincs csoport",
     "never" : "soha",
     "deleted {userName}" : "törölve: {userName}",
     "add group" : "csoport hozzáadása",
     "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
     "Error creating user" : "A felhasználó nem hozható létre",
     "A valid password must be provided" : "Érvényes jelszót kell megadnia",
+    "A valid email must be provided" : "Érvényes e-mail címet kell megadni",
     "__language_name__" : "__language_name__",
+    "Sync clients" : "Szinkronizáló kliensek",
+    "Personal info" : "Személyes információk",
     "SSL root certificates" : "SSL tanúsítványok",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
     "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
@@ -75,11 +110,18 @@ OC.L10N.register(
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Úgy tűnik, hogy a PHP nem tudja olvasni a rendszer környezeti változóit. A getenv(\"PATH\") teszt visszatérési értéke üres.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Kérjük ellenőrizd a <a target=\"_blank\" href=\"%s\">telepítési dokumentációt ↗</a> a PHP konfigurációs beállításaival kapcsolatban, főleg ha PHP-FPM-et használsz.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "A szervered Microsoft Windowson fut. A legjobb felhasználói élményért erősen javasoljuk, hogy Linuxot használj.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése, mert ezzel lényegesen jobb a MIME-típusok felismerése.",
     "System locale can not be set to a one which supports UTF-8." : "A rendszer lokalizációs állományai között nem sikerült olyat beállítani, ami támogatja az UTF-8-at.",
     "This means that there might be problems with certain characters in file names." : "Ez azt jelenti, hogy probléma lehet bizonyos karakterekkel a fájlnevekben.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Feltétlenül javasoljuk, hogy telepítse a szükséges csomagokat ahhoz, hogy a rendszere támogassa a következő lokalizációk valamelyikét: %s",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ha a telepítése nem a webkiszolgáló gyökerében van, és a rendszer cron szolgáltatását használja, akkor problémák lehetnek az URL-ek képzésével. Ezek elkerülése érdekében állítsa be a config.php-ban az \"overwrite.cli.url\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
+    "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Az ütemezett feladat (cronjob) nem futott le parancssorból. A következő hibák tűntek fel:",
+    "All checks passed." : "Minden ellenőrzés sikeres.",
     "Open documentation" : "Dokumentáció megnyitása",
     "Allow apps to use the Share API" : "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
     "Allow users to share via link" : "Engedjük meg az állományok linkekkel történő megosztását",
@@ -92,12 +134,25 @@ OC.L10N.register(
     "Enforce expiration date" : "A beállított lejárati idő legyen kötelezően érvényes",
     "Allow resharing" : "A megosztás továbbadásának engedélyezése",
     "Restrict users to only share with users in their groups" : "A csoporttagok csak a saját csoportjukon belül oszthassanak meg anyagokat",
+    "Allow users to send mail notification for shared files to other users" : "A felhasználók küldhessenek más felhasználóknak e-mail értesítést a megosztott fájlokról",
     "Exclude groups from sharing" : "Csoportok megosztási jogának tiltása",
     "These groups will still be able to receive shares, but not to initiate them." : "E csoportok tagjaival meg lehet osztani anyagokat, de ők nem hozhatnak létre megosztást.",
+    "Last cron job execution: %s." : "Az utolsó cron feladat ekkor futott le: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Valami nincs rendben.",
     "Cron was not executed yet!" : "A cron feladat még nem futott le!",
     "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
+    "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
+    "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "A szerveroldali titkosítás egyirányú folyamat. Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később nem lehet visszafordítani.",
+    "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
+    "Enable encryption" : "Titkosítás engedélyezése",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nincs titkosítási modul betöltve, kérjük engedélyezd a titkosítási modult az alkalmazások menüben.",
+    "Select default encryption module:" : "Alapértelmezett titkosítási modul:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba. Kérjük, engedélyezd az „Alapértelmezett titkosítási modul”-t és futtasd ezt: occ encryption:migrate",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba.",
+    "Start migration" : "Migrálás indítása",
     "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
     "Send mode" : "Küldési mód",
     "Encryption" : "Titkosítás",
@@ -110,23 +165,51 @@ OC.L10N.register(
     "Credentials" : "Azonosítók",
     "SMTP Username" : "SMTP felhasználónév",
     "SMTP Password" : "SMTP jelszó",
+    "Store credentials" : "Azonosítók eltárolása",
     "Test email settings" : "Az e-mail beállítások ellenőrzése",
     "Send email" : "E-mail küldése",
     "Log level" : "Naplózási szint",
+    "Download logfile" : "Naplófájl letöltése",
     "More" : "Több",
     "Less" : "Kevesebb",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "A naplófájl 100MB-nál nagyobb. A letöltése hosszabb időt vehet igénybe.",
+    "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy váltson másik adatbázis háttérkiszolgálóra",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Amikor az asztali klienset használja fálj szinkronizációra, akkor az SQLite használata nem ajánlott.",
+    "How to do backups" : "Hogyan csináljunk biztonsági mentéseket",
+    "Advanced monitoring" : "Haladó monitorozás",
+    "Performance tuning" : "Teljesítményi hangolás",
+    "Improving the config.php" : "config.php javítása",
+    "Theming" : "Témázás",
+    "Hardening and security guidance" : "Erősítési és biztonsági útmutató",
     "Version" : "Verzió",
+    "Developer documentation" : "Fejlesztői dokumentáció",
+    "Experimental applications ahead" : "Kísérleti alkalmazások előre",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "A kísérleti applikációk nincsenek biztonsági ellenőrizve, ismert vagy ismeretlen hibák lehetnek bennük és aktív fejlesztés alatt állnak. A telepítésük adatvesztéshez vezethet, vagy biztonsági kockázata lehet.",
     "by" : "közreadta:",
-    "Documentation:" : "Leírások:",
+    "licensed" : "licencelt",
+    "Documentation:" : "Dokumentációk:",
+    "User documentation" : "Felhasználói dokumentáció",
+    "Admin documentation" : "Adminisztrátori dokumentáció",
+    "Show description …" : "Leírás megjelenítése ...",
+    "Hide description …" : "Leírás elrejtése ...",
+    "This app cannot be installed because the following dependencies are not fulfilled:" : "Ezt az applikációt nem lehet telepíteni, mert a következő függőségek hiányoznak:",
     "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé",
-    "Uninstall App" : "Az alkalmazás eltávolítása",
+    "Uninstall App" : "Alkalmazás eltávolítása",
+    "Enable experimental apps" : "Kísérleti alkalmazások engedélyezése",
+    "No apps found for your version" : "Nem található alkalmazás a verziód számára",
+    "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Üdv!<br><br>Értesítünk, hogy van egy %s fiókja.<br><br>Felhasználónév: %s<br>Hozzáférés: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Üdv.",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Üdv!\n\nÉrtesítünk, hogy van egy %s fiókja.\n\nFelhasználónév: %s\nHozzáférés: %s\n\n",
+    "Administrator documentation" : "Adminisztrátori dokumentáció",
+    "Online documentation" : "Online dokumentáció",
     "Forum" : "Fórum",
+    "Issue tracker" : "Hibabejelentések",
+    "Commercial support" : "Kereskedelmi támogatás",
     "Get the apps to sync your files" : "Töltse le az állományok szinkronizációjához szükséges programokat!",
     "Desktop client" : "Asztali kliens",
     "Android app" : "Android applikáció",
     "iOS app" : "IOS applikáció",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ha segíteni szeretnéd a projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">csatlakozz a fejlesztéshez</a>\n\t\tvagy\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hirdesd az igét</a>!",
     "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
     "Password" : "Jelszó",
@@ -134,19 +217,36 @@ OC.L10N.register(
     "Current password" : "A jelenlegi jelszó",
     "New password" : "Az új jelszó",
     "Change password" : "A jelszó megváltoztatása",
+    "Full name" : "Teljes név",
+    "No display name set" : "Nincs megjelenítési név beállítva",
     "Email" : "E-mail",
     "Your email address" : "Az Ön e-mail címe",
     "Fill in an email address to enable password recovery and receive notifications" : "Adja meg az e-mail címét, hogy vissza tudja állítani a jelszavát, illetve, hogy rendszeres jelentéseket kaphasson!",
+    "No email address set" : "Nincs e-mail cím beállítva",
+    "You are member of the following groups:" : "Tagja vagy a következő csoport(ok)nak:",
     "Profile picture" : "Profilkép",
     "Upload new" : "Új feltöltése",
     "Select new from Files" : "Új kiválasztása a Fájlokból",
     "Remove image" : "A kép eltávolítása",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Csak png vagy jpg lehet. Ideális esetben négyzet alakú, de lehetőséged lesz vágni. A fájl nem haladhatja meg a 20 MB-os méretet.",
     "Your avatar is provided by your original account." : "A kép az eredeti bejelentkezési adatai alapján lett beállítva.",
     "Cancel" : "Mégsem",
     "Choose as profile image" : "Válasszuk ki profilképnek",
     "Language" : "Nyelv",
     "Help translate" : "Segítsen a fordításban!",
+    "Common Name" : "Általános Név",
+    "Valid until" : "Érvényes",
+    "Issued By" : "Kiadta",
+    "Valid until %s" : "Érvényes: %s",
+    "Import root certificate" : "Gyökértanúsítvány importálása",
+    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud közösség{linkclose} fejleszti, a {githubopen}forráskód{linkclose} {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} licenc alatt licencelve.",
+    "Show storage location" : "Háttértároló helyének mutatása",
+    "Show last log in" : "Utolsó bejelentkezés megjelenítése",
+    "Show user backend" : "Felhasználói háttér mutatása",
+    "Send email to new user" : "E-mail küldése az új felhasználónak",
+    "Show email address" : "E-mail cím megjelenítése",
     "Username" : "Felhasználónév",
+    "E-Mail" : "E-mail",
     "Create" : "Létrehozás",
     "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
     "Enter the recovery password in order to recover the users files during password change" : "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
@@ -159,11 +259,14 @@ OC.L10N.register(
     "Unlimited" : "Korlátlan",
     "Other" : "Más",
     "Full Name" : "Teljes név",
+    "Group Admin for" : "Csoport Adminisztrátor itt",
     "Quota" : "Kvóta",
     "Storage Location" : "A háttértár helye",
+    "User Backend" : "Felhasználói háttér",
     "Last Login" : "Utolsó bejelentkezés",
     "change full name" : "a teljes név megváltoztatása",
     "set new password" : "új jelszó beállítása",
+    "change email address" : "e-mail cím megváltoztatása",
     "Default" : "Alapértelmezett"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index b3c60fd5f3..14577924e9 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -1,8 +1,14 @@
 { "translations": {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "Security & setup warnings" : "Biztonsági és telepítési figyelmeztetések",
     "Sharing" : "Megosztás",
+    "Server-side encryption" : "Szerveroldali titkosítás",
     "External Storage" : "Külső tárolási szolgáltatások becsatolása",
     "Cron" : "Ütemezett feladatok",
+    "Email server" : "E-mail szerver",
     "Log" : "Naplózás",
+    "Tips & tricks" : "Tippek és trükkök",
     "Updates" : "Frissítések",
     "Authentication error" : "Azonosítási hiba",
     "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
@@ -18,19 +24,42 @@
     "No user supplied" : "Nincs megadva felhasználó",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Adja meg az admin helyreállítási jelszót, máskülönben az összes felhasználói adat elveszik!",
     "Wrong admin recovery password. Please check the password and try again." : "Hibás admin helyreállítási jelszó. Ellenőrizze a jelszót és próbálja újra!",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.",
     "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
-    "Enabled" : "Bekapcsolva",
+    "Enabled" : "Engedélyezve",
+    "Not enabled" : "Tiltva",
     "Federated Cloud Sharing" : "Megosztás Egyesített Felhőben",
+    "A problem occurred, please check your log files (Error: %s)" : "Probléma történt, kérjük nézd meg a naplófájlokat (Hiba: %s).",
+    "Migration Completed" : "Migráció kész!",
+    "Group already exists." : "A csoport már létezik.",
+    "Unable to add group." : "Nem lehet létrehozni a csoportot.",
+    "Unable to delete group." : "Nem lehet törölni a csoportot.",
     "Saved" : "Elmentve",
     "test email settings" : "e-mail beállítások ellenőrzése",
-    "Email sent" : "Az e-mailt elküldtük",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "Hiba történt az e-mail küldésekor. Kérjük ellenőrizd a beállításokat! (Hiba: %s)",
+    "Email sent" : "Az e-mail elküldve!",
     "You need to set your user email before being able to send test emails." : "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
-    "Email saved" : "Elmentettük az e-mail címet",
+    "Invalid mail address" : "Érvénytelen e-mail cím",
+    "A user with that name already exists." : "Ilyen névvel már létezik felhasználó!",
+    "Unable to create user." : "Nem lehet létrehozni a felhasználót.",
+    "Your %s account was created" : "%s fiók létrehozva",
+    "Unable to delete user." : "Nem lehet törölni a felhasználót.",
+    "Forbidden" : "Tiltott",
+    "Invalid user" : "Érvénytelen felhasználó",
+    "Unable to change mail address" : "Nem lehet megváltoztatni az e-mail címet",
+    "Email saved" : "E-mail elmentve!",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?",
     "Add trusted domain" : "Megbízható tartomány hozzáadása",
+    "Migration in progress. Please wait until the migration is finished" : "Migráció folyamatban. Kérjük várj, míg a migráció befejeződik.",
+    "Migration started …" : "Migráció elindítva ...",
     "Sending..." : "Küldés...",
+    "Official" : "Hivatalos",
+    "Approved" : "Jóváhagyott",
+    "Experimental" : "Kísérleti",
     "All" : "Mind",
-    "Please wait...." : "Kérem várjon...",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "Ez az alkalmazás még nincs biztonságilag ellenőrizve és vagy új, vagy ismert instabil. Telepítés csak saját felelősségre!",
+    "Update to %s" : "Frissítés erre: %s",
+    "Please wait...." : "Kérjük várj...",
     "Error while disabling app" : "Hiba az alkalmazás letiltása közben",
     "Disable" : "Letiltás",
     "Enable" : "Engedélyezés",
@@ -41,12 +70,14 @@
     "Uninstalling ...." : "Eltávolítás ...",
     "Error while uninstalling app" : "Hiba történt az alkalmazás eltávolítása közben",
     "Uninstall" : "Eltávolítás",
+    "An error occurred: {message}" : "Hiba történt: {message}",
     "Select a profile picture" : "Válasszon profilképet!",
     "Very weak password" : "Nagyon gyenge jelszó",
     "Weak password" : "Gyenge jelszó",
     "So-so password" : "Nem túl jó jelszó",
     "Good password" : "Jó jelszó",
     "Strong password" : "Erős jelszó",
+    "Valid until {date}" : "Érvényes: {date}",
     "Delete" : "Törlés",
     "Groups" : "Csoportok",
     "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}",
@@ -54,13 +85,17 @@
     "A valid group name must be provided" : "Érvényes csoportnevet kell megadni",
     "deleted {groupName}" : "törölve: {groupName}",
     "undo" : "visszavonás",
+    "no group" : "nincs csoport",
     "never" : "soha",
     "deleted {userName}" : "törölve: {userName}",
     "add group" : "csoport hozzáadása",
     "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
     "Error creating user" : "A felhasználó nem hozható létre",
     "A valid password must be provided" : "Érvényes jelszót kell megadnia",
+    "A valid email must be provided" : "Érvényes e-mail címet kell megadni",
     "__language_name__" : "__language_name__",
+    "Sync clients" : "Szinkronizáló kliensek",
+    "Personal info" : "Személyes információk",
     "SSL root certificates" : "SSL tanúsítványok",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
     "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
@@ -73,11 +108,18 @@
     "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "Úgy tűnik, hogy a PHP nem tudja olvasni a rendszer környezeti változóit. A getenv(\"PATH\") teszt visszatérési értéke üres.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Kérjük ellenőrizd a <a target=\"_blank\" href=\"%s\">telepítési dokumentációt ↗</a> a PHP konfigurációs beállításaival kapcsolatban, főleg ha PHP-FPM-et használsz.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Úgy tűnik, hogy a PHP úgy van beállítva, hogy eltávolítja programok belsejében elhelyezett szövegblokkokat. Emiatt a rendszer több alapvető fontosságú eleme működésképtelen lesz.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ezt valószínűleg egy gyorsítótár ill. kódgyorsító, mint pl, a Zend, OPcache vagy eAccelererator okozza.",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "A szervered Microsoft Windowson fut. A legjobb felhasználói élményért erősen javasoljuk, hogy Linuxot használj.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése, mert ezzel lényegesen jobb a MIME-típusok felismerése.",
     "System locale can not be set to a one which supports UTF-8." : "A rendszer lokalizációs állományai között nem sikerült olyat beállítani, ami támogatja az UTF-8-at.",
     "This means that there might be problems with certain characters in file names." : "Ez azt jelenti, hogy probléma lehet bizonyos karakterekkel a fájlnevekben.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Feltétlenül javasoljuk, hogy telepítse a szükséges csomagokat ahhoz, hogy a rendszere támogassa a következő lokalizációk valamelyikét: %s",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ha a telepítése nem a webkiszolgáló gyökerében van, és a rendszer cron szolgáltatását használja, akkor problémák lehetnek az URL-ek képzésével. Ezek elkerülése érdekében állítsa be a config.php-ban az \"overwrite.cli.url\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
+    "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Az ütemezett feladat (cronjob) nem futott le parancssorból. A következő hibák tűntek fel:",
+    "All checks passed." : "Minden ellenőrzés sikeres.",
     "Open documentation" : "Dokumentáció megnyitása",
     "Allow apps to use the Share API" : "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást",
     "Allow users to share via link" : "Engedjük meg az állományok linkekkel történő megosztását",
@@ -90,12 +132,25 @@
     "Enforce expiration date" : "A beállított lejárati idő legyen kötelezően érvényes",
     "Allow resharing" : "A megosztás továbbadásának engedélyezése",
     "Restrict users to only share with users in their groups" : "A csoporttagok csak a saját csoportjukon belül oszthassanak meg anyagokat",
+    "Allow users to send mail notification for shared files to other users" : "A felhasználók küldhessenek más felhasználóknak e-mail értesítést a megosztott fájlokról",
     "Exclude groups from sharing" : "Csoportok megosztási jogának tiltása",
     "These groups will still be able to receive shares, but not to initiate them." : "E csoportok tagjaival meg lehet osztani anyagokat, de ők nem hozhatnak létre megosztást.",
+    "Last cron job execution: %s." : "Az utolsó cron feladat ekkor futott le: %s.",
+    "Last cron job execution: %s. Something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Valami nincs rendben.",
     "Cron was not executed yet!" : "A cron feladat még nem futott le!",
     "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
+    "Enable server-side encryption" : "Szerveroldali titkosítás engedélyezése",
+    "Please read carefully before activating server-side encryption: " : "Kérjük, ezt olvasd el figyelmesen mielőtt engedélyezed a szerveroldali titkosítást:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "A szerveroldali titkosítás egyirányú folyamat. Ha egyszer engedélyezve lett a titkosítás, akkor onnantól kezdve a szerveren az összes fájl titkosításra kerül, melyet később nem lehet visszafordítani.",
+    "This is the final warning: Do you really want to enable encryption?" : "Ez az utolsó figyelmeztetés: Biztosan szeretnéd engedélyezni a titkosítást?",
+    "Enable encryption" : "Titkosítás engedélyezése",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "Nincs titkosítási modul betöltve, kérjük engedélyezd a titkosítási modult az alkalmazások menüben.",
+    "Select default encryption module:" : "Alapértelmezett titkosítási modul:",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba. Kérjük, engedélyezd az „Alapértelmezett titkosítási modul”-t és futtasd ezt: occ encryption:migrate",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "Migrálni kell a titkosítási kulcsokat a régi titkosításból (ownCloud <= 8.0) egy újba.",
+    "Start migration" : "Migrálás indítása",
     "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
     "Send mode" : "Küldési mód",
     "Encryption" : "Titkosítás",
@@ -108,23 +163,51 @@
     "Credentials" : "Azonosítók",
     "SMTP Username" : "SMTP felhasználónév",
     "SMTP Password" : "SMTP jelszó",
+    "Store credentials" : "Azonosítók eltárolása",
     "Test email settings" : "Az e-mail beállítások ellenőrzése",
     "Send email" : "E-mail küldése",
     "Log level" : "Naplózási szint",
+    "Download logfile" : "Naplófájl letöltése",
     "More" : "Több",
     "Less" : "Kevesebb",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "A naplófájl 100MB-nál nagyobb. A letöltése hosszabb időt vehet igénybe.",
+    "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy váltson másik adatbázis háttérkiszolgálóra",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Amikor az asztali klienset használja fálj szinkronizációra, akkor az SQLite használata nem ajánlott.",
+    "How to do backups" : "Hogyan csináljunk biztonsági mentéseket",
+    "Advanced monitoring" : "Haladó monitorozás",
+    "Performance tuning" : "Teljesítményi hangolás",
+    "Improving the config.php" : "config.php javítása",
+    "Theming" : "Témázás",
+    "Hardening and security guidance" : "Erősítési és biztonsági útmutató",
     "Version" : "Verzió",
+    "Developer documentation" : "Fejlesztői dokumentáció",
+    "Experimental applications ahead" : "Kísérleti alkalmazások előre",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "A kísérleti applikációk nincsenek biztonsági ellenőrizve, ismert vagy ismeretlen hibák lehetnek bennük és aktív fejlesztés alatt állnak. A telepítésük adatvesztéshez vezethet, vagy biztonsági kockázata lehet.",
     "by" : "közreadta:",
-    "Documentation:" : "Leírások:",
+    "licensed" : "licencelt",
+    "Documentation:" : "Dokumentációk:",
+    "User documentation" : "Felhasználói dokumentáció",
+    "Admin documentation" : "Adminisztrátori dokumentáció",
+    "Show description …" : "Leírás megjelenítése ...",
+    "Hide description …" : "Leírás elrejtése ...",
+    "This app cannot be installed because the following dependencies are not fulfilled:" : "Ezt az applikációt nem lehet telepíteni, mert a következő függőségek hiányoznak:",
     "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé",
-    "Uninstall App" : "Az alkalmazás eltávolítása",
+    "Uninstall App" : "Alkalmazás eltávolítása",
+    "Enable experimental apps" : "Kísérleti alkalmazások engedélyezése",
+    "No apps found for your version" : "Nem található alkalmazás a verziód számára",
+    "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "Üdv!<br><br>Értesítünk, hogy van egy %s fiókja.<br><br>Felhasználónév: %s<br>Hozzáférés: <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "Üdv.",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "Üdv!\n\nÉrtesítünk, hogy van egy %s fiókja.\n\nFelhasználónév: %s\nHozzáférés: %s\n\n",
+    "Administrator documentation" : "Adminisztrátori dokumentáció",
+    "Online documentation" : "Online dokumentáció",
     "Forum" : "Fórum",
+    "Issue tracker" : "Hibabejelentések",
+    "Commercial support" : "Kereskedelmi támogatás",
     "Get the apps to sync your files" : "Töltse le az állományok szinkronizációjához szükséges programokat!",
     "Desktop client" : "Asztali kliens",
     "Android app" : "Android applikáció",
     "iOS app" : "IOS applikáció",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "Ha segíteni szeretnéd a projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">csatlakozz a fejlesztéshez</a>\n\t\tvagy\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">hirdesd az igét</a>!",
     "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
     "Password" : "Jelszó",
@@ -132,19 +215,36 @@
     "Current password" : "A jelenlegi jelszó",
     "New password" : "Az új jelszó",
     "Change password" : "A jelszó megváltoztatása",
+    "Full name" : "Teljes név",
+    "No display name set" : "Nincs megjelenítési név beállítva",
     "Email" : "E-mail",
     "Your email address" : "Az Ön e-mail címe",
     "Fill in an email address to enable password recovery and receive notifications" : "Adja meg az e-mail címét, hogy vissza tudja állítani a jelszavát, illetve, hogy rendszeres jelentéseket kaphasson!",
+    "No email address set" : "Nincs e-mail cím beállítva",
+    "You are member of the following groups:" : "Tagja vagy a következő csoport(ok)nak:",
     "Profile picture" : "Profilkép",
     "Upload new" : "Új feltöltése",
     "Select new from Files" : "Új kiválasztása a Fájlokból",
     "Remove image" : "A kép eltávolítása",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Csak png vagy jpg lehet. Ideális esetben négyzet alakú, de lehetőséged lesz vágni. A fájl nem haladhatja meg a 20 MB-os méretet.",
     "Your avatar is provided by your original account." : "A kép az eredeti bejelentkezési adatai alapján lett beállítva.",
     "Cancel" : "Mégsem",
     "Choose as profile image" : "Válasszuk ki profilképnek",
     "Language" : "Nyelv",
     "Help translate" : "Segítsen a fordításban!",
+    "Common Name" : "Általános Név",
+    "Valid until" : "Érvényes",
+    "Issued By" : "Kiadta",
+    "Valid until %s" : "Érvényes: %s",
+    "Import root certificate" : "Gyökértanúsítvány importálása",
+    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "{communityopen}ownCloud közösség{linkclose} fejleszti, a {githubopen}forráskód{linkclose} {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} licenc alatt licencelve.",
+    "Show storage location" : "Háttértároló helyének mutatása",
+    "Show last log in" : "Utolsó bejelentkezés megjelenítése",
+    "Show user backend" : "Felhasználói háttér mutatása",
+    "Send email to new user" : "E-mail küldése az új felhasználónak",
+    "Show email address" : "E-mail cím megjelenítése",
     "Username" : "Felhasználónév",
+    "E-Mail" : "E-mail",
     "Create" : "Létrehozás",
     "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
     "Enter the recovery password in order to recover the users files during password change" : "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
@@ -157,11 +257,14 @@
     "Unlimited" : "Korlátlan",
     "Other" : "Más",
     "Full Name" : "Teljes név",
+    "Group Admin for" : "Csoport Adminisztrátor itt",
     "Quota" : "Kvóta",
     "Storage Location" : "A háttértár helye",
+    "User Backend" : "Felhasználói háttér",
     "Last Login" : "Utolsó bejelentkezés",
     "change full name" : "a teljes név megváltoztatása",
     "set new password" : "új jelszó beállítása",
+    "change email address" : "e-mail cím megváltoztatása",
     "Default" : "Alapértelmezett"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 083c068e14..141b155da8 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -30,7 +30,9 @@ OC.L10N.register(
     "Unable to change password" : "Tidak dapat mengubah sandi",
     "Enabled" : "Diaktifkan",
     "Not enabled" : "Tidak diaktifkan",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "memasang dan memperbarui aplikasi via toko aplikasi atau Federated Cloud Sharing",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL menggunakan versi lawas %s (%s). Silakan perbarui sistem operasi Anda atau fitur-fitur seperti %s tidak akan dapat bekerja dengan benar.",
     "A problem occurred, please check your log files (Error: %s)" : "Terjadi masalah, mohon periksa berkas log Anda (Kesalahan: %s)",
     "Migration Completed" : "Migrasi Selesai",
     "Group already exists." : "Grup sudah ada.",
@@ -75,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Mencopot ...",
     "Error while uninstalling app" : "Terjadi kesalahan saat mencopot aplikasi",
     "Uninstall" : "Copot",
+    "An error occurred: {message}" : "Sebuah kesalahan yang muncul: {message}",
     "Select a profile picture" : "Pilih foto profil",
     "Very weak password" : "Sandi sangat lemah",
     "Weak password" : "Sandi lemah",
@@ -115,19 +118,22 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "kelihatannya php tidak diatur dengan benar untuk variabel lingkungan sistem kueri. Pemeriksaan dengan getenv(\"PATH\") hanya mengembalikan respon kosong.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Mohon periksa dokumentasi instalasi untuk catatan konfigurasi php dan konfigurasi php server Anda, terutama saat menggunakan ph-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Silakan periksa <a target=\"_blank\" href=\"%s\">dokumentasi instalasi ↗</a> untuk membaca catatan konfigurasi dan konfigurasi php pada server Anda, terutama ketika menggunakan php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP tampaknya disetel menjadi strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s dibawah versi %2$s telah diinstal, untuk alasan kestabilan dan performa, kami menyarankan untuk memperbarui ke versi %1$s yang lebih baru.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksi penguncian berkas dinonaktifkan, hal ini dapat menyebabkan masalah dengan kondisi race. Aktifkan 'filelocking.enabled' pada config.php untuk menghindari masalah ini. Baca <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a> untuk informasi lebih lanjut.",
     "System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Kamu sangat menyarankan untuk menginstal paket-paket yang dibutuhkan pada sistem agar mendukung lokal berikut: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak di root domain dan menggunakan sistem cron, hal tersebut dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah tersebut, mohon atur opsi \"overwrite.cli.url\" pada berkas config.php Anda ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Tidak mungkin untuk mengeksekusi cronjob via CLI. Kesalahan teknis berikut muncul:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksi penguncian berkas menggunakan basis data sebagai backend penguncian, untuk mendapatkan kinerja terbaik, disarankan mengkonfigurasi memcache sebagai penguncian. Baca <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a> untuk informasi lebih lanjut.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon periksa dua kali <a target=\"_blank\" href=\"%s\">panduan instalasi ↗</a>, dan periksa segala kesalahan atau peringatan pada <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Semua pemeriksaan lulus.",
     "Open documentation" : "Buka dokumentasi",
     "Allow apps to use the Share API" : "Izinkan aplikasi untuk menggunakan API Pembagian",
     "Allow users to share via link" : "Izinkan pengguna untuk membagikan via tautan",
@@ -150,7 +156,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
     "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Enkripsi adalah proses satu arah. Setelah enkripsi diaktifkan, semua berkas mulai saat ini akan di enkrispi pada server dan tidak mungkin untuk menonaktifkan enkrispi dikemudian hari. Ini merupakan peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
+    "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Enkripsi server-side adalah proses sekali jalan. Setelah enkripsi diaktifkan, semua berkas mulai saat ini dan selanjutnya akan dienkripsi pada server dan tidak mungkin untuk menonaktifkan enkripsi di lain waktu",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Siapa saja yang memiliki hak akses pada server ownCloud dapat mendeskripsi berkas-berkas Anda dengan mencegat permintaan atau membaca sandi pengguna yang disimpan dalam berkas-berkas sesi teks biasa. Enkripsi server-side tidak serta merta melindungi dari administrator jahat tetapi akan berguna untuk melindungi data Anda pada penyimpanan eksternal.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Tergantung pada modul enkripsi yang sebenarnya, pada umumnya ukuran berkas akan bertambah (sekitar 35%% atau lebih ketika menggunakan modul standar)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Anda disarankan mencadangkan semua kunci enkripsi Anda secara berkala untuk mencegah kehilangan data pemanen (data/<user>/files_encryption dan data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
     "Enable encryption" : "Aktifkan enkripsi",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
     "Select default encryption module:" : "Pilih modul enkripsi baku:",
@@ -177,8 +188,6 @@ OC.L10N.register(
     "More" : "Lainnya",
     "Less" : "Ciutkan",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Pengunduhan ini memerlukan beberapa saat!",
-    "Transactional File Locking is enabled." : "Penguncian Berkas Transaksional diaktifkan.",
-    "Transactional File Locking is disabled." : "Penguncian Berkas Transaksional dinonaktifkan.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami menyarankan untuk beralih ke backend basis data yang berbeda.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Terutama saat menggunakan klien desktop untuk sinkronisasi berkas, penggunaan SQLite tidak disarankan.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Untuk migrasi ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type', atau lihat <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a>.",
@@ -235,6 +244,7 @@ OC.L10N.register(
     "Upload new" : "Unggah baru",
     "Select new from Files" : "Pilih baru dari Berkas",
     "Remove image" : "Hapus gambar",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Boleh png atau jpg. Idealnya berbentuk persegi tetapi Anda dapat memotongnya. Berkas tidak diizinkan melebihi ukuran 20 MB.",
     "Your avatar is provided by your original account." : "Avatar disediakan oleh akun asli Anda.",
     "Cancel" : "Batal",
     "Choose as profile image" : "Pilih sebagai gambar profil",
@@ -256,7 +266,6 @@ OC.L10N.register(
     "Create" : "Buat",
     "Admin Recovery Password" : "Sandi pemulihan Admin",
     "Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
-    "Search Users" : "Cari Pengguna",
     "Add Group" : "Tambah Grup",
     "Group" : "Grup",
     "Everyone" : "Semua orang",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index f2464e75a1..fcc2b64746 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -28,7 +28,9 @@
     "Unable to change password" : "Tidak dapat mengubah sandi",
     "Enabled" : "Diaktifkan",
     "Not enabled" : "Tidak diaktifkan",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "memasang dan memperbarui aplikasi via toko aplikasi atau Federated Cloud Sharing",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL menggunakan versi lawas %s (%s). Silakan perbarui sistem operasi Anda atau fitur-fitur seperti %s tidak akan dapat bekerja dengan benar.",
     "A problem occurred, please check your log files (Error: %s)" : "Terjadi masalah, mohon periksa berkas log Anda (Kesalahan: %s)",
     "Migration Completed" : "Migrasi Selesai",
     "Group already exists." : "Grup sudah ada.",
@@ -73,6 +75,7 @@
     "Uninstalling ...." : "Mencopot ...",
     "Error while uninstalling app" : "Terjadi kesalahan saat mencopot aplikasi",
     "Uninstall" : "Copot",
+    "An error occurred: {message}" : "Sebuah kesalahan yang muncul: {message}",
     "Select a profile picture" : "Pilih foto profil",
     "Very weak password" : "Sandi sangat lemah",
     "Weak password" : "Sandi lemah",
@@ -113,19 +116,22 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "kelihatannya php tidak diatur dengan benar untuk variabel lingkungan sistem kueri. Pemeriksaan dengan getenv(\"PATH\") hanya mengembalikan respon kosong.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Mohon periksa dokumentasi instalasi untuk catatan konfigurasi php dan konfigurasi php server Anda, terutama saat menggunakan ph-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Silakan periksa <a target=\"_blank\" href=\"%s\">dokumentasi instalasi ↗</a> untuk membaca catatan konfigurasi dan konfigurasi php pada server Anda, terutama ketika menggunakan php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Konfig Hanya-Baca telah diaktifkan. Ini akan mencegah setelan beberapa konfigurasi melalui antarmuka-web. Selanjutnya, berkas perlu dibuat dapat-dibaca secara manual untuk setiap pembaruan.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP tampaknya disetel menjadi strip inline doc blocks. Hal ini akan membuat beberapa aplikasi inti tidak dapat diakses.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hal ini kemungkinan disebabkan oleh cache/akselerator seperti Zend OPcache atau eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Server Anda dijalankan di Microsoft Windows. Kami sangat menyarankan Linux untuk mendapatkan pengalaman pengguna yang optimal.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s dibawah versi %2$s telah diinstal, untuk alasan kestabilan dan performa, kami menyarankan untuk memperbarui ke versi %1$s yang lebih baru.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksi penguncian berkas dinonaktifkan, hal ini dapat menyebabkan masalah dengan kondisi race. Aktifkan 'filelocking.enabled' pada config.php untuk menghindari masalah ini. Baca <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a> untuk informasi lebih lanjut.",
     "System locale can not be set to a one which supports UTF-8." : "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Kamu sangat menyarankan untuk menginstal paket-paket yang dibutuhkan pada sistem agar mendukung lokal berikut: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak di root domain dan menggunakan sistem cron, hal tersebut dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah tersebut, mohon atur opsi \"overwrite.cli.url\" pada berkas config.php Anda ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Tidak mungkin untuk mengeksekusi cronjob via CLI. Kesalahan teknis berikut muncul:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksi penguncian berkas menggunakan basis data sebagai backend penguncian, untuk mendapatkan kinerja terbaik, disarankan mengkonfigurasi memcache sebagai penguncian. Baca <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a> untuk informasi lebih lanjut.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Mohon periksa dua kali <a target=\"_blank\" href=\"%s\">panduan instalasi ↗</a>, dan periksa segala kesalahan atau peringatan pada <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Semua pemeriksaan lulus.",
     "Open documentation" : "Buka dokumentasi",
     "Allow apps to use the Share API" : "Izinkan aplikasi untuk menggunakan API Pembagian",
     "Allow users to share via link" : "Izinkan pengguna untuk membagikan via tautan",
@@ -148,7 +154,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gunakan layanan cron sistem untuk memanggil berkas cron.php setiap 15 menit.",
     "Enable server-side encryption" : "Aktifkan enkripsi sisi-server",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Enkripsi adalah proses satu arah. Setelah enkripsi diaktifkan, semua berkas mulai saat ini akan di enkrispi pada server dan tidak mungkin untuk menonaktifkan enkrispi dikemudian hari. Ini merupakan peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
+    "Please read carefully before activating server-side encryption: " : "Mohon baca dengan teliti sebelum mengaktifkan enkripsi server-side:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Enkripsi server-side adalah proses sekali jalan. Setelah enkripsi diaktifkan, semua berkas mulai saat ini dan selanjutnya akan dienkripsi pada server dan tidak mungkin untuk menonaktifkan enkripsi di lain waktu",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Siapa saja yang memiliki hak akses pada server ownCloud dapat mendeskripsi berkas-berkas Anda dengan mencegat permintaan atau membaca sandi pengguna yang disimpan dalam berkas-berkas sesi teks biasa. Enkripsi server-side tidak serta merta melindungi dari administrator jahat tetapi akan berguna untuk melindungi data Anda pada penyimpanan eksternal.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Tergantung pada modul enkripsi yang sebenarnya, pada umumnya ukuran berkas akan bertambah (sekitar 35%% atau lebih ketika menggunakan modul standar)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Anda disarankan mencadangkan semua kunci enkripsi Anda secara berkala untuk mencegah kehilangan data pemanen (data/<user>/files_encryption dan data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Ini adalah peringatan terakhir: Apakah Anda yakin ingin mengaktifkan enkripsi?",
     "Enable encryption" : "Aktifkan enkripsi",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Tidak ada modul enkripsi yang dimuat, mohon aktifkan modul enkripsi di menu aplikasi.",
     "Select default encryption module:" : "Pilih modul enkripsi baku:",
@@ -175,8 +186,6 @@
     "More" : "Lainnya",
     "Less" : "Ciutkan",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Berkas log lebih besar dari 100MB. Pengunduhan ini memerlukan beberapa saat!",
-    "Transactional File Locking is enabled." : "Penguncian Berkas Transaksional diaktifkan.",
-    "Transactional File Locking is disabled." : "Penguncian Berkas Transaksional dinonaktifkan.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami menyarankan untuk beralih ke backend basis data yang berbeda.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Terutama saat menggunakan klien desktop untuk sinkronisasi berkas, penggunaan SQLite tidak disarankan.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Untuk migrasi ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type', atau lihat <a target=\"_blank\" href=\"%s\">dokumentasi ↗</a>.",
@@ -233,6 +242,7 @@
     "Upload new" : "Unggah baru",
     "Select new from Files" : "Pilih baru dari Berkas",
     "Remove image" : "Hapus gambar",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Boleh png atau jpg. Idealnya berbentuk persegi tetapi Anda dapat memotongnya. Berkas tidak diizinkan melebihi ukuran 20 MB.",
     "Your avatar is provided by your original account." : "Avatar disediakan oleh akun asli Anda.",
     "Cancel" : "Batal",
     "Choose as profile image" : "Pilih sebagai gambar profil",
@@ -254,7 +264,6 @@
     "Create" : "Buat",
     "Admin Recovery Password" : "Sandi pemulihan Admin",
     "Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
-    "Search Users" : "Cari Pengguna",
     "Add Group" : "Tambah Grup",
     "Group" : "Grup",
     "Everyone" : "Semua orang",
diff --git a/settings/l10n/is.js b/settings/l10n/is.js
index d2cdeea895..994011a098 100644
--- a/settings/l10n/is.js
+++ b/settings/l10n/is.js
@@ -8,6 +8,7 @@ OC.L10N.register(
     "Admins can't remove themself from the admin group" : "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp",
     "Unable to add user to group %s" : "Ekki tókst að bæta notenda við hópinn %s",
     "Unable to remove user from group %s" : "Ekki tókst að fjarlægja notanda úr hópnum %s",
+    "Saved" : "Vistað",
     "Email sent" : "Tölvupóstur sendur",
     "Email saved" : "Netfang vistað",
     "Please wait...." : "Andartak....",
@@ -15,6 +16,11 @@ OC.L10N.register(
     "Enable" : "Virkja",
     "Updating...." : "Uppfæri...",
     "Updated" : "Uppfært",
+    "Very weak password" : "Mjög veikt lykilorð",
+    "Weak password" : "Veikt lykilorð",
+    "So-so password" : "Svo-svo lykilorð",
+    "Good password" : "Gott lykilorð",
+    "Strong password" : "Sterkt lykilorð",
     "Delete" : "Eyða",
     "Groups" : "Hópar",
     "undo" : "afturkalla",
@@ -26,8 +32,10 @@ OC.L10N.register(
     "Server address" : "Host nafn netþjóns",
     "More" : "Meira",
     "Less" : "Minna",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Sérstaklega þegar tölvu forrit er notað til samræmingar þá er ekki mælt með notkunn SQLite.",
     "Version" : "Útgáfa",
     "by" : "af",
+    "Cheers!" : "Skál!",
     "Forum" : "Vefspjall",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
     "Password" : "Lykilorð",
@@ -46,4 +54,4 @@ OC.L10N.register(
     "Other" : "Annað",
     "Default" : "Sjálfgefið"
 },
-"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);");
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/settings/l10n/is.json b/settings/l10n/is.json
index 39281c0a5e..5e2507a549 100644
--- a/settings/l10n/is.json
+++ b/settings/l10n/is.json
@@ -6,6 +6,7 @@
     "Admins can't remove themself from the admin group" : "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp",
     "Unable to add user to group %s" : "Ekki tókst að bæta notenda við hópinn %s",
     "Unable to remove user from group %s" : "Ekki tókst að fjarlægja notanda úr hópnum %s",
+    "Saved" : "Vistað",
     "Email sent" : "Tölvupóstur sendur",
     "Email saved" : "Netfang vistað",
     "Please wait...." : "Andartak....",
@@ -13,6 +14,11 @@
     "Enable" : "Virkja",
     "Updating...." : "Uppfæri...",
     "Updated" : "Uppfært",
+    "Very weak password" : "Mjög veikt lykilorð",
+    "Weak password" : "Veikt lykilorð",
+    "So-so password" : "Svo-svo lykilorð",
+    "Good password" : "Gott lykilorð",
+    "Strong password" : "Sterkt lykilorð",
     "Delete" : "Eyða",
     "Groups" : "Hópar",
     "undo" : "afturkalla",
@@ -24,8 +30,10 @@
     "Server address" : "Host nafn netþjóns",
     "More" : "Meira",
     "Less" : "Minna",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Sérstaklega þegar tölvu forrit er notað til samræmingar þá er ekki mælt með notkunn SQLite.",
     "Version" : "Útgáfa",
     "by" : "af",
+    "Cheers!" : "Skál!",
     "Forum" : "Vefspjall",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
     "Password" : "Lykilorð",
@@ -43,5 +51,5 @@
     "Unlimited" : "Ótakmarkað",
     "Other" : "Annað",
     "Default" : "Sjálfgefið"
-},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 || n % 100 != 11);"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
 }
\ No newline at end of file
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index c7a2105f7c..4e6fab34c7 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Server di posta",
     "Log" : "Log",
-    "Server status" : "Stato del server",
     "Tips & tricks" : "Suggerimenti e trucchi",
     "Updates" : "Aggiornamenti",
     "Authentication error" : "Errore di autenticazione",
@@ -119,19 +118,22 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php non sembra essere configurato correttamente per interrogare le variabili d'ambiente di sistema. Il test con getenv(\"PATH\") restituisce solo una risposta vuota.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Controlla la documentazione di installazione per le note di configurazione di php e la configurazione del tuo server, specialmente quando utilizzi php-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Controlla la <a target=\"_blank\" href=\"%s\">documentazione di installazione↗</a>  per le note di configurazione di php e la configurazione del tuo server, in particolare quando utilizzi php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configurazione di sola lettura è stata abilitata. Ciò impedisce l'impostazione di alcune configurazioni tramite l'interfaccia web. Inoltre, i file devono essere resi scrivibili manualmente per ogni aggiornamento.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Il tuo server è in esecuzione su Microsoft Windows. Consigliamo vivamente Linux per un'esperienza utente ottimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "La versione di %1$s installata è anteriore alla %2$s, per motivi di stabilità e prestazioni, consigliamo di aggiornare una una versione di %1$s più recente.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Il blocco del file transazionale è disabilitato, ciò potrebbe comportare problemi di race condition. Abilita 'filelocking.enabled' nel config-php per evitare questi problemi. Vedi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a> per ulteriori informazioni.",
     "System locale can not be set to a one which supports UTF-8." : "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle localizzazioni seguenti: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwrite.cli.url\"  nel file config.php al percorso della radice del sito della tua installazione (Consigliato: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non è stato possibile eseguire il job di cron tramite CLI. Sono apparsi i seguenti errori tecnici:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Il blocco del file transazionale sta utilizzando il database come motore di blocco, per avere prestazioni migliori, è consigliato configurare una cache di memoria per il blocco. Vedi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a> per ulteriori informazioni.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Leggi attentamente le  <a target=\"_blank\" href=\"%s\">guide d'installazione ↗</a>, e controlla gli errori o gli avvisi nel <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Tutti i controlli passati.",
     "Open documentation" : "Apri la documentazione",
     "Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
     "Allow users to share via link" : "Consenti agli utenti di condivere tramite collegamento",
@@ -154,7 +156,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
     "Enable server-side encryption" : "Abilita cifratura lato server",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "La cifratura è un processo a senso unico. Una volta che la cifratura è abilitata, tutti i file da quel momento in poi saranno cifrati sul server e non sarà possibile disattivare la cifratura successivamente. Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
+    "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "La cifratura è un processo a senso unico. Una volta che la cifratura è abilitata, tutti i file da quel momento in poi saranno cifrati sul server e non sarà possibile disattivare la cifratura successivamente",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Chiunque abbia un accesso privilegiato al tuo server ownCloud può decifrare i tuoi file intercettando le richieste o leggendo le password degli utenti che sono memorizzate come testo semplice nei file di sessione. La cifratura lato server non protegge perciò dagli amministratori scorretti, ma è utile per proteggere i tuoi dati sulle archiviazioni ospitate esternamente.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "In base all'attuale modulo di cifratura, la dimensione generale dei file è \nincrementata (del 35%% o più quando si utilizza il modulo predefinito)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Dovresti fare regolarmente una copia di sicurezza di tutte le chiavi di cifratura per evitare perdite di dati definitive (data/<utente>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
     "Enable encryption" : "Abilita cifratura",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.",
     "Select default encryption module:" : "Seleziona il modulo di cifratura predefinito:",
@@ -181,8 +188,6 @@ OC.L10N.register(
     "More" : "Altro",
     "Less" : "Meno",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!",
-    "Transactional File Locking is enabled." : "Il blocco file transazionale è abilitato.",
-    "Transactional File Locking is disabled." : "Il blocco file transazionale è disabilitato.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite è utilizzato come database. Per installazioni più grandi consigliamo di passare a un motore di database diverso.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Per migrare a un altro database, usa lo strumento da riga di comando: 'occ db:convert-type', o leggi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a>.",
@@ -250,7 +255,7 @@ OC.L10N.register(
     "Issued By" : "Emesso da",
     "Valid until %s" : "Valido fino al %s",
     "Import root certificate" : "Importa certificato radice",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è licenziato nei termini della {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
     "Show user backend" : "Mostra il motore utente",
@@ -261,7 +266,6 @@ OC.L10N.register(
     "Create" : "Crea",
     "Admin Recovery Password" : "Password di ripristino amministrativa",
     "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
-    "Search Users" : "Cerca utenti",
     "Add Group" : "Aggiungi gruppo",
     "Group" : "Gruppo",
     "Everyone" : "Chiunque",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index c7bd987808..9c2d6fd6a9 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Server di posta",
     "Log" : "Log",
-    "Server status" : "Stato del server",
     "Tips & tricks" : "Suggerimenti e trucchi",
     "Updates" : "Aggiornamenti",
     "Authentication error" : "Errore di autenticazione",
@@ -117,19 +116,22 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php non sembra essere configurato correttamente per interrogare le variabili d'ambiente di sistema. Il test con getenv(\"PATH\") restituisce solo una risposta vuota.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Controlla la documentazione di installazione per le note di configurazione di php e la configurazione del tuo server, specialmente quando utilizzi php-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Controlla la <a target=\"_blank\" href=\"%s\">documentazione di installazione↗</a>  per le note di configurazione di php e la configurazione del tuo server, in particolare quando utilizzi php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configurazione di sola lettura è stata abilitata. Ciò impedisce l'impostazione di alcune configurazioni tramite l'interfaccia web. Inoltre, i file devono essere resi scrivibili manualmente per ogni aggiornamento.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Sembra che PHP sia configurato per rimuovere i blocchi di documentazione in linea. Ciò renderà inaccessibili diverse applicazioni principali.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ciò è causato probabilmente da una cache/acceleratore come Zend OPcache o eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Il tuo server è in esecuzione su Microsoft Windows. Consigliamo vivamente Linux per un'esperienza utente ottimale.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "La versione di %1$s installata è anteriore alla %2$s, per motivi di stabilità e prestazioni, consigliamo di aggiornare una una versione di %1$s più recente.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Il blocco del file transazionale è disabilitato, ciò potrebbe comportare problemi di race condition. Abilita 'filelocking.enabled' nel config-php per evitare questi problemi. Vedi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a> per ulteriori informazioni.",
     "System locale can not be set to a one which supports UTF-8." : "La localizzazione di sistema non può essere impostata a una che supporta UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle localizzazioni seguenti: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se la tua installazione non si trova nella radice del dominio e utilizza il cron di sistema, potrebbero esserci problemi con la generazione degli URL. Per evitare questi problemi, imposta l'opzione \"overwrite.cli.url\"  nel file config.php al percorso della radice del sito della tua installazione (Consigliato: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Non è stato possibile eseguire il job di cron tramite CLI. Sono apparsi i seguenti errori tecnici:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Il blocco del file transazionale sta utilizzando il database come motore di blocco, per avere prestazioni migliori, è consigliato configurare una cache di memoria per il blocco. Vedi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a> per ulteriori informazioni.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Leggi attentamente le  <a target=\"_blank\" href=\"%s\">guide d'installazione ↗</a>, e controlla gli errori o gli avvisi nel <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Tutti i controlli passati.",
     "Open documentation" : "Apri la documentazione",
     "Allow apps to use the Share API" : "Consenti alle applicazioni di utilizzare le API di condivisione",
     "Allow users to share via link" : "Consenti agli utenti di condivere tramite collegamento",
@@ -152,7 +154,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
     "Enable server-side encryption" : "Abilita cifratura lato server",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "La cifratura è un processo a senso unico. Una volta che la cifratura è abilitata, tutti i file da quel momento in poi saranno cifrati sul server e non sarà possibile disattivare la cifratura successivamente. Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
+    "Please read carefully before activating server-side encryption: " : "Leggi attentamente prima di attivare la cifratura lato server:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "La cifratura è un processo a senso unico. Una volta che la cifratura è abilitata, tutti i file da quel momento in poi saranno cifrati sul server e non sarà possibile disattivare la cifratura successivamente",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Chiunque abbia un accesso privilegiato al tuo server ownCloud può decifrare i tuoi file intercettando le richieste o leggendo le password degli utenti che sono memorizzate come testo semplice nei file di sessione. La cifratura lato server non protegge perciò dagli amministratori scorretti, ma è utile per proteggere i tuoi dati sulle archiviazioni ospitate esternamente.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "In base all'attuale modulo di cifratura, la dimensione generale dei file è \nincrementata (del 35%% o più quando si utilizza il modulo predefinito)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Dovresti fare regolarmente una copia di sicurezza di tutte le chiavi di cifratura per evitare perdite di dati definitive (data/<utente>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Questo è l'ultimo avviso: vuoi davvero abilitare la cifratura?",
     "Enable encryption" : "Abilita cifratura",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nessun modulo di cifratura caricato, carica un modulo di cifratura nel menu delle applicazioni.",
     "Select default encryption module:" : "Seleziona il modulo di cifratura predefinito:",
@@ -179,8 +186,6 @@
     "More" : "Altro",
     "Less" : "Meno",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Il file di log è più grande di 100MB. Scaricarlo potrebbe richiedere del tempo!",
-    "Transactional File Locking is enabled." : "Il blocco file transazionale è abilitato.",
-    "Transactional File Locking is disabled." : "Il blocco file transazionale è disabilitato.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite è utilizzato come database. Per installazioni più grandi consigliamo di passare a un motore di database diverso.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "In particolar modo, quando si utilizza il client desktop per la sincronizzazione dei file, l'uso di SQLite è sconsigliato.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Per migrare a un altro database, usa lo strumento da riga di comando: 'occ db:convert-type', o leggi la <a target=\"_blank\" href=\"%s\">documentazione ↗</a>.",
@@ -248,7 +253,7 @@
     "Issued By" : "Emesso da",
     "Valid until %s" : "Valido fino al %s",
     "Import root certificate" : "Importa certificato radice",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è licenziato nei termini della {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
+    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "Sviluppato dalla {communityopen}comunità di ownCloud{linkclose}, il {githubopen}codice sorgente{linkclose} è rilasciato nei termini della licenza {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}.",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
     "Show user backend" : "Mostra il motore utente",
@@ -259,7 +264,6 @@
     "Create" : "Crea",
     "Admin Recovery Password" : "Password di ripristino amministrativa",
     "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
-    "Search Users" : "Cerca utenti",
     "Add Group" : "Aggiungi gruppo",
     "Group" : "Gruppo",
     "Everyone" : "Chiunque",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 41ee4af3ac..43c7568005 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -28,8 +28,8 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
     "Backend doesn't support password change, but the user's encryption key was successfully updated." : "バックエンドはパスワードの変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
     "Unable to change password" : "パスワードを変更できません",
-    "Enabled" : "有効",
-    "Not enabled" : "無効",
+    "Enabled" : "有効なアプリ",
+    "Not enabled" : "無効なアプリ",
     "Federated Cloud Sharing" : "統合されたクラウド共有",
     "A problem occurred, please check your log files (Error: %s)" : "問題が発生しました。ログファイルを確認してください。(Error: %s)",
     "Migration Completed" : "移行が完了しました",
@@ -121,10 +121,11 @@ OC.L10N.register(
     "System locale can not be set to a one which supports UTF-8." : "システムロケールを UTF-8 をサポートするロケールに設定できません。",
     "This means that there might be problems with certain characters in file names." : "これは、ファイル名の特定の文字に問題があることを意味しています。",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするには、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
-    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwrite.cli.url\" オプションをインストールしたwebrootのパスに設定してください。(推奨: \"%s\")",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合は、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwrite.cli.url\" オプションをインストールしたwebrootのパスに設定してください。(推奨: \"%s\")",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" href=\"%s\">インストールガイド ↗</a>をもう一度チェックして、<a href=\"#log-section\">ログ</a> にあるエラーまたは警告について確認してください。",
     "Open documentation" : "ドキュメントを開く",
     "Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
-    "Allow users to share via link" : "URLリンクで共有を許可する",
+    "Allow users to share via link" : "URLリンクでの共有を許可する",
     "Enforce password protection" : "常にパスワード保護を有効にする",
     "Allow public uploads" : "パブリックなアップロードを許可する",
     "Allow users to send mail notification for shared files" : "共有ファイルに関するメール通知の送信をユーザーに許可する",
@@ -137,13 +138,13 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files to other users" : "他ユーザーへの共有ファイルに関するメール通知の送信をユーザーに許可する",
     "Exclude groups from sharing" : "共有可能なグループから除外する",
     "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
-    "Last cron job execution: %s." : "最終cronジョブ実行: %s。",
-    "Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s。何らかの問題があります。",
+    "Last cron job execution: %s." : "最終cronジョブ実行: %s",
+    "Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s  何らかの問題があります。",
     "Cron was not executed yet!" : "cronはまだ実行されていません！",
     "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています。",
     "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行します。",
-    "Enable server-side encryption" : "サーバーサイド暗号化を有効に",
+    "Enable server-side encryption" : "サーバーサイド暗号化を有効にする",
     "Enable encryption" : "暗号化を有効に",
     "Select default encryption module:" : "デフォルトの暗号化モジュールを選択:",
     "Start migration" : "移行を開始",
@@ -174,7 +175,7 @@ OC.L10N.register(
     "Performance tuning" : "パフォーマンスチューニング",
     "Improving the config.php" : "config.phpの改善",
     "Version" : "バージョン",
-    "Developer documentation" : "デベロッパードキュメント",
+    "Developer documentation" : "開発者ドキュメント",
     "by" : "by",
     "licensed" : "ライセンス",
     "Documentation:" : "ドキュメント:",
@@ -195,29 +196,30 @@ OC.L10N.register(
     "Forum" : "フォーラム",
     "Issue tracker" : "イシュートラッカー",
     "Commercial support" : "商用サポート",
-    "Get the apps to sync your files" : "ファイルを同期するためのアプリを取得",
+    "Get the apps to sync your files" : "ファイルを同期するアプリを取得しましょう",
     "Desktop client" : "デスクトップクライアント",
     "Android app" : "Androidアプリ",
     "iOS app" : "iOSアプリ",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "もしプロジェクトをサポートしていただけるなら、\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\">開発に参加する</a>、\nもしくは\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "プロジェクトをサポートしていただける場合は、\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\">開発に参加する</a>か、\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
     "Show First Run Wizard again" : "初回ウィザードを再表示する",
-    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "現在 <strong>%s</strong> / <strong>%s</strong> を利用しています",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "現在 <strong>%s</strong> / <strong>%s</strong> を使用しています",
     "Password" : "パスワード",
     "Unable to change your password" : "パスワードを変更することができません",
     "Current password" : "現在のパスワード",
     "New password" : "新しいパスワード",
     "Change password" : "パスワードを変更",
-    "Full name" : "姓名",
+    "Full name" : "氏名",
     "No display name set" : "表示名が未設定",
     "Email" : "メール",
     "Your email address" : "あなたのメールアドレス",
     "Fill in an email address to enable password recovery and receive notifications" : "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
     "No email address set" : "メールアドレスが設定されていません",
-    "You are member of the following groups:" : "次のグループのメンバーです:",
+    "You are member of the following groups:" : "以下のグループのメンバーです:",
     "Profile picture" : "プロフィール画像",
     "Upload new" : "新たにアップロード",
     "Select new from Files" : "新しいファイルを選択",
     "Remove image" : "画像を削除",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "pngまたはjpg形式。正方形が理想ですが、切り取って加工することもできます。ファイルは最大20MBを超えないようにしてください。",
     "Your avatar is provided by your original account." : "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。",
     "Cancel" : "キャンセル",
     "Choose as profile image" : "プロファイル画像として選択",
@@ -228,7 +230,7 @@ OC.L10N.register(
     "Issued By" : "発行元",
     "Valid until %s" : "%s まで有効",
     "Import root certificate" : "ルート証明書をインポート",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : " {communityopen}ownCloud community{link close}によって開発されました、{githubopen}ソースコード{linkclose} は {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{link close}.によってライセンスされます。",
+    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : " {communityopen}ownCloud community{linkclose} によって開発されています。{githubopen}ソースコード{linkclose} は {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} によってライセンスされます。",
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
     "Show user backend" : "ユーザーバックエンドを表示",
@@ -239,7 +241,6 @@ OC.L10N.register(
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
     "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
-    "Search Users" : "ユーザーを検索",
     "Add Group" : "グループを追加",
     "Group" : "グループ",
     "Everyone" : "すべてのユーザー",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 6533043c79..cbc130a24e 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -26,8 +26,8 @@
     "Wrong admin recovery password. Please check the password and try again." : "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
     "Backend doesn't support password change, but the user's encryption key was successfully updated." : "バックエンドはパスワードの変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
     "Unable to change password" : "パスワードを変更できません",
-    "Enabled" : "有効",
-    "Not enabled" : "無効",
+    "Enabled" : "有効なアプリ",
+    "Not enabled" : "無効なアプリ",
     "Federated Cloud Sharing" : "統合されたクラウド共有",
     "A problem occurred, please check your log files (Error: %s)" : "問題が発生しました。ログファイルを確認してください。(Error: %s)",
     "Migration Completed" : "移行が完了しました",
@@ -119,10 +119,11 @@
     "System locale can not be set to a one which supports UTF-8." : "システムロケールを UTF-8 をサポートするロケールに設定できません。",
     "This means that there might be problems with certain characters in file names." : "これは、ファイル名の特定の文字に問題があることを意味しています。",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするには、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
-    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwrite.cli.url\" オプションをインストールしたwebrootのパスに設定してください。(推奨: \"%s\")",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合は、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwrite.cli.url\" オプションをインストールしたwebrootのパスに設定してください。(推奨: \"%s\")",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" href=\"%s\">インストールガイド ↗</a>をもう一度チェックして、<a href=\"#log-section\">ログ</a> にあるエラーまたは警告について確認してください。",
     "Open documentation" : "ドキュメントを開く",
     "Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
-    "Allow users to share via link" : "URLリンクで共有を許可する",
+    "Allow users to share via link" : "URLリンクでの共有を許可する",
     "Enforce password protection" : "常にパスワード保護を有効にする",
     "Allow public uploads" : "パブリックなアップロードを許可する",
     "Allow users to send mail notification for shared files" : "共有ファイルに関するメール通知の送信をユーザーに許可する",
@@ -135,13 +136,13 @@
     "Allow users to send mail notification for shared files to other users" : "他ユーザーへの共有ファイルに関するメール通知の送信をユーザーに許可する",
     "Exclude groups from sharing" : "共有可能なグループから除外する",
     "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
-    "Last cron job execution: %s." : "最終cronジョブ実行: %s。",
-    "Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s。何らかの問題があります。",
+    "Last cron job execution: %s." : "最終cronジョブ実行: %s",
+    "Last cron job execution: %s. Something seems wrong." : "最終cronジョブ実行: %s  何らかの問題があります。",
     "Cron was not executed yet!" : "cronはまだ実行されていません！",
     "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行します。",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています。",
     "Use system's cron service to call the cron.php file every 15 minutes." : "システムのcronサービスを利用して、15分間隔でcron.phpファイルを実行します。",
-    "Enable server-side encryption" : "サーバーサイド暗号化を有効に",
+    "Enable server-side encryption" : "サーバーサイド暗号化を有効にする",
     "Enable encryption" : "暗号化を有効に",
     "Select default encryption module:" : "デフォルトの暗号化モジュールを選択:",
     "Start migration" : "移行を開始",
@@ -172,7 +173,7 @@
     "Performance tuning" : "パフォーマンスチューニング",
     "Improving the config.php" : "config.phpの改善",
     "Version" : "バージョン",
-    "Developer documentation" : "デベロッパードキュメント",
+    "Developer documentation" : "開発者ドキュメント",
     "by" : "by",
     "licensed" : "ライセンス",
     "Documentation:" : "ドキュメント:",
@@ -193,29 +194,30 @@
     "Forum" : "フォーラム",
     "Issue tracker" : "イシュートラッカー",
     "Commercial support" : "商用サポート",
-    "Get the apps to sync your files" : "ファイルを同期するためのアプリを取得",
+    "Get the apps to sync your files" : "ファイルを同期するアプリを取得しましょう",
     "Desktop client" : "デスクトップクライアント",
     "Android app" : "Androidアプリ",
     "iOS app" : "iOSアプリ",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "もしプロジェクトをサポートしていただけるなら、\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\">開発に参加する</a>、\nもしくは\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "プロジェクトをサポートしていただける場合は、\n<a href=\"https://owncloud.org/contribute\"\ntarget=\"_blank\">開発に参加する</a>か、\n<a href=\"https://owncloud.org/promote\"\ntarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
     "Show First Run Wizard again" : "初回ウィザードを再表示する",
-    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "現在 <strong>%s</strong> / <strong>%s</strong> を利用しています",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "現在 <strong>%s</strong> / <strong>%s</strong> を使用しています",
     "Password" : "パスワード",
     "Unable to change your password" : "パスワードを変更することができません",
     "Current password" : "現在のパスワード",
     "New password" : "新しいパスワード",
     "Change password" : "パスワードを変更",
-    "Full name" : "姓名",
+    "Full name" : "氏名",
     "No display name set" : "表示名が未設定",
     "Email" : "メール",
     "Your email address" : "あなたのメールアドレス",
     "Fill in an email address to enable password recovery and receive notifications" : "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
     "No email address set" : "メールアドレスが設定されていません",
-    "You are member of the following groups:" : "次のグループのメンバーです:",
+    "You are member of the following groups:" : "以下のグループのメンバーです:",
     "Profile picture" : "プロフィール画像",
     "Upload new" : "新たにアップロード",
     "Select new from Files" : "新しいファイルを選択",
     "Remove image" : "画像を削除",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "pngまたはjpg形式。正方形が理想ですが、切り取って加工することもできます。ファイルは最大20MBを超えないようにしてください。",
     "Your avatar is provided by your original account." : "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。",
     "Cancel" : "キャンセル",
     "Choose as profile image" : "プロファイル画像として選択",
@@ -226,7 +228,7 @@
     "Issued By" : "発行元",
     "Valid until %s" : "%s まで有効",
     "Import root certificate" : "ルート証明書をインポート",
-    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : " {communityopen}ownCloud community{link close}によって開発されました、{githubopen}ソースコード{linkclose} は {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{link close}.によってライセンスされます。",
+    "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : " {communityopen}ownCloud community{linkclose} によって開発されています。{githubopen}ソースコード{linkclose} は {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose} によってライセンスされます。",
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
     "Show user backend" : "ユーザーバックエンドを表示",
@@ -237,7 +239,6 @@
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
     "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
-    "Search Users" : "ユーザーを検索",
     "Add Group" : "グループを追加",
     "Group" : "グループ",
     "Everyone" : "すべてのユーザー",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index 9ea90377bc..fdfcf28145 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "이메일 서버",
     "Log" : "로그",
-    "Server status" : "서버 상태",
     "Tips & tricks" : "팁과 추가 정보",
     "Updates" : "업데이트",
     "Authentication error" : "인증 오류",
@@ -119,7 +118,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php가 시스템 환경 변수를 올바르게 조회할 수 있도록 설정되지 않았습니다. getenv(\"PATH\")의 값이 비어 있습니다.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "설치 문서를 참조하여 php 설정 방법 및 php 설정을 변경하십시오. php-fpm을 사용한다면 더 주의하십시오.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "<a target=\"_blank\" href=\"%s\">설치 문서↗</a>를 참조하여 php 설정 방법 및 php 설정을 변경하십시오. php-fpm을 사용한다면 더 주의하십시오.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "읽기 전용 설정이 활성화되었습니다. 이 상태에서는 웹 인터페이스를 통하여 일부 설정을 변경할 수 없습니다. 또한 매 업데이트마다 파일을 쓸 수 있는 상태로 변경해야 합니다.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.",
@@ -132,6 +131,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "도메인의 루트 디렉터리 아래에 설치되어 있지 않고 시스템 cron을 사용한다면 URL 생성에 문제가 발생할 수도 있습니다. 이 문제를 해결하려면 설치본의 웹 루트 경로에 있는 config.php 파일의 \"overwrite.cli.url\" 옵션을 변경하십시오(제안: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI로 cronjob을 실행할 수 없었습니다. 다음 기술적 오류가 발생하였습니다:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" href=\"%s\">설치 가이드 ↗</a>를 다시 확인하시고 <a href=\"#log-section\">로그</a>의 오류 및 경고를 확인하십시오.",
+    "All checks passed." : "모든 검사를 통과하였습니다.",
     "Open documentation" : "문서 열기",
     "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
     "Allow users to share via link" : "사용자별 링크 공유 허용",
@@ -154,7 +154,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php는 webcron 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
     "Enable server-side encryption" : "서버 측 암호화 사용",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "암호화 작업은 단방향입니다. 암호화를 한 번 활성화하면 그 시점 이후에 서버에 저장되는 모든 파일이 암호화되며 나중에 암호화를 비활성화할 수 없습니다. 마지막 경고입니다. 암호화를 활성화하시겠습니까?",
+    "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "서버 측 암호화 작업은 단방향입니다. 암호화를 한 번 활성화하면 그 시점 이후에 서버에 저장되는 모든 파일이 암호화되며 나중에 암호화를 비활성화할 수 없습니다.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud 서버에 관리자 권한을 가지고 있는 임의의 사용자가 요청을 가로채거나 일반 텍스트 세션 파일에 있는 사용자 암호를 읽어서 암호화를 해제할 수 있습니다. 서버 측 암호화는 악의적인 관리자로부터 파일을 보호할 수는 없으나, 외부에 호스팅된 저장소에 있는 파일을 보호할 수 있습니다.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "암호화 방식에 따라서 파일이 저장된 크기가 증가합니다(기본 모듈 사용 시 최소 35%%)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "데이터 손실을 방지하려면 모든 암호화 키를 주기적으로 백업해야 합니다(data/<user>/files_encryption 및 data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
     "Enable encryption" : "암호화 사용",
     "No encryption module loaded, please enable an encryption module in the app menu." : "암호화 모듈을 불러오지 않았습니다. 앱 메뉴에서 암호화 모듈을 활성화하십시오.",
     "Select default encryption module:" : "기본 암호화 모듈 선택:",
@@ -181,8 +186,6 @@ OC.L10N.register(
     "More" : "더 중요함",
     "Less" : "덜 중요함",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "로그 파일이 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수 있습니다!",
-    "Transactional File Locking is enabled." : "트랜잭션 기반 파일 잠금이 활성화 되었습니다.",
-    "Transactional File Locking is disabled." : "트랜잭션 기반 파일 잠금이 비활성화 되었습니다.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정이면, SQLite를 사용하지 않는 것이 좋습니다.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "다른 데이터베이스로 이전하려면 다음 명령을 사용하십시오: 'occ db:convert-type' 다른 명령을 알아보려면 <a target=\"_blank\" href=\"%s\">문서 ↗</a>를 참고하십시오.",
@@ -261,7 +264,6 @@ OC.L10N.register(
     "Create" : "만들기",
     "Admin Recovery Password" : "관리자 복구 암호",
     "Enter the recovery password in order to recover the users files during password change" : "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
-    "Search Users" : "사용자 찾기",
     "Add Group" : "그룹 추가",
     "Group" : "그룹",
     "Everyone" : "모두",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 429d75dc93..5c05bed51e 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "이메일 서버",
     "Log" : "로그",
-    "Server status" : "서버 상태",
     "Tips & tricks" : "팁과 추가 정보",
     "Updates" : "업데이트",
     "Authentication error" : "인증 오류",
@@ -117,7 +116,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php가 시스템 환경 변수를 올바르게 조회할 수 있도록 설정되지 않았습니다. getenv(\"PATH\")의 값이 비어 있습니다.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "설치 문서를 참조하여 php 설정 방법 및 php 설정을 변경하십시오. php-fpm을 사용한다면 더 주의하십시오.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "<a target=\"_blank\" href=\"%s\">설치 문서↗</a>를 참조하여 php 설정 방법 및 php 설정을 변경하십시오. php-fpm을 사용한다면 더 주의하십시오.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "읽기 전용 설정이 활성화되었습니다. 이 상태에서는 웹 인터페이스를 통하여 일부 설정을 변경할 수 없습니다. 또한 매 업데이트마다 파일을 쓸 수 있는 상태로 변경해야 합니다.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP에서 인라인 doc 블록을 삭제하도록 설정되어 있습니다. 일부 코어 앱에 접근할 수 없을 수도 있습니다.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Zend OPcache, eAccelerator 같은 캐시/가속기 문제일 수도 있습니다.",
@@ -130,6 +129,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "도메인의 루트 디렉터리 아래에 설치되어 있지 않고 시스템 cron을 사용한다면 URL 생성에 문제가 발생할 수도 있습니다. 이 문제를 해결하려면 설치본의 웹 루트 경로에 있는 config.php 파일의 \"overwrite.cli.url\" 옵션을 변경하십시오(제안: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "CLI로 cronjob을 실행할 수 없었습니다. 다음 기술적 오류가 발생하였습니다:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "<a target=\"_blank\" href=\"%s\">설치 가이드 ↗</a>를 다시 확인하시고 <a href=\"#log-section\">로그</a>의 오류 및 경고를 확인하십시오.",
+    "All checks passed." : "모든 검사를 통과하였습니다.",
     "Open documentation" : "문서 열기",
     "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
     "Allow users to share via link" : "사용자별 링크 공유 허용",
@@ -152,7 +152,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php는 webcron 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일을 실행합니다.",
     "Enable server-side encryption" : "서버 측 암호화 사용",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "암호화 작업은 단방향입니다. 암호화를 한 번 활성화하면 그 시점 이후에 서버에 저장되는 모든 파일이 암호화되며 나중에 암호화를 비활성화할 수 없습니다. 마지막 경고입니다. 암호화를 활성화하시겠습니까?",
+    "Please read carefully before activating server-side encryption: " : "서버 측 암호화를 활성화하기 전에 읽어 보십시오:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "서버 측 암호화 작업은 단방향입니다. 암호화를 한 번 활성화하면 그 시점 이후에 서버에 저장되는 모든 파일이 암호화되며 나중에 암호화를 비활성화할 수 없습니다.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud 서버에 관리자 권한을 가지고 있는 임의의 사용자가 요청을 가로채거나 일반 텍스트 세션 파일에 있는 사용자 암호를 읽어서 암호화를 해제할 수 있습니다. 서버 측 암호화는 악의적인 관리자로부터 파일을 보호할 수는 없으나, 외부에 호스팅된 저장소에 있는 파일을 보호할 수 있습니다.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "암호화 방식에 따라서 파일이 저장된 크기가 증가합니다(기본 모듈 사용 시 최소 35%%)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "데이터 손실을 방지하려면 모든 암호화 키를 주기적으로 백업해야 합니다(data/<user>/files_encryption 및 data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "마지막 경고입니다. 암호화를 활성화하시겠습니까?",
     "Enable encryption" : "암호화 사용",
     "No encryption module loaded, please enable an encryption module in the app menu." : "암호화 모듈을 불러오지 않았습니다. 앱 메뉴에서 암호화 모듈을 활성화하십시오.",
     "Select default encryption module:" : "기본 암호화 모듈 선택:",
@@ -179,8 +184,6 @@
     "More" : "더 중요함",
     "Less" : "덜 중요함",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "로그 파일이 100MB보다 큽니다. 다운로드하는 데 시간이 걸릴 수 있습니다!",
-    "Transactional File Locking is enabled." : "트랜잭션 기반 파일 잠금이 활성화 되었습니다.",
-    "Transactional File Locking is disabled." : "트랜잭션 기반 파일 잠금이 비활성화 되었습니다.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "데이터베이스로 SQLite를 사용하고 있습니다. 대규모의 파일을 관리하려고 한다면 다른 데이터베이스 백엔드로 전환할 것을 권장합니다.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "특히 파일 동기화를 위해 데스크톱 클라이언트를 사용할 예정이면, SQLite를 사용하지 않는 것이 좋습니다.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "다른 데이터베이스로 이전하려면 다음 명령을 사용하십시오: 'occ db:convert-type' 다른 명령을 알아보려면 <a target=\"_blank\" href=\"%s\">문서 ↗</a>를 참고하십시오.",
@@ -259,7 +262,6 @@
     "Create" : "만들기",
     "Admin Recovery Password" : "관리자 복구 암호",
     "Enter the recovery password in order to recover the users files during password change" : "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
-    "Search Users" : "사용자 찾기",
     "Add Group" : "그룹 추가",
     "Group" : "그룹",
     "Everyone" : "모두",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 4fffe8d620..84466f6161 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -30,7 +30,9 @@ OC.L10N.register(
     "Unable to change password" : "Kunne ikke endre passord",
     "Enabled" : "Aktiv",
     "Not enabled" : "Ikke aktivert",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "installering og oppdatering av apper via app-butikken eller ved deling i Sammenknyttet sky",
     "Federated Cloud Sharing" : "Sammenknyttet sky-deling",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL bruker en utdatert %s-versjon (%s). Vennligst oppdater operativsystemet ditt; ellers vil ikke funksjoner som %s virke korrekt.",
     "A problem occurred, please check your log files (Error: %s)" : "Det oppstod et problem. Sjekk loggfilene (Feil: %s)",
     "Migration Completed" : "Migrering ferdig",
     "Group already exists." : "Gruppe finnes allerede.",
@@ -75,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Avinstallerer ....",
     "Error while uninstalling app" : "Feil ved avinstallering av app",
     "Uninstall" : "Avinstaller",
+    "An error occurred: {message}" : "Det oppstod en feil: {message}",
     "Select a profile picture" : "Velg et profilbilde",
     "Very weak password" : "Veldig svakt passord",
     "Weak password" : "Svakt passord",
@@ -115,19 +118,22 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP ser ikke ut til å være satt opp riktig for å lese systemets miljøvariabler. Testen med getenv(\"PATH\") returnerer bare et tomt svar.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Sjekk installasjonsdokumentasjonen for notiser om PHP-konfigurering og om konfigurering av serveren, spesielt ved bruk av php-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Sjekk <a target=\"_blank\" href=\"%s\">installasjonsdokumentasjonen ↗</a> for notiser om PHP-konfigurering og om konfigurering av serveren, spesielt ved bruk av php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfigurasjonen er blitt aktivert. Dette forhindrer setting av visse konfigureringer via web-grensesnittet. Videre må config-filen gjøres skrivbar manuelt for hver oppdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Serveren din kjører på Microsoft Windows. Vi anbefaler strekt Linux for en optimal brukeropplevelse.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s lavere enn versjon %2$s er installert. Vi anbefaler å oppgradere til en nyere %1$s-versjon for å få bedre stabilitet og ytelse.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksjonsbasert fil-låsing er deaktivert. Dette kan føre til problemer med kappløpssituasjoner. Aktiver 'filelocking.enabled' i config.php for å unngå disse problemene. Se <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a> for mer informasjon.",
     "System locale can not be set to a one which supports UTF-8." : "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Dette betyr at det kan forekomme problemer med visse tegn i filnavn.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Vi anbefaler sterkt å installere de påkrevde pakkene på systemet ditt for å støtte en av følgende nasjonale innstillinger: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis installasjonen din ikke er installert i roten av domenet og bruker systemets cron, kan det bli problemer med URL-genereringen. For å unngå disse problemene, sett \"overwrite.cli.url\" i filen config.php til web-roten for installasjonen din (Foreslått: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke mulig å kjøre cron-jobben vi CLI. Følgende tekniske feil oppstod:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksjonsbasert fil-låsing bruker databasen som låsemekanisme. For best ytelse anbefales det å konfigurerer en memcache for låsing. Se <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a> for mer informasjon.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Vennligst dobbeltsjekk <a target=\"_blank\" href=\"%s\">Installasjonsveiledningene ↗</a> og se etter feil og advarsler i <a href=\"#log-section\">loggen</a>.",
+    "All checks passed." : "Alle sjekker bestått.",
     "Open documentation" : "Åpne dokumentasjonen",
     "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
     "Allow users to share via link" : "Tillat brukere å dele via lenke",
@@ -150,7 +156,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
     "Enable server-side encryption" : "Aktiver serverkryptering",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Kryptering er en enveisprosess. Når kryptering er aktivert, vil alle filer fra det tidspunktet av bli kryptert på serveren og det vil ikke være mulig å deaktivere kryptering senere. Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
+    "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Serverkryptering er en enveisprosess. Når kryptering er blitt aktivert, vil alle filer fra det tidspunktet av bli kryptert på serveren og det vil ikke være mulig å deaktivere kryptering senere.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Alle som har privilegert tilgang til ownCloud-serveren din kan dekryptere filene dine enten ved å fange opp forespørsler eller ved å lese brukerpassord som er lagret i klartekst i økt-filer. Serverkryptering beskytter derfor ikke mot uærlige administratorer, men det er nyttig for å beskytte dine data på eksternt oppkoblede lagringsplasser.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Avhengig av den faktiske krypteringsmodulen økes filstørrelsen generelt (med 35%% eller mer ved bruk av standardmodulen)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør ta periodisk sikkerhetskopi av alle krypteringsnøkler for å forhindre permanent tap av data (data/<user>/files_encryption og data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
     "Enable encryption" : "Aktiver kryptering",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul er lastet. Aktiver en krypteringsmodul i app-menyen.",
     "Select default encryption module:" : "Velg standard krypteringsmodul:",
@@ -177,8 +188,6 @@ OC.L10N.register(
     "More" : "Mer",
     "Less" : "Mindre",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!",
-    "Transactional File Locking is enabled." : "Transaksjonsbasert fil-låsing er aktivert.",
-    "Transactional File Locking is disabled." : "Transaksjonsbasert fil-låsing er deaktivert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite brukes som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type', eller les i <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a>.",
@@ -196,6 +205,7 @@ OC.L10N.register(
     "licensed" : "lisensiert",
     "Documentation:" : "Dokumentasjon:",
     "User documentation" : "Brukerdokumentasjon",
+    "Admin documentation" : "Admin-dokumentasjon",
     "Show description …" : "Vis beskrivelse …",
     "Hide description …" : "Skjul beskrivelse …",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Denne appen kan ikke installeres fordi følgende avhengigheter ikke er tilfredsstilt:",
@@ -234,6 +244,7 @@ OC.L10N.register(
     "Upload new" : "Last opp nytt",
     "Select new from Files" : "Velg nytt fra Filer",
     "Remove image" : "Fjern bilde",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Enten png eller jpg. Helst kvadratisk, men du kan beskjære bildet. Filen kan ikke være større enn 20 MB.",
     "Your avatar is provided by your original account." : "Avataren din kommer fra din opprinnelige konto.",
     "Cancel" : "Avbryt",
     "Choose as profile image" : "Velg som profilbilde",
@@ -255,7 +266,6 @@ OC.L10N.register(
     "Create" : "Opprett",
     "Admin Recovery Password" : "Administrativt gjenopprettingspassord",
     "Enter the recovery password in order to recover the users files during password change" : "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
-    "Search Users" : "Søk i brukere",
     "Add Group" : "Legg til gruppe",
     "Group" : "Gruppe",
     "Everyone" : "Alle",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 17a4bfce9f..6b3bd34376 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -28,7 +28,9 @@
     "Unable to change password" : "Kunne ikke endre passord",
     "Enabled" : "Aktiv",
     "Not enabled" : "Ikke aktivert",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "installering og oppdatering av apper via app-butikken eller ved deling i Sammenknyttet sky",
     "Federated Cloud Sharing" : "Sammenknyttet sky-deling",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL bruker en utdatert %s-versjon (%s). Vennligst oppdater operativsystemet ditt; ellers vil ikke funksjoner som %s virke korrekt.",
     "A problem occurred, please check your log files (Error: %s)" : "Det oppstod et problem. Sjekk loggfilene (Feil: %s)",
     "Migration Completed" : "Migrering ferdig",
     "Group already exists." : "Gruppe finnes allerede.",
@@ -73,6 +75,7 @@
     "Uninstalling ...." : "Avinstallerer ....",
     "Error while uninstalling app" : "Feil ved avinstallering av app",
     "Uninstall" : "Avinstaller",
+    "An error occurred: {message}" : "Det oppstod en feil: {message}",
     "Select a profile picture" : "Velg et profilbilde",
     "Very weak password" : "Veldig svakt passord",
     "Weak password" : "Svakt passord",
@@ -113,19 +116,22 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP ser ikke ut til å være satt opp riktig for å lese systemets miljøvariabler. Testen med getenv(\"PATH\") returnerer bare et tomt svar.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Sjekk installasjonsdokumentasjonen for notiser om PHP-konfigurering og om konfigurering av serveren, spesielt ved bruk av php-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Sjekk <a target=\"_blank\" href=\"%s\">installasjonsdokumentasjonen ↗</a> for notiser om PHP-konfigurering og om konfigurering av serveren, spesielt ved bruk av php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Den skrivebeskyttede konfigurasjonen er blitt aktivert. Dette forhindrer setting av visse konfigureringer via web-grensesnittet. Videre må config-filen gjøres skrivbar manuelt for hver oppdatering.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Det ser ut for at PHP er satt opp til å fjerne innebygde doc blocks. Dette gjør at flere av kjerneapplikasjonene blir utilgjengelige.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dette forårsakes sannsynligvis av en bufrer/akselerator, som f.eks. Zend OPcache eller eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "Serveren din kjører på Microsoft Windows. Vi anbefaler strekt Linux for en optimal brukeropplevelse.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s lavere enn versjon %2$s er installert. Vi anbefaler å oppgradere til en nyere %1$s-versjon for å få bedre stabilitet og ytelse.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksjonsbasert fil-låsing er deaktivert. Dette kan føre til problemer med kappløpssituasjoner. Aktiver 'filelocking.enabled' i config.php for å unngå disse problemene. Se <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a> for mer informasjon.",
     "System locale can not be set to a one which supports UTF-8." : "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Dette betyr at det kan forekomme problemer med visse tegn i filnavn.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Vi anbefaler sterkt å installere de påkrevde pakkene på systemet ditt for å støtte en av følgende nasjonale innstillinger: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Hvis installasjonen din ikke er installert i roten av domenet og bruker systemets cron, kan det bli problemer med URL-genereringen. For å unngå disse problemene, sett \"overwrite.cli.url\" i filen config.php til web-roten for installasjonen din (Foreslått: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Det var ikke mulig å kjøre cron-jobben vi CLI. Følgende tekniske feil oppstod:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Transaksjonsbasert fil-låsing bruker databasen som låsemekanisme. For best ytelse anbefales det å konfigurerer en memcache for låsing. Se <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a> for mer informasjon.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Vennligst dobbeltsjekk <a target=\"_blank\" href=\"%s\">Installasjonsveiledningene ↗</a> og se etter feil og advarsler i <a href=\"#log-section\">loggen</a>.",
+    "All checks passed." : "Alle sjekker bestått.",
     "Open documentation" : "Åpne dokumentasjonen",
     "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
     "Allow users to share via link" : "Tillat brukere å dele via lenke",
@@ -148,7 +154,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Bruk systemets cron-tjeneste til å kalle cron.php hvert 15. minutt.",
     "Enable server-side encryption" : "Aktiver serverkryptering",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Kryptering er en enveisprosess. Når kryptering er aktivert, vil alle filer fra det tidspunktet av bli kryptert på serveren og det vil ikke være mulig å deaktivere kryptering senere. Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
+    "Please read carefully before activating server-side encryption: " : "Vennligst les dette nøye før du aktiverer serverkrykptering:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Serverkryptering er en enveisprosess. Når kryptering er blitt aktivert, vil alle filer fra det tidspunktet av bli kryptert på serveren og det vil ikke være mulig å deaktivere kryptering senere.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Alle som har privilegert tilgang til ownCloud-serveren din kan dekryptere filene dine enten ved å fange opp forespørsler eller ved å lese brukerpassord som er lagret i klartekst i økt-filer. Serverkryptering beskytter derfor ikke mot uærlige administratorer, men det er nyttig for å beskytte dine data på eksternt oppkoblede lagringsplasser.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Avhengig av den faktiske krypteringsmodulen økes filstørrelsen generelt (med 35%% eller mer ved bruk av standardmodulen)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Du bør ta periodisk sikkerhetskopi av alle krypteringsnøkler for å forhindre permanent tap av data (data/<user>/files_encryption og data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dette er siste advarsel: Vil du virkelig aktivere kryptering?",
     "Enable encryption" : "Aktiver kryptering",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Ingen krypteringsmodul er lastet. Aktiver en krypteringsmodul i app-menyen.",
     "Select default encryption module:" : "Velg standard krypteringsmodul:",
@@ -175,8 +186,6 @@
     "More" : "Mer",
     "Less" : "Mindre",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Loggfilen er over 100 MB, nedlastingen kan ta en stund!",
-    "Transactional File Locking is enabled." : "Transaksjonsbasert fil-låsing er aktivert.",
-    "Transactional File Locking is disabled." : "Transaksjonsbasert fil-låsing er deaktivert.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite brukes som database. For større installasjoner anbefaler vi å bytte til en annen database-server.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "SQLite er spesielt frarådet om man bruker desktopklienten til filsynkronisering",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type', eller les i <a target=\"_blank\" href=\"%s\">dokumentasjonen ↗</a>.",
@@ -194,6 +203,7 @@
     "licensed" : "lisensiert",
     "Documentation:" : "Dokumentasjon:",
     "User documentation" : "Brukerdokumentasjon",
+    "Admin documentation" : "Admin-dokumentasjon",
     "Show description …" : "Vis beskrivelse …",
     "Hide description …" : "Skjul beskrivelse …",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Denne appen kan ikke installeres fordi følgende avhengigheter ikke er tilfredsstilt:",
@@ -232,6 +242,7 @@
     "Upload new" : "Last opp nytt",
     "Select new from Files" : "Velg nytt fra Filer",
     "Remove image" : "Fjern bilde",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Enten png eller jpg. Helst kvadratisk, men du kan beskjære bildet. Filen kan ikke være større enn 20 MB.",
     "Your avatar is provided by your original account." : "Avataren din kommer fra din opprinnelige konto.",
     "Cancel" : "Avbryt",
     "Choose as profile image" : "Velg som profilbilde",
@@ -253,7 +264,6 @@
     "Create" : "Opprett",
     "Admin Recovery Password" : "Administrativt gjenopprettingspassord",
     "Enter the recovery password in order to recover the users files during password change" : "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
-    "Search Users" : "Søk i brukere",
     "Add Group" : "Legg til gruppe",
     "Group" : "Gruppe",
     "Everyone" : "Alle",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 51aadc8c16..45b214299e 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -30,7 +30,9 @@ OC.L10N.register(
     "Unable to change password" : "Kan wachtwoord niet wijzigen",
     "Enabled" : "Geactiveerd",
     "Not enabled" : "Niet ingeschakeld",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "installeren en bijwerken applicaties via de app store of Federated Cloud Sharing",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cUrl gebruikt een verouderde %s versie (%s). Werk het besturingssysteem bij of functies als %s zullen niet betrouwbaar werken.",
     "A problem occurred, please check your log files (Error: %s)" : "Er trad een een probleem op, controleer uw logbestanden (Fout: %s).",
     "Migration Completed" : "Migratie gereed",
     "Group already exists." : "Groep bestaat al.",
@@ -75,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "De-installeren ...",
     "Error while uninstalling app" : "Fout bij de-installeren app",
     "Uninstall" : "De-installeren",
+    "An error occurred: {message}" : "Er heeft zich een fout voorgedaan: {message}",
     "Select a profile picture" : "Kies een profielafbeelding",
     "Very weak password" : "Zeer zwak wachtwoord",
     "Weak password" : "Zwak wachtwoord",
@@ -115,7 +118,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de documentatie voor php configuratieinstellingen en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de <a target=\"_blank\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratie notities en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
@@ -128,6 +131,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de <a href='%s'>installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.",
+    "All checks passed." : "Alle checks geslaagd",
     "Open documentation" : "Open documentatie",
     "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken",
     "Allow users to share via link" : "Sta gebruikers toe om te delen via een link",
@@ -150,7 +154,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
     "Enable server-side encryption" : "Server-side versleuteling inschakelen",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Versleuteling is een eenrichtingsproces. Als versleuteling is ingeschakeld, worden alle bestanden vanaf dat moment versleuteld op de server en is het niet meer mogelijk versleuteling later uit te schakelen. Dit is de laatste waarschuwing: Wilt u echt versleuteling inschakelen?",
+    "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Versleuteling van de server is een eenrichtingsproces. Als versleuteling is ingeschakeld, worden alle bestanden vanaf dat moment versleuteld op de server en is het niet meer mogelijk versleuteling later uit te schakelen.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Iedereen met toegang met hoge autorisaties op uw ownCloud server kan ue bestanden ontcijferen door aanvragen af te luisteren of de wachtwoorden van gebruikers die in leesbare tekst in sessie bestanden zijn opgeslagen uit te lezen. Versleuteling van de server beschermt dus niet tegen kwaadwillende beheerders, maar is praktisch om uw data op externe opslag te beveiligen.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhankelijk van de gebruikte cryptomodule, zal de bestandsomvang gemiddeld toenemen (35%% of meer bij gebruik van de standaardmodule)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "U zou regelmatig uw cryptosleutels moeten backuppen om permanent gegevensverlies te voorkomen (data/<user>/files_encryption en data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wilt u versleuteling echt inschakelen?",
     "Enable encryption" : "Versleuteling inschakelen",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
     "Select default encryption module:" : "Selecteer de standaard cryptomodule:",
@@ -177,8 +186,6 @@ OC.L10N.register(
     "More" : "Meer",
     "Less" : "Minder",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Het logbestand is groter dan 100MB. Downloaden kost even tijd!",
-    "Transactional File Locking is enabled." : "Transactionele File Locking is ingeschakeld.",
-    "Transactional File Locking is disabled." : "Transactionele File Locking is uitgeschakeld.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we om te schakelen naar een andere database engine.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type', lees de  <a target=\"_blank\" href=\"%s\">documentatie ↗</a>.",
@@ -196,6 +203,7 @@ OC.L10N.register(
     "licensed" : "gelicenseerd",
     "Documentation:" : "Documentatie:",
     "User documentation" : "Gebruikersdocumentatie",
+    "Admin documentation" : "Beheerdocumentatie",
     "Show description …" : "Toon beschrijving ...",
     "Hide description …" : "Verberg beschrijving ...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld:",
@@ -234,6 +242,7 @@ OC.L10N.register(
     "Upload new" : "Upload een nieuwe",
     "Select new from Files" : "Selecteer een nieuwe vanuit bestanden",
     "Remove image" : "Afbeelding verwijderen",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Of png, of jpg. Bij voorkeur vierkant, maar u kunt de afbeelding bijsnijden. Het bestand mag niet groter zijn dan 20 MB.",
     "Your avatar is provided by your original account." : "Uw avatar is verstrekt door uw originele account.",
     "Cancel" : "Annuleer",
     "Choose as profile image" : "Kies als profielafbeelding",
@@ -255,7 +264,6 @@ OC.L10N.register(
     "Create" : "Aanmaken",
     "Admin Recovery Password" : "Beheer herstel wachtwoord",
     "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
-    "Search Users" : "Zoek gebruikers",
     "Add Group" : "Toevoegen groep",
     "Group" : "Groep",
     "Everyone" : "Iedereen",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 4e184bdcb2..04d4555116 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -28,7 +28,9 @@
     "Unable to change password" : "Kan wachtwoord niet wijzigen",
     "Enabled" : "Geactiveerd",
     "Not enabled" : "Niet ingeschakeld",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "installeren en bijwerken applicaties via de app store of Federated Cloud Sharing",
     "Federated Cloud Sharing" : "Federated Cloud Sharing",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cUrl gebruikt een verouderde %s versie (%s). Werk het besturingssysteem bij of functies als %s zullen niet betrouwbaar werken.",
     "A problem occurred, please check your log files (Error: %s)" : "Er trad een een probleem op, controleer uw logbestanden (Fout: %s).",
     "Migration Completed" : "Migratie gereed",
     "Group already exists." : "Groep bestaat al.",
@@ -73,6 +75,7 @@
     "Uninstalling ...." : "De-installeren ...",
     "Error while uninstalling app" : "Fout bij de-installeren app",
     "Uninstall" : "De-installeren",
+    "An error occurred: {message}" : "Er heeft zich een fout voorgedaan: {message}",
     "Select a profile picture" : "Kies een profielafbeelding",
     "Very weak password" : "Zeer zwak wachtwoord",
     "Weak password" : "Zwak wachtwoord",
@@ -113,7 +116,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "php lijkt niet goed te zijn ingesteld om systeemomgevingsvariabelen te bevragen. De test met getenv(\"PATH\") gaf een leeg resultaat.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de documentatie voor php configuratieinstellingen en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verifieer de <a target=\"_blank\" href=\"%s\">installatiedocumentatie ↗</a> voor php configuratie notities en de php configuratie van uw server, zeker als php-fpm wordt gebruikt.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "De Alleen-lezen config is geactiveerd. Dit voorkomt het via de webinterface wijzigen van verschillende instellingen. Bovendien moet het bestand voor elke aanpassing handmatig op beschrijfbaar worden ingesteld.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP is blijkbaar zo ingesteld dat inline doc blokken worden gestript. Hierdoor worden verschillende kernmodules onbruikbaar.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dit wordt vermoedelijk veroorzaakt door een cache/accelerator, zoals Zend OPcache of eAccelerator.",
@@ -126,6 +129,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Als uw installatie niet in de hoofddirectory van het domein staat, maar wel cron gebruikt, dan kunnen er problemen ontstaan bij het genereren van URL's. Om deze problemen te voorkomen zou u de \"overwrite.cli.url\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "het was niet mogelijk om de cronjob via CLI uit te voeren. De volgende technische problemen traden op:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lees de <a href='%s'>installatie handleiding</a> goed door en controleer op fouten en waarschuwingen in de <a href=\"#log-section\">logging</a>.",
+    "All checks passed." : "Alle checks geslaagd",
     "Open documentation" : "Open documentatie",
     "Allow apps to use the Share API" : "Apps toestaan de Share API te gebruiken",
     "Allow users to share via link" : "Sta gebruikers toe om te delen via een link",
@@ -148,7 +152,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
     "Enable server-side encryption" : "Server-side versleuteling inschakelen",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Versleuteling is een eenrichtingsproces. Als versleuteling is ingeschakeld, worden alle bestanden vanaf dat moment versleuteld op de server en is het niet meer mogelijk versleuteling later uit te schakelen. Dit is de laatste waarschuwing: Wilt u echt versleuteling inschakelen?",
+    "Please read carefully before activating server-side encryption: " : "Lees dit goed, voordat u de serverside versleuteling activeert:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Versleuteling van de server is een eenrichtingsproces. Als versleuteling is ingeschakeld, worden alle bestanden vanaf dat moment versleuteld op de server en is het niet meer mogelijk versleuteling later uit te schakelen.",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Iedereen met toegang met hoge autorisaties op uw ownCloud server kan ue bestanden ontcijferen door aanvragen af te luisteren of de wachtwoorden van gebruikers die in leesbare tekst in sessie bestanden zijn opgeslagen uit te lezen. Versleuteling van de server beschermt dus niet tegen kwaadwillende beheerders, maar is praktisch om uw data op externe opslag te beveiligen.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Afhankelijk van de gebruikte cryptomodule, zal de bestandsomvang gemiddeld toenemen (35%% of meer bij gebruik van de standaardmodule)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "U zou regelmatig uw cryptosleutels moeten backuppen om permanent gegevensverlies te voorkomen (data/<user>/files_encryption en data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Dit is de laatste waarschuwing: Wilt u versleuteling echt inschakelen?",
     "Enable encryption" : "Versleuteling inschakelen",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Er is geen cryptomodule geladen, activeer een cryptomodule in het appmenu",
     "Select default encryption module:" : "Selecteer de standaard cryptomodule:",
@@ -175,8 +184,6 @@
     "More" : "Meer",
     "Less" : "Minder",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Het logbestand is groter dan 100MB. Downloaden kost even tijd!",
-    "Transactional File Locking is enabled." : "Transactionele File Locking is ingeschakeld.",
-    "Transactional File Locking is disabled." : "Transactionele File Locking is uitgeschakeld.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we om te schakelen naar een andere database engine.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Vooral wanneer de desktop client wordt gebruik voor bestandssynchronisatie wordt gebruik van sqlite afgeraden.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Om te migreren naar een andere database moet u de commandoregel tool gebruiken: 'occ db:convert-type', lees de  <a target=\"_blank\" href=\"%s\">documentatie ↗</a>.",
@@ -194,6 +201,7 @@
     "licensed" : "gelicenseerd",
     "Documentation:" : "Documentatie:",
     "User documentation" : "Gebruikersdocumentatie",
+    "Admin documentation" : "Beheerdocumentatie",
     "Show description …" : "Toon beschrijving ...",
     "Hide description …" : "Verberg beschrijving ...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Deze app kan niet worden geïnstalleerd omdat de volgende afhankelijkheden niet zijn ingevuld:",
@@ -232,6 +240,7 @@
     "Upload new" : "Upload een nieuwe",
     "Select new from Files" : "Selecteer een nieuwe vanuit bestanden",
     "Remove image" : "Afbeelding verwijderen",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Of png, of jpg. Bij voorkeur vierkant, maar u kunt de afbeelding bijsnijden. Het bestand mag niet groter zijn dan 20 MB.",
     "Your avatar is provided by your original account." : "Uw avatar is verstrekt door uw originele account.",
     "Cancel" : "Annuleer",
     "Choose as profile image" : "Kies als profielafbeelding",
@@ -253,7 +262,6 @@
     "Create" : "Aanmaken",
     "Admin Recovery Password" : "Beheer herstel wachtwoord",
     "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
-    "Search Users" : "Zoek gebruikers",
     "Add Group" : "Toevoegen groep",
     "Group" : "Groep",
     "Everyone" : "Iedereen",
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
index af849ff4a6..c4e745e368 100644
--- a/settings/l10n/oc.js
+++ b/settings/l10n/oc.js
@@ -108,7 +108,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "sembla que php es pas configurat de manièra a recuperar las valors de las variablas d’environament. Lo test de la comanda getenv(\"PATH\") torna solament una responsa voida. ",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verificatz la documentacion d'installacion a prepaus de las instruccions de configuracion de php e tanben de la configuracion de vòstre servidor, en particular dins lo cas qu'utilizatz php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuracion es en mòde lectura sola. Aquò empacha la modificacion de certanas configuracions via l'interfàcia web. Amai, lo fichièr deu èsser passat manualament en lectura-escritura per cada mesa a jorn.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP es aparentament configurat per suprimir los blòts de documentacion intèrnes. Aquò rendrà mantuna aplicacion de basa inaccessiblas.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La rason es probablament l'utilizacion d'un escondedor / accelerador tal coma Zend OPcache o eAccelerator.",
@@ -142,7 +141,6 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php es enregistrat alprèp d'un servici webcron que l'executarà a cada 15 minutas via http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilizatz lo servici cron del sistèma per apelar lo fichièr cron.php a cada 15 minutas.",
     "Enable server-side encryption" : "Activar lo chiframent costat servidor",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Lo chiframent es un processus amb sens unic. Un còp que lo chiframent es activat, totes los fichièrs a partir d'aqueste moment seràn chifrats sul servidor e serà pas possible de desactivar lo chiframent ulteriorament. Aquò es lo darrièr avertiment : Sètz segur que volètz activar lo chiframent?",
     "Enable encryption" : "Activar lo chiframent",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Cap de modul de chiframent es pas cargat. Mercé d'activar un modul de chiframent dins lo menú de las aplicacions.",
     "Select default encryption module:" : "Seleccionatz lo modul de chiframent per defaut :",
@@ -244,7 +242,6 @@ OC.L10N.register(
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperacion del senhal administrator",
     "Enter the recovery password in order to recover the users files during password change" : "Entratz lo senhal de recuperacion per recuperar los fichièrs utilizaires pendent lo cambiament de senhal",
-    "Search Users" : "Recèrca dels utilizaires",
     "Add Group" : "Apondre un grop",
     "Group" : "Grop",
     "Everyone" : "Tot lo monde",
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
index 6921ed2beb..9a2d5a5bc2 100644
--- a/settings/l10n/oc.json
+++ b/settings/l10n/oc.json
@@ -106,7 +106,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "sembla que php es pas configurat de manièra a recuperar las valors de las variablas d’environament. Lo test de la comanda getenv(\"PATH\") torna solament una responsa voida. ",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Verificatz la documentacion d'installacion a prepaus de las instruccions de configuracion de php e tanben de la configuracion de vòstre servidor, en particular dins lo cas qu'utilizatz php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "La configuracion es en mòde lectura sola. Aquò empacha la modificacion de certanas configuracions via l'interfàcia web. Amai, lo fichièr deu èsser passat manualament en lectura-escritura per cada mesa a jorn.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP es aparentament configurat per suprimir los blòts de documentacion intèrnes. Aquò rendrà mantuna aplicacion de basa inaccessiblas.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "La rason es probablament l'utilizacion d'un escondedor / accelerador tal coma Zend OPcache o eAccelerator.",
@@ -140,7 +139,6 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php es enregistrat alprèp d'un servici webcron que l'executarà a cada 15 minutas via http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Utilizatz lo servici cron del sistèma per apelar lo fichièr cron.php a cada 15 minutas.",
     "Enable server-side encryption" : "Activar lo chiframent costat servidor",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Lo chiframent es un processus amb sens unic. Un còp que lo chiframent es activat, totes los fichièrs a partir d'aqueste moment seràn chifrats sul servidor e serà pas possible de desactivar lo chiframent ulteriorament. Aquò es lo darrièr avertiment : Sètz segur que volètz activar lo chiframent?",
     "Enable encryption" : "Activar lo chiframent",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Cap de modul de chiframent es pas cargat. Mercé d'activar un modul de chiframent dins lo menú de las aplicacions.",
     "Select default encryption module:" : "Seleccionatz lo modul de chiframent per defaut :",
@@ -242,7 +240,6 @@
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperacion del senhal administrator",
     "Enter the recovery password in order to recover the users files during password change" : "Entratz lo senhal de recuperacion per recuperar los fichièrs utilizaires pendent lo cambiament de senhal",
-    "Search Users" : "Recèrca dels utilizaires",
     "Add Group" : "Apondre un grop",
     "Group" : "Grop",
     "Everyone" : "Tot lo monde",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index 1b89a64339..0af3bac7ee 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -198,7 +198,6 @@ OC.L10N.register(
     "Create" : "Utwórz",
     "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
     "Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
-    "Search Users" : "Wyszukaj użytkownika",
     "Add Group" : "Dodaj grupę",
     "Group" : "Grupa",
     "Everyone" : "Wszyscy",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index 1424924907..f5fa2bb1e8 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -196,7 +196,6 @@
     "Create" : "Utwórz",
     "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
     "Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
-    "Search Users" : "Wyszukaj użytkownika",
     "Add Group" : "Dodaj grupę",
     "Group" : "Grupa",
     "Everyone" : "Wszyscy",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 3e77c6a377..3819e70d5a 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "Servidor de Email",
     "Log" : "Registro",
-    "Server status" : "Status do servidor",
     "Tips & tricks" : "Dicas & Truques",
     "Updates" : "Atualizações",
     "Authentication error" : "Erro de autenticação",
@@ -119,19 +118,22 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "O PHP não parecem esta configurado corretamente para consultar as variáveis de ambiente do sistema. O teste com getenv(\"PATH\") só retorna uma resposta vazia.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique a documentação de instalação para as notas de configuração do PHP e a configuração do PHP do seu servidor, especialmente quando se utiliza php-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor verifique o <a target=\"_blank\" href=\"%s\">documento de instalação ↗</a> para as notas de configuração do PHP e configuração do PHP do seu servidor, especialmente quando usando PHP-FPM.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "A configuração Somente-Leitura foi habilitada. Isso impede que algumas configurações sejam definidas via a interface web. Além disso, o arquivo precisa ter permissão de escrita manual para cada atualização.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s abaixo a versão %2$s está instalado, por razões de estabilidade e desempenho, recomendamos a atualização para uma versão %1$s mais recente.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacional está desativado, isso pode levar a problemas com as condições de corrida. Ativar 'filelocking.enabled' em config.php para evitar esses problemas. Veja  a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informações.",
     "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nós sugerimos a instalação dos pacotes necessários em seu sistema para suportar um dos seguintes locais: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwrite.cli.url\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cron via CLI. Os seguintes erros técnicos têm aparecido:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacional está usando o banco de dados como bloqueio de back-end, para o melhor o desempenho é aconselhável configurar um cache de memória para bloqueio. Veja a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informação.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique os <a target=\"_blank\" href=\"%s\">guias de instalação ↗</a>, e verificar se há erros ou avisos no <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Todas as verificações passaram.",
     "Open documentation" : "Abrir documentação",
     "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
     "Allow users to share via link" : "Permitir que os usuários compartilhem por link",
@@ -154,7 +156,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "A criptografia é um processo de um caminho. Uma vez que a criptografia esteja habilitada, todos os arquivos a partir desse ponto em diante serão criptografados no servidor e não será possível desativar a criptografia em uma data posterior. Este é o aviso final: Você realmente quer ativar a criptografia?",
+    "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Encriptação do lado do servidor é um processo de uma direção. Uma vez que a criptografia está habilitada, todos os arquivos a partir desse ponto em diante serão criptografados no servidor e não será possível desativar a criptografia em uma data posterior",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Qualquer pessoa que tenha acesso privilegiado ao seu servidor ownCloud pode descriptografar os arquivos quer, interceptando pedidos ou a leitura de senhas de usuários que são armazenados em arquivos de sessão texto simples. Encriptação do lado do servidor, portanto, não protege contra os administradores mal-intencionados, mas é útil para proteger seus dados em armazenamento hospedados externamente.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependendo do módulo atual de criptografia o tamanho geral do arquivo será aumentado (por 35 %% ou mais quando se usa o módulo padrão)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Você deve regularmente fazer backup de todas as chaves de criptografia para evitar a perda de dados permanente (data/<user>/files_encryption e data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
     "Enable encryption" : "Ativar criptografia",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
     "Select default encryption module:" : "Selecione o módulo de criptografia padrão:",
@@ -181,8 +188,6 @@ OC.L10N.register(
     "More" : "Mais",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O arquivo de log é maior que 100 MB. Baixar esse arquivo requer algum tempo!",
-    "Transactional File Locking is enabled." : "Bloqueio de Arquivo Transacional está habilitado.",
-    "Transactional File Locking is disabled." : "Bloqueio de Arquivo Transacional está desabilitado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'db occ: converter-type', verifique a <a target=\"_blank\" href=\"%s\">documentação ↗</a>.",
@@ -261,7 +266,6 @@ OC.L10N.register(
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Senha do Administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
-    "Search Users" : "Pesquisar Usuários",
     "Add Group" : "Adicionar Grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 73a9cf67b5..bba1b4b584 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "Servidor de Email",
     "Log" : "Registro",
-    "Server status" : "Status do servidor",
     "Tips & tricks" : "Dicas & Truques",
     "Updates" : "Atualizações",
     "Authentication error" : "Erro de autenticação",
@@ -117,19 +116,22 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "O PHP não parecem esta configurado corretamente para consultar as variáveis de ambiente do sistema. O teste com getenv(\"PATH\") só retorna uma resposta vazia.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor, verifique a documentação de instalação para as notas de configuração do PHP e a configuração do PHP do seu servidor, especialmente quando se utiliza php-fpm.",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Por favor verifique o <a target=\"_blank\" href=\"%s\">documento de instalação ↗</a> para as notas de configuração do PHP e configuração do PHP do seu servidor, especialmente quando usando PHP-FPM.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "A configuração Somente-Leitura foi habilitada. Isso impede que algumas configurações sejam definidas via a interface web. Além disso, o arquivo precisa ter permissão de escrita manual para cada atualização.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP é, aparentemente, a configuração para retirar blocos doc inline. Isso fará com que vários aplicativos do núcleo fiquem inacessíveis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isso provavelmente é causado por uma cache/acelerador, como Zend OPcache ou eAccelerator.",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "O servidor está em execução no Microsoft Windows. Recomendamos Linux para uma excelente experiência para o usuário.",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s abaixo a versão %2$s está instalado, por razões de estabilidade e desempenho, recomendamos a atualização para uma versão %1$s mais recente.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type).",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacional está desativado, isso pode levar a problemas com as condições de corrida. Ativar 'filelocking.enabled' em config.php para evitar esses problemas. Veja  a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informações.",
     "System locale can not be set to a one which supports UTF-8." : "Localidade do sistema não pode ser definido como um que suporta UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo.",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nós sugerimos a instalação dos pacotes necessários em seu sistema para suportar um dos seguintes locais: %s.",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não estiver instalada na raiz do domínio e usa cron do sistema, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwrite.cli.url\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Não foi possível executar o cron via CLI. Os seguintes erros técnicos têm aparecido:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "Bloqueio de arquivos transacional está usando o banco de dados como bloqueio de back-end, para o melhor o desempenho é aconselhável configurar um cache de memória para bloqueio. Veja a <a target=\"_blank\" href=\"%s\">documentação ↗</a> para mais informação.",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Por favor, verifique os <a target=\"_blank\" href=\"%s\">guias de instalação ↗</a>, e verificar se há erros ou avisos no <a href=\"#log-section\">log</a>.",
+    "All checks passed." : "Todas as verificações passaram.",
     "Open documentation" : "Abrir documentação",
     "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
     "Allow users to share via link" : "Permitir que os usuários compartilhem por link",
@@ -152,7 +154,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
     "Enable server-side encryption" : "Habilitar a Criptografia do Lado do Servidor",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "A criptografia é um processo de um caminho. Uma vez que a criptografia esteja habilitada, todos os arquivos a partir desse ponto em diante serão criptografados no servidor e não será possível desativar a criptografia em uma data posterior. Este é o aviso final: Você realmente quer ativar a criptografia?",
+    "Please read carefully before activating server-side encryption: " : "Por favor, leia com atenção antes de ativar a criptografia do lado do servidor:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Encriptação do lado do servidor é um processo de uma direção. Uma vez que a criptografia está habilitada, todos os arquivos a partir desse ponto em diante serão criptografados no servidor e não será possível desativar a criptografia em uma data posterior",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "Qualquer pessoa que tenha acesso privilegiado ao seu servidor ownCloud pode descriptografar os arquivos quer, interceptando pedidos ou a leitura de senhas de usuários que são armazenados em arquivos de sessão texto simples. Encriptação do lado do servidor, portanto, não protege contra os administradores mal-intencionados, mas é útil para proteger seus dados em armazenamento hospedados externamente.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Dependendo do módulo atual de criptografia o tamanho geral do arquivo será aumentado (por 35 %% ou mais quando se usa o módulo padrão)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Você deve regularmente fazer backup de todas as chaves de criptografia para evitar a perda de dados permanente (data/<user>/files_encryption e data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Este é o aviso final: Você realmente quer ativar a criptografia?",
     "Enable encryption" : "Ativar criptografia",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Nenhum módulo de criptografia carregado, por favor, ative um módulo de criptografia no menu de aplicativos.",
     "Select default encryption module:" : "Selecione o módulo de criptografia padrão:",
@@ -179,8 +186,6 @@
     "More" : "Mais",
     "Less" : "Menos",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "O arquivo de log é maior que 100 MB. Baixar esse arquivo requer algum tempo!",
-    "Transactional File Locking is enabled." : "Bloqueio de Arquivo Transacional está habilitado.",
-    "Transactional File Locking is disabled." : "Bloqueio de Arquivo Transacional está desabilitado.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite é usada como base de dados. Para instalações maiores recomendamos mudar para um backend de banco de dados diferente.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Especialmente quando se utiliza o cliente de desktop para sincronização de arquivos o uso de SQLite é desencorajado.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'db occ: converter-type', verifique a <a target=\"_blank\" href=\"%s\">documentação ↗</a>.",
@@ -259,7 +264,6 @@
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Senha do Administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
-    "Search Users" : "Pesquisar Usuários",
     "Add Group" : "Adicionar Grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 0e40df2808..eeeb9544d2 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -1,10 +1,13 @@
 OC.L10N.register(
     "settings",
     {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
     "Security & setup warnings" : "Avisos de configuração e segurança",
     "Sharing" : "Partilha",
     "External Storage" : "Armazenamento Externo",
     "Cron" : "Cron",
+    "Email server" : "Servidor de Correio Eletrónico",
     "Log" : "Registo",
     "Tips & tricks" : "Dicas e truqes",
     "Updates" : "Atualizações",
@@ -52,6 +55,9 @@ OC.L10N.register(
     "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor, aguarde até que a mesma esteja concluída..",
     "Migration started …" : "Migração iniciada...",
     "Sending..." : "A enviar...",
+    "Official" : "Oficial",
+    "Approved" : "Aprovado",
+    "Experimental" : "Experimental",
     "All" : "Todos",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da ownCloud. Elas oferecem funcionalidade central para a ownCloud e está pronta para uma utilização na produção.",
     "Update to %s" : "Actualizar para %s",
@@ -66,6 +72,7 @@ OC.L10N.register(
     "Uninstalling ...." : "A desinstalar....",
     "Error while uninstalling app" : "Ocorreu um erro durante a desinstalação da app",
     "Uninstall" : "Desinstalar",
+    "An error occurred: {message}" : "Ocorreu um erro: {message}",
     "Select a profile picture" : "Selecione uma fotografia de perfil",
     "Very weak password" : "Palavra-passe muito fraca",
     "Weak password" : "Palavra-passe fraca",
@@ -136,6 +143,7 @@ OC.L10N.register(
     "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
+    "Enable encryption" : "Ative a encriptação",
     "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
@@ -174,6 +182,7 @@ OC.L10N.register(
     "licensed" : "licenciado",
     "Documentation:" : "Documentação:",
     "User documentation" : "Documentação de Utilizador",
+    "Admin documentation" : "Documentação do Administrador",
     "Show description …" : "Mostrar descrição ...",
     "Hide description …" : "Esconder descrição ...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicação não pode ser instalada porque as seguintes dependências não podem ser realizadas:",
@@ -233,7 +242,6 @@ OC.L10N.register(
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Palavra-passe de Administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os ficheiros dos utilizadores durante a mudança da palavra-passe",
-    "Search Users" : "Procurar Utilizadores",
     "Add Group" : "Adicionar grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index bcdcd1bdd9..46f6dc48da 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -1,8 +1,11 @@
 { "translations": {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
     "Security & setup warnings" : "Avisos de configuração e segurança",
     "Sharing" : "Partilha",
     "External Storage" : "Armazenamento Externo",
     "Cron" : "Cron",
+    "Email server" : "Servidor de Correio Eletrónico",
     "Log" : "Registo",
     "Tips & tricks" : "Dicas e truqes",
     "Updates" : "Atualizações",
@@ -50,6 +53,9 @@
     "Migration in progress. Please wait until the migration is finished" : "Migração em progresso. Por favor, aguarde até que a mesma esteja concluída..",
     "Migration started …" : "Migração iniciada...",
     "Sending..." : "A enviar...",
+    "Official" : "Oficial",
+    "Approved" : "Aprovado",
+    "Experimental" : "Experimental",
     "All" : "Todos",
     "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "As apps oficiais são desenvolvidas por e na comunidade da ownCloud. Elas oferecem funcionalidade central para a ownCloud e está pronta para uma utilização na produção.",
     "Update to %s" : "Actualizar para %s",
@@ -64,6 +70,7 @@
     "Uninstalling ...." : "A desinstalar....",
     "Error while uninstalling app" : "Ocorreu um erro durante a desinstalação da app",
     "Uninstall" : "Desinstalar",
+    "An error occurred: {message}" : "Ocorreu um erro: {message}",
     "Select a profile picture" : "Selecione uma fotografia de perfil",
     "Very weak password" : "Palavra-passe muito fraca",
     "Weak password" : "Palavra-passe fraca",
@@ -134,6 +141,7 @@
     "Execute one task with each page loaded" : "Executar uma tarefa com cada página carregada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço sistema cron para ligar o ficheiro cron.php a cada 15 minutos.",
+    "Enable encryption" : "Ative a encriptação",
     "Start migration" : "Iniciar migração",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
@@ -172,6 +180,7 @@
     "licensed" : "licenciado",
     "Documentation:" : "Documentação:",
     "User documentation" : "Documentação de Utilizador",
+    "Admin documentation" : "Documentação do Administrador",
     "Show description …" : "Mostrar descrição ...",
     "Hide description …" : "Esconder descrição ...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Esta aplicação não pode ser instalada porque as seguintes dependências não podem ser realizadas:",
@@ -231,7 +240,6 @@
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Palavra-passe de Administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os ficheiros dos utilizadores durante a mudança da palavra-passe",
-    "Search Users" : "Procurar Utilizadores",
     "Add Group" : "Adicionar grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 1aae8b2a97..4366083d5c 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -30,7 +30,9 @@ OC.L10N.register(
     "Unable to change password" : "Невозможно изменить пароль",
     "Enabled" : "Включено",
     "Not enabled" : "Не включено",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "установка и обновление приложений через магазин приложений или Объединение облачных хранилищ",
     "Federated Cloud Sharing" : "Объединение облачных хранилищ",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL использует устаревшую %s версию (%s). Пожалуйста, обновите Вашу операционную систему, иначе такие возможности, как %s не будут работать надежно.",
     "A problem occurred, please check your log files (Error: %s)" : "Возникла проблема, пожалуйста, проверьте ваши файлы журнала (Ошибка: %s)",
     "Migration Completed" : "Миграция завершена",
     "Group already exists." : "Группа уже существует.",
@@ -75,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Удаление ...",
     "Error while uninstalling app" : "Ошибка при удалении приложения",
     "Uninstall" : "Удалить",
+    "An error occurred: {message}" : "Произошла ошибка: {message}",
     "Select a profile picture" : "Выберите аватар",
     "Very weak password" : "Очень слабый пароль",
     "Weak password" : "Слабый пароль",
@@ -115,7 +118,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP был установлен неверно. Запрос getenv(\"PATH\") возвращает пустые результаты.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Пожалуйста обратитесь к документации по установке для получения заметок по настройке php, а также к настройкам php вашего сервера, особенно это касается php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса невозможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
@@ -150,7 +152,6 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
     "Enable server-side encryption" : "Включить шифрование на стороне сервера",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Шифрование это односторонний процесс. После включения шифрования все файлы будут зашифрованы на сервере, позднее его нельзя будет отключить. Это последнее предупреждение: вы действительно хотите включить шифрование?",
     "Enable encryption" : "Включить шифрование",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Модуль шифрования не загружен, пожалуйста включите модуль шифрования в меню приложений.",
     "Select default encryption module:" : "Выберите модуль шифрования по умолчанию:",
@@ -177,8 +178,6 @@ OC.L10N.register(
     "More" : "Больше",
     "Less" : "Меньше",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Лог-файл - больше 100 мб. Его скачивание может занять некоторое время!",
-    "Transactional File Locking is enabled." : "Транзакционная блокировка файлов включена.",
-    "Transactional File Locking is disabled." : "Транзакционная блокировка файлов отключена.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В качестве базы данных используется SQLite. Для больших установок мы рекомендуем переключиться на другую серверную базу данных.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Для перехода на другую базу данных используйте команду: 'occ db:convert-type' или ознакомьтесь с <a target=\"_blank\" href=\"%s\">документацией ↗</a>.",
@@ -196,6 +195,7 @@ OC.L10N.register(
     "licensed" : "Лицензировано",
     "Documentation:" : "Документация:",
     "User documentation" : "Пользовательская документация",
+    "Admin documentation" : "Документация для администратора",
     "Show description …" : "Показать описание ...",
     "Hide description …" : "Скрыть описание ...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Приложение не может быть установлено, следующие зависимости не удовлетворены:",
@@ -234,6 +234,7 @@ OC.L10N.register(
     "Upload new" : "Загрузить новый",
     "Select new from Files" : "Выберите новый из файлов",
     "Remove image" : "Удалить аватар",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Допустимые форматы: png и jpg. В идеале квадратное, но Вы сможете обрезать его. Файл не должен превышать максимальный размер в 20 МБ.",
     "Your avatar is provided by your original account." : "Будет использован аватар вашей оригинальной учетной записи.",
     "Cancel" : "Отмена",
     "Choose as profile image" : "Установить как аватар",
@@ -255,7 +256,6 @@ OC.L10N.register(
     "Create" : "Создать",
     "Admin Recovery Password" : "Восстановление пароля администратора",
     "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
-    "Search Users" : "Поиск пользователей",
     "Add Group" : "Добавить группу",
     "Group" : "Группа",
     "Everyone" : "Все",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index ef73320cbf..55a2680ed3 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -28,7 +28,9 @@
     "Unable to change password" : "Невозможно изменить пароль",
     "Enabled" : "Включено",
     "Not enabled" : "Не включено",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "установка и обновление приложений через магазин приложений или Объединение облачных хранилищ",
     "Federated Cloud Sharing" : "Объединение облачных хранилищ",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL использует устаревшую %s версию (%s). Пожалуйста, обновите Вашу операционную систему, иначе такие возможности, как %s не будут работать надежно.",
     "A problem occurred, please check your log files (Error: %s)" : "Возникла проблема, пожалуйста, проверьте ваши файлы журнала (Ошибка: %s)",
     "Migration Completed" : "Миграция завершена",
     "Group already exists." : "Группа уже существует.",
@@ -73,6 +75,7 @@
     "Uninstalling ...." : "Удаление ...",
     "Error while uninstalling app" : "Ошибка при удалении приложения",
     "Uninstall" : "Удалить",
+    "An error occurred: {message}" : "Произошла ошибка: {message}",
     "Select a profile picture" : "Выберите аватар",
     "Very weak password" : "Очень слабый пароль",
     "Weak password" : "Слабый пароль",
@@ -113,7 +116,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP был установлен неверно. Запрос getenv(\"PATH\") возвращает пустые результаты.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Пожалуйста обратитесь к документации по установке для получения заметок по настройке php, а также к настройкам php вашего сервера, особенно это касается php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Конфигурационный файл в режиме только для чтения. В связи с этим некоторые настройки веб-интерфейса невозможно изменить. Учтите, что для установки обновлений, вам потребуется самостоятельно разрешить запись в конфигурационный файл.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Очевидно, PHP настроен на вычищение блоков встроенной документации. Это сделает несколько центральных приложений недоступными.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Возможно это вызвано кешем/ускорителем вроде Zend OPcache или eAccelerator.",
@@ -148,7 +150,6 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php зарегистрирован в webcron и будет вызываться каждые 15 минут по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Использовать системный cron для вызова cron.php каждые 15 минут.",
     "Enable server-side encryption" : "Включить шифрование на стороне сервера",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Шифрование это односторонний процесс. После включения шифрования все файлы будут зашифрованы на сервере, позднее его нельзя будет отключить. Это последнее предупреждение: вы действительно хотите включить шифрование?",
     "Enable encryption" : "Включить шифрование",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Модуль шифрования не загружен, пожалуйста включите модуль шифрования в меню приложений.",
     "Select default encryption module:" : "Выберите модуль шифрования по умолчанию:",
@@ -175,8 +176,6 @@
     "More" : "Больше",
     "Less" : "Меньше",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Лог-файл - больше 100 мб. Его скачивание может занять некоторое время!",
-    "Transactional File Locking is enabled." : "Транзакционная блокировка файлов включена.",
-    "Transactional File Locking is disabled." : "Транзакционная блокировка файлов отключена.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "В качестве базы данных используется SQLite. Для больших установок мы рекомендуем переключиться на другую серверную базу данных.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Особенно вызывает сомнение использование SQLite при синхронизации файлов с использование клиента для ПК.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Для перехода на другую базу данных используйте команду: 'occ db:convert-type' или ознакомьтесь с <a target=\"_blank\" href=\"%s\">документацией ↗</a>.",
@@ -194,6 +193,7 @@
     "licensed" : "Лицензировано",
     "Documentation:" : "Документация:",
     "User documentation" : "Пользовательская документация",
+    "Admin documentation" : "Документация для администратора",
     "Show description …" : "Показать описание ...",
     "Hide description …" : "Скрыть описание ...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Приложение не может быть установлено, следующие зависимости не удовлетворены:",
@@ -232,6 +232,7 @@
     "Upload new" : "Загрузить новый",
     "Select new from Files" : "Выберите новый из файлов",
     "Remove image" : "Удалить аватар",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Допустимые форматы: png и jpg. В идеале квадратное, но Вы сможете обрезать его. Файл не должен превышать максимальный размер в 20 МБ.",
     "Your avatar is provided by your original account." : "Будет использован аватар вашей оригинальной учетной записи.",
     "Cancel" : "Отмена",
     "Choose as profile image" : "Установить как аватар",
@@ -253,7 +254,6 @@
     "Create" : "Создать",
     "Admin Recovery Password" : "Восстановление пароля администратора",
     "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
-    "Search Users" : "Поиск пользователей",
     "Add Group" : "Добавить группу",
     "Group" : "Группа",
     "Everyone" : "Все",
diff --git a/settings/l10n/sk.js b/settings/l10n/sk.js
deleted file mode 100644
index e48cc9d9ed..0000000000
--- a/settings/l10n/sk.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "settings",
-    {
-    "Delete" : "Odstrániť",
-    "never" : "nikdy",
-    "Cancel" : "Zrušiť",
-    "Other" : "Ostatné"
-},
-"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/settings/l10n/sk.json b/settings/l10n/sk.json
deleted file mode 100644
index 609a62d21f..0000000000
--- a/settings/l10n/sk.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Delete" : "Odstrániť",
-    "never" : "nikdy",
-    "Cancel" : "Zrušiť",
-    "Other" : "Ostatné"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index 67457a3021..e9dc5c5062 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -164,8 +164,6 @@ OC.L10N.register(
     "More" : "Viac",
     "Less" : "Menej",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Súbor protokolu je väčší ako 100 MB. Jeho sťahovanie môže chvíľu trvať!",
-    "Transactional File Locking is enabled." : "Transakčné zamykanie súboru je povolené.",
-    "Transactional File Locking is disabled." : "Transakčné zamykanie súboru je zakázané.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Ako databáza je použitá SQLite. Pre veľké inštalácie odporúčame prejsť na inú databázu.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Najmä pri používaní aplikácie na synchronizáciu s desktopom nie je databáza SQLite doporučená.",
     "How to do backups" : "Ako vytvárať zálohy",
@@ -241,7 +239,6 @@ OC.L10N.register(
     "Create" : "Vytvoriť",
     "Admin Recovery Password" : "Obnovenie hesla administrátora",
     "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
-    "Search Users" : "Hľadať používateľov",
     "Add Group" : "Pridať skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všetci",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index f08db3ba0a..c29355482a 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -162,8 +162,6 @@
     "More" : "Viac",
     "Less" : "Menej",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Súbor protokolu je väčší ako 100 MB. Jeho sťahovanie môže chvíľu trvať!",
-    "Transactional File Locking is enabled." : "Transakčné zamykanie súboru je povolené.",
-    "Transactional File Locking is disabled." : "Transakčné zamykanie súboru je zakázané.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Ako databáza je použitá SQLite. Pre veľké inštalácie odporúčame prejsť na inú databázu.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Najmä pri používaní aplikácie na synchronizáciu s desktopom nie je databáza SQLite doporučená.",
     "How to do backups" : "Ako vytvárať zálohy",
@@ -239,7 +237,6 @@
     "Create" : "Vytvoriť",
     "Admin Recovery Password" : "Obnovenie hesla administrátora",
     "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
-    "Search Users" : "Hľadať používateľov",
     "Add Group" : "Pridať skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všetci",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index b1ccf3058a..42678f0c83 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -227,7 +227,6 @@ OC.L10N.register(
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
     "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
-    "Search Users" : "Poišči med uporabniki",
     "Add Group" : "Dodaj skupino",
     "Group" : "Skupina",
     "Everyone" : "Vsi",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index 09dc9ad37f..4bade265da 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -225,7 +225,6 @@
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
     "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
-    "Search Users" : "Poišči med uporabniki",
     "Add Group" : "Dodaj skupino",
     "Group" : "Skupina",
     "Everyone" : "Vsi",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index 4a48261c8d..38026284af 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "SSL" : "ССЛ",
     "TLS" : "ТЛС",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ПХП није подешен да може да провери системске променљиве. Проба са getenv(\"PATH\") враћа празан одговор.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Погледајте инсталациону документацију за ПХП и серверска подешавања, посебно кад се користи php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Омогућена је Само-читај конфигурација. То спречава постављање неке конфигурације преко веб-интерфејса. Осим тога, фајлу мора бити ручно омогућено уписивање код сваког освежавања.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "ПХП је очигледно подешен да се скида уметнуте док блокова. То ће учинити неколико кључних апликација недоступним.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ово је вероватно изазвано кешом или акцелератором као што су ЗендОПкеш или еАкцелератор.",
@@ -150,7 +149,6 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php је регистрован код  вебкрон сервиса за позивање cron.php сваких 15 минута преко протокола http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Користите системски крон сервис за позивање cron.php фајла сваких 15 минута.",
     "Enable server-side encryption" : "Укључи шифровање на страни сервера",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Шифровање је једносмеран процес. Једном када се укључи, сви фајлови ће од тада бити шифровани на серверу и касније се неће моћи искључити. Ово је последње упозорење: Да ли заиста желите да укључите шифровање?",
     "Enable encryption" : "Укључи шифровање",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Шифрарски модул није учитан. Укључите га у менију апликација",
     "Select default encryption module:" : "Изаберите подразумевани шифрарски модул:",
@@ -177,8 +175,6 @@ OC.L10N.register(
     "More" : "Више",
     "Less" : "Мање",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Фајл записника је већи од 100МБ. Преузимање може потрајати!",
-    "Transactional File Locking is enabled." : "Трансакционо закључавање фајла је укључено.",
-    "Transactional File Locking is disabled." : "Трансакционо закључавање фајла је искључено.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite се користи као базе података. За веће инсталације препоручујемо да се пребаците на други модел базе података.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Нарочито ако се користи клијент програм у графичком окружењу, коришћење СКуЛајта није препоручљиво.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "За миграцију на другу базу користите командну линију: 'occ db:convert-type', или погледајте <a target=\"_blank\" href=\"%s\">документацију ↗</a>.",
@@ -256,7 +252,6 @@ OC.L10N.register(
     "Create" : "Направи",
     "Admin Recovery Password" : "Администраторска лозинка за опоравак",
     "Enter the recovery password in order to recover the users files during password change" : "Унесите лозинку за опоравак корисничких фајлова током промене лозинке",
-    "Search Users" : "Тражи кориснике",
     "Add Group" : "Додај групу",
     "Group" : "Група",
     "Everyone" : "Сви",
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index 4dc73a2df7..5206512092 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -113,7 +113,6 @@
     "SSL" : "ССЛ",
     "TLS" : "ТЛС",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ПХП није подешен да може да провери системске променљиве. Проба са getenv(\"PATH\") враћа празан одговор.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Погледајте инсталациону документацију за ПХП и серверска подешавања, посебно кад се користи php-fpm.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Омогућена је Само-читај конфигурација. То спречава постављање неке конфигурације преко веб-интерфејса. Осим тога, фајлу мора бити ручно омогућено уписивање код сваког освежавања.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "ПХП је очигледно подешен да се скида уметнуте док блокова. То ће учинити неколико кључних апликација недоступним.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Ово је вероватно изазвано кешом или акцелератором као што су ЗендОПкеш или еАкцелератор.",
@@ -148,7 +147,6 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php је регистрован код  вебкрон сервиса за позивање cron.php сваких 15 минута преко протокола http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Користите системски крон сервис за позивање cron.php фајла сваких 15 минута.",
     "Enable server-side encryption" : "Укључи шифровање на страни сервера",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Шифровање је једносмеран процес. Једном када се укључи, сви фајлови ће од тада бити шифровани на серверу и касније се неће моћи искључити. Ово је последње упозорење: Да ли заиста желите да укључите шифровање?",
     "Enable encryption" : "Укључи шифровање",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Шифрарски модул није учитан. Укључите га у менију апликација",
     "Select default encryption module:" : "Изаберите подразумевани шифрарски модул:",
@@ -175,8 +173,6 @@
     "More" : "Више",
     "Less" : "Мање",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Фајл записника је већи од 100МБ. Преузимање може потрајати!",
-    "Transactional File Locking is enabled." : "Трансакционо закључавање фајла је укључено.",
-    "Transactional File Locking is disabled." : "Трансакционо закључавање фајла је искључено.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite се користи као базе података. За веће инсталације препоручујемо да се пребаците на други модел базе података.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Нарочито ако се користи клијент програм у графичком окружењу, коришћење СКуЛајта није препоручљиво.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "За миграцију на другу базу користите командну линију: 'occ db:convert-type', или погледајте <a target=\"_blank\" href=\"%s\">документацију ↗</a>.",
@@ -254,7 +250,6 @@
     "Create" : "Направи",
     "Admin Recovery Password" : "Администраторска лозинка за опоравак",
     "Enter the recovery password in order to recover the users files during password change" : "Унесите лозинку за опоравак корисничких фајлова током промене лозинке",
-    "Search Users" : "Тражи кориснике",
     "Add Group" : "Додај групу",
     "Group" : "Група",
     "Everyone" : "Сви",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index 703add8fac..43c6bf0621 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -186,7 +186,6 @@ OC.L10N.register(
     "Create" : "Skapa",
     "Admin Recovery Password" : "Admin-återställningslösenord",
     "Enter the recovery password in order to recover the users files during password change" : "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
-    "Search Users" : "Sök användare",
     "Add Group" : "Lägg till Grupp",
     "Group" : "Grupp",
     "Everyone" : "Alla",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index c7d0a8eba4..3e61a6e965 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -184,7 +184,6 @@
     "Create" : "Skapa",
     "Admin Recovery Password" : "Admin-återställningslösenord",
     "Enter the recovery password in order to recover the users files during password change" : "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
-    "Search Users" : "Sök användare",
     "Add Group" : "Lägg till Grupp",
     "Group" : "Grupp",
     "Everyone" : "Alla",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index 7eef1519b8..62f0164c78 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -10,7 +10,6 @@ OC.L10N.register(
     "Cron" : "Cron",
     "Email server" : "อีเมลเซิร์ฟเวอร์",
     "Log" : "บันทึกการเปลี่ยนแปลง",
-    "Server status" : "สถานะเซิฟเวอร์",
     "Tips & tricks" : "เคล็ดลับและเทคนิค",
     "Updates" : "อัพเดท",
     "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
@@ -104,7 +103,7 @@ OC.L10N.register(
     "A valid password must be provided" : "จะต้องระบุรหัสผ่านที่ถูกต้อง",
     "A valid email must be provided" : "จะต้องระบุอีเมลที่ถูกต้อง",
     "__language_name__" : "ภาษาไทย - Thai languages",
-    "Sync clients" : "ผสานข้อมูลของไคลเอนต์",
+    "Sync clients" : "ประสานข้อมูลไคลเอนต์",
     "Personal info" : "ข้อมูลส่วนบุคคล",
     "SSL root certificates" : "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
     "Everything (fatal issues, errors, warnings, info, debug)" : "ทุกอย่าง (ปัญหาร้ายแรง ข้อผิดพลาด คำเตือน ข้อมูล การแก้ปัญหา)",
@@ -119,19 +118,22 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ไม่ได้ติดตั้งphp อย่างถูกต้องค้นหาตัวแปรสภาพแวดล้อมของระบบการทดสอบกับ getenv(\"PATH\") ส่งกลับเฉพาะการตอบสนองที่ว่างเปล่า",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "กรุณาตรวจสอบเอกสารการติดตั้งสำหรับการบันทึกการตั้งค่าและการกำหนดค่า PHP ของเซิร์ฟเวอร์ของคุณโดยเฉพาะอย่างยิ่งเมื่อใช้ PHP-FPM",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "กรุณาตรวจสอบ <a target=\"_blank\" href=\"%s\">เอกสารการติดตั้ง</a> สำหรับการตั้งค่าและบันทึก php ของเซิร์ฟเวอร์ของคุณโดยเฉพาะอย่างยิ่งเมื่อใช้ php-fpm",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "ตั้งค่าให้สามารถอ่านได้อย่างเดียวถูกเปิดใช้งาน นี้จะช่วยป้องกันการตั้งค่าผ่านทางบางเว็บอินเตอร์เฟซ นอกจากนี้จะต้องเขียนไฟล์ด้วยตนเองสำหรับทุกการอัพเดท",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "เห็นได้ชัดว่าการตั้งค่า PHP จะตัดบล็อคเอกสารแบบอินไลน์ ซึ่งจะทำให้แอพพลิเคชันอีกหลายแกนไม่สามารถเข้าถึงได้",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "นี้อาจเกิดจาก cache/accelerator อย่างเช่น Zend OPcache หรือ eAccelerator",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "เซิร์ฟเวอร์ของคุณทำงานบน Microsoft Windows เราขอแนะนำให้ใช้ลินุกซ์หากคุณต้องการ การใช้งานที่ดีที่สุด",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s รุ่นเก่ากว่า %2$s ที่มีการติดตั้ง สำหรับเหตุผลเรื่องเสถียรภาพและประสิทธิภาพการทำงาน เราแนะนำให้อัพเดทเป็นรุ่น %1$s",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "โมดูล PHP 'fileinfo' หายไป เราขอแนะนำให้เปิดใช้งานโมดูลนี้เพื่อให้ได้ผลลัพธ์ที่ดีที่สุดกับการตรวจสอบชนิด mime",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "การทำธุรกรรมล็อคไฟล์ถูกปิดใช้งาน มันอาจเป็นปัญหา ให้เปิดใช้งาน 'filelocking.enabled' ใน config.php เพื่อหลีกเลี่ยงปัญหาเหล่านี้ ดูเพิ่มเติมได้จาก <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
     "System locale can not be set to a one which supports UTF-8." : "ตำแหน่งที่ตั้งของระบบไม่สามารถตั้งค่าให้รองรับ UTF-8",
     "This means that there might be problems with certain characters in file names." : "นี้หมายความว่าอาจจะมีปัญหากับตัวอักษรบางตัวในชื่อไฟล์",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "เราขอแนะนำให้ติดตั้งแพคเกจที่จำเป็นต้องใช้ในระบบของคุณ ให้การสนับสนุนตำแหน่งที่ตั้งดังต่อไปนี้: %s",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "หากการติดตั้งของคุณไม่ได้ติดตั้งในรากของโดเมนและใช้ระบบ cron อาจมีปัญหาเกี่ยวกับการสร้าง URL เพื่อหลีกเลี่ยงปัญหาเหล่านี้โปรดไปตั้งค่า \"overwrite.cli.url\" ในไฟล์ config.php ของคุณไปยังเส้นทาง webroot ของการติดตั้งของคุณ (แนะนำ: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "มันเป็นไปไม่ได้ที่จะดำเนินการ cronjob ผ่านทาง CLI ข้อผิดพลาดทางเทคนิคต่อไปนี้จะปรากฏ:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "การทำธุรกรรมล็อคไฟล์จะใช้ฐานข้อมูลเป็นล็อคแบ็กเอนด์ สำหรับประสิทธิภาพที่ดีที่สุดก็ควรที่จะกำหนดค่า memcache สำหรับล็อค ดูเพิ่มเติมได้จาก <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "กรุณาตรวจสอบ <a target=\"_blank\" href=\"%s\">คู่มือการติดตั้ง</a> และตรวจสอบข้อผิดพลาดหรือคำเตือนใน <a href=\"#log-section\">บันทึก</a>",
+    "All checks passed." : "ผ่านการตรวจสอบทั้งหมด",
     "Open documentation" : "เปิดเอกสาร",
     "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
     "Allow users to share via link" : "อนุญาตให้ผู้ใช้สามารถแชร์ผ่านทางลิงค์",
@@ -154,7 +156,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php มีการลงทะเบียนให้บริการ Webcron เรียก cron.php ทุกๆ 15 นาที บน Http",
     "Use system's cron service to call the cron.php file every 15 minutes." : "บริการ cron ของระบบจะเรียกไฟล์ cron.php ทุกq 15 นาที",
     "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "การเข้ารหัสเป็นกระบวนการหนึ่ง เมื่อมีการเปิดใช้การเข้ารหัส ไฟล์ทั้งหมดจะถูกเข้ารหัสบนเซิร์ฟเวอร์และมันจะไม่เป็นไปได้ที่จะปิดการใช้งานการเข้ารหัสในภายหลัง นี้เป็นคำเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
+    "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "การเข้ารหัสฝั่งเซิร์ฟเวอร์เป็นกระบวนการหนึ่ง เมื่อมีการเปิดใช้การเข้ารหัสไฟล์ทั้งหมดและมันจะเป็นไปไม่ได้ที่จะปิดการใช้งานการเข้ารหัสในภายหลัง",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ทุกคนที่มีสิทธิในการเข้าถึงเซิร์ฟเวอร์ ownCloud คุณสามารถถอดรหัสไฟล์ของคุณโดยการสกัดกั้นการร้องขอหรือการอ่านรหัสผ่านของผู้ใช้ซึ่งจะถูกเก็บไว้ในเซสชั่นไฟล์ข้อความธรรมดา การเข้ารหัสฝั่งเซิร์ฟเวอร์จึงไม่ได้ป้องกันผู้ดูแลระบบที่เป็นอันตราย แต่จะเป็นประโยชน์สำหรับการปกป้องข้อมูลของคุณในการจัดเก็บข้อมูลจากภายนอก",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "ทั้งนี้ขึ้นอยู่กับโมดูลการเข้ารหัสที่เกิดขึ้นจริงขนาดไฟล์ทั่วไปจะเพิ่มขึ้น (35%% หรือมากกว่าเมื่อใช้โมดูลเริ่มต้น)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "คุณควรสำรองข้อมูลคีย์การเข้ารหัสอย่างสม่ำเสมอ เพื่อป้องกันการสูญเสียข้อมูลอย่างถาวร (data/<user>/files_encryption และ data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
     "Select default encryption module:" : "เลือกค่าเริ่มต้นโมดูลการเข้ารหัส:",
@@ -181,10 +188,8 @@ OC.L10N.register(
     "More" : "มาก",
     "Less" : "น้อย",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ไฟล์บันทึกมีขนาดใหญ่กว่า 100 เมกะไบต์ มันอาจจะใช้เวลาดาวน์โหลดนาน!",
-    "Transactional File Locking is enabled." : "เปิดใช้งานล็อคไฟล์ขณะทำธุรกรรม",
-    "Transactional File Locking is disabled." : "ปิดใช้งานล็อคไฟล์ขณะทำธุรกรรม",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "จะใช้ SQLite เป็นฐานข้อมูล สำหรับการติดตั้งขนาดใหญ่เราขอแนะนำเพื่อสลับไปยังฐานข้อมูลแบ็กเอนด์ที่แตกต่างกัน",
-    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการผสานข้อมูลโดย SQLite",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการประสานข้อมูลโดย SQLite",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "การโยกย้ายไปยังฐานข้อมูลอื่นใช้เครื่องมือบรรทัดคำสั่ง: 'occ db:convert-type' หรือดูที่ <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
     "How to do backups" : "วิธีการสำรองข้อมูล",
     "Advanced monitoring" : "การตรวจสอบขั้นสูง",
@@ -216,7 +221,7 @@ OC.L10N.register(
     "Forum" : "ฟอรั่ม",
     "Issue tracker" : "ติดตามปัญหา",
     "Commercial support" : "สนับสนุนเชิงพาณิชย์",
-    "Get the apps to sync your files" : "ใช้แอพพลิเคชันในการผสานไฟล์ของคุณ",
+    "Get the apps to sync your files" : "ใช้แอพพลิเคชันในการประสานไฟล์ของคุณ",
     "Desktop client" : "เดสก์ทอปผู้ใช้",
     "Android app" : "แอพฯ แอนดรอยด์",
     "iOS app" : "แอพฯ IOS",
@@ -261,7 +266,6 @@ OC.L10N.register(
     "Create" : "สร้าง",
     "Admin Recovery Password" : "กู้คืนรหัสผ่านดูแลระบบ",
     "Enter the recovery password in order to recover the users files during password change" : "ป้อนรหัสผ่านการกู้คืนเพื่อกู้คืนไฟล์ผู้ใช้ในช่วงการเปลี่ยนรหัสผ่าน",
-    "Search Users" : "ค้นหาผู้ใช้",
     "Add Group" : "เพิ่มกลุ่ม",
     "Group" : "กลุ่ม",
     "Everyone" : "ทุกคน",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index 8659b55d52..92670ee82d 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -8,7 +8,6 @@
     "Cron" : "Cron",
     "Email server" : "อีเมลเซิร์ฟเวอร์",
     "Log" : "บันทึกการเปลี่ยนแปลง",
-    "Server status" : "สถานะเซิฟเวอร์",
     "Tips & tricks" : "เคล็ดลับและเทคนิค",
     "Updates" : "อัพเดท",
     "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
@@ -102,7 +101,7 @@
     "A valid password must be provided" : "จะต้องระบุรหัสผ่านที่ถูกต้อง",
     "A valid email must be provided" : "จะต้องระบุอีเมลที่ถูกต้อง",
     "__language_name__" : "ภาษาไทย - Thai languages",
-    "Sync clients" : "ผสานข้อมูลของไคลเอนต์",
+    "Sync clients" : "ประสานข้อมูลไคลเอนต์",
     "Personal info" : "ข้อมูลส่วนบุคคล",
     "SSL root certificates" : "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
     "Everything (fatal issues, errors, warnings, info, debug)" : "ทุกอย่าง (ปัญหาร้ายแรง ข้อผิดพลาด คำเตือน ข้อมูล การแก้ปัญหา)",
@@ -117,19 +116,22 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "ไม่ได้ติดตั้งphp อย่างถูกต้องค้นหาตัวแปรสภาพแวดล้อมของระบบการทดสอบกับ getenv(\"PATH\") ส่งกลับเฉพาะการตอบสนองที่ว่างเปล่า",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "กรุณาตรวจสอบเอกสารการติดตั้งสำหรับการบันทึกการตั้งค่าและการกำหนดค่า PHP ของเซิร์ฟเวอร์ของคุณโดยเฉพาะอย่างยิ่งเมื่อใช้ PHP-FPM",
+    "Please check the <a target=\"_blank\" href=\"%s\">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm." : "กรุณาตรวจสอบ <a target=\"_blank\" href=\"%s\">เอกสารการติดตั้ง</a> สำหรับการตั้งค่าและบันทึก php ของเซิร์ฟเวอร์ของคุณโดยเฉพาะอย่างยิ่งเมื่อใช้ php-fpm",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "ตั้งค่าให้สามารถอ่านได้อย่างเดียวถูกเปิดใช้งาน นี้จะช่วยป้องกันการตั้งค่าผ่านทางบางเว็บอินเตอร์เฟซ นอกจากนี้จะต้องเขียนไฟล์ด้วยตนเองสำหรับทุกการอัพเดท",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "เห็นได้ชัดว่าการตั้งค่า PHP จะตัดบล็อคเอกสารแบบอินไลน์ ซึ่งจะทำให้แอพพลิเคชันอีกหลายแกนไม่สามารถเข้าถึงได้",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "นี้อาจเกิดจาก cache/accelerator อย่างเช่น Zend OPcache หรือ eAccelerator",
     "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "เซิร์ฟเวอร์ของคุณทำงานบน Microsoft Windows เราขอแนะนำให้ใช้ลินุกซ์หากคุณต้องการ การใช้งานที่ดีที่สุด",
     "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s รุ่นเก่ากว่า %2$s ที่มีการติดตั้ง สำหรับเหตุผลเรื่องเสถียรภาพและประสิทธิภาพการทำงาน เราแนะนำให้อัพเดทเป็นรุ่น %1$s",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "โมดูล PHP 'fileinfo' หายไป เราขอแนะนำให้เปิดใช้งานโมดูลนี้เพื่อให้ได้ผลลัพธ์ที่ดีที่สุดกับการตรวจสอบชนิด mime",
+    "Transactional file locking is disabled, this might lead to issues with race conditions. Enable 'filelocking.enabled' in config.php to avoid these problems. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "การทำธุรกรรมล็อคไฟล์ถูกปิดใช้งาน มันอาจเป็นปัญหา ให้เปิดใช้งาน 'filelocking.enabled' ใน config.php เพื่อหลีกเลี่ยงปัญหาเหล่านี้ ดูเพิ่มเติมได้จาก <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
     "System locale can not be set to a one which supports UTF-8." : "ตำแหน่งที่ตั้งของระบบไม่สามารถตั้งค่าให้รองรับ UTF-8",
     "This means that there might be problems with certain characters in file names." : "นี้หมายความว่าอาจจะมีปัญหากับตัวอักษรบางตัวในชื่อไฟล์",
     "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "เราขอแนะนำให้ติดตั้งแพคเกจที่จำเป็นต้องใช้ในระบบของคุณ ให้การสนับสนุนตำแหน่งที่ตั้งดังต่อไปนี้: %s",
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "หากการติดตั้งของคุณไม่ได้ติดตั้งในรากของโดเมนและใช้ระบบ cron อาจมีปัญหาเกี่ยวกับการสร้าง URL เพื่อหลีกเลี่ยงปัญหาเหล่านี้โปรดไปตั้งค่า \"overwrite.cli.url\" ในไฟล์ config.php ของคุณไปยังเส้นทาง webroot ของการติดตั้งของคุณ (แนะนำ: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "มันเป็นไปไม่ได้ที่จะดำเนินการ cronjob ผ่านทาง CLI ข้อผิดพลาดทางเทคนิคต่อไปนี้จะปรากฏ:",
+    "Transactional file locking is using the database as locking backend, for best performance it's advised to configure a memcache for locking. See the <a target=\"_blank\" href=\"%s\">documentation ↗</a> for more information." : "การทำธุรกรรมล็อคไฟล์จะใช้ฐานข้อมูลเป็นล็อคแบ็กเอนด์ สำหรับประสิทธิภาพที่ดีที่สุดก็ควรที่จะกำหนดค่า memcache สำหรับล็อค ดูเพิ่มเติมได้จาก <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "กรุณาตรวจสอบ <a target=\"_blank\" href=\"%s\">คู่มือการติดตั้ง</a> และตรวจสอบข้อผิดพลาดหรือคำเตือนใน <a href=\"#log-section\">บันทึก</a>",
+    "All checks passed." : "ผ่านการตรวจสอบทั้งหมด",
     "Open documentation" : "เปิดเอกสาร",
     "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
     "Allow users to share via link" : "อนุญาตให้ผู้ใช้สามารถแชร์ผ่านทางลิงค์",
@@ -152,7 +154,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php มีการลงทะเบียนให้บริการ Webcron เรียก cron.php ทุกๆ 15 นาที บน Http",
     "Use system's cron service to call the cron.php file every 15 minutes." : "บริการ cron ของระบบจะเรียกไฟล์ cron.php ทุกq 15 นาที",
     "Enable server-side encryption" : "เปิดการใช้งานเข้ารหัสฝั่งเซิร์ฟเวอร์",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "การเข้ารหัสเป็นกระบวนการหนึ่ง เมื่อมีการเปิดใช้การเข้ารหัส ไฟล์ทั้งหมดจะถูกเข้ารหัสบนเซิร์ฟเวอร์และมันจะไม่เป็นไปได้ที่จะปิดการใช้งานการเข้ารหัสในภายหลัง นี้เป็นคำเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
+    "Please read carefully before activating server-side encryption: " : "กรุณาอ่านอย่างละเอียดก่อนที่จะเปิดใช้งานการเข้ารหัสฝั่งเซิร์ฟเวอร์:",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "การเข้ารหัสฝั่งเซิร์ฟเวอร์เป็นกระบวนการหนึ่ง เมื่อมีการเปิดใช้การเข้ารหัสไฟล์ทั้งหมดและมันจะเป็นไปไม่ได้ที่จะปิดการใช้งานการเข้ารหัสในภายหลัง",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ทุกคนที่มีสิทธิในการเข้าถึงเซิร์ฟเวอร์ ownCloud คุณสามารถถอดรหัสไฟล์ของคุณโดยการสกัดกั้นการร้องขอหรือการอ่านรหัสผ่านของผู้ใช้ซึ่งจะถูกเก็บไว้ในเซสชั่นไฟล์ข้อความธรรมดา การเข้ารหัสฝั่งเซิร์ฟเวอร์จึงไม่ได้ป้องกันผู้ดูแลระบบที่เป็นอันตราย แต่จะเป็นประโยชน์สำหรับการปกป้องข้อมูลของคุณในการจัดเก็บข้อมูลจากภายนอก",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "ทั้งนี้ขึ้นอยู่กับโมดูลการเข้ารหัสที่เกิดขึ้นจริงขนาดไฟล์ทั่วไปจะเพิ่มขึ้น (35%% หรือมากกว่าเมื่อใช้โมดูลเริ่มต้น)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "คุณควรสำรองข้อมูลคีย์การเข้ารหัสอย่างสม่ำเสมอ เพื่อป้องกันการสูญเสียข้อมูลอย่างถาวร (data/<user>/files_encryption และ data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "นี่คือการเตือนครั้งสุดท้าย: คุณต้องการที่จะเปิดใช้การเข้ารหัส?",
     "Enable encryption" : "เปิดใช้งานการเข้ารหัส",
     "No encryption module loaded, please enable an encryption module in the app menu." : "ไม่มีโมดูลการเข้ารหัสโหลดโปรดเปิดใช้งานโมดูลการเข้ารหัสในเมนูแอพฯ",
     "Select default encryption module:" : "เลือกค่าเริ่มต้นโมดูลการเข้ารหัส:",
@@ -179,10 +186,8 @@
     "More" : "มาก",
     "Less" : "น้อย",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "ไฟล์บันทึกมีขนาดใหญ่กว่า 100 เมกะไบต์ มันอาจจะใช้เวลาดาวน์โหลดนาน!",
-    "Transactional File Locking is enabled." : "เปิดใช้งานล็อคไฟล์ขณะทำธุรกรรม",
-    "Transactional File Locking is disabled." : "ปิดใช้งานล็อคไฟล์ขณะทำธุรกรรม",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "จะใช้ SQLite เป็นฐานข้อมูล สำหรับการติดตั้งขนาดใหญ่เราขอแนะนำเพื่อสลับไปยังฐานข้อมูลแบ็กเอนด์ที่แตกต่างกัน",
-    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการผสานข้อมูลโดย SQLite",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "โดยเฉพาะอย่างยิ่งเมื่อใช้ไคลเอนต์เดสก์ทอปสำหรับการประสานข้อมูลโดย SQLite",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "การโยกย้ายไปยังฐานข้อมูลอื่นใช้เครื่องมือบรรทัดคำสั่ง: 'occ db:convert-type' หรือดูที่ <a target=\"_blank\" href=\"%s\">เอกสาร</a>",
     "How to do backups" : "วิธีการสำรองข้อมูล",
     "Advanced monitoring" : "การตรวจสอบขั้นสูง",
@@ -214,7 +219,7 @@
     "Forum" : "ฟอรั่ม",
     "Issue tracker" : "ติดตามปัญหา",
     "Commercial support" : "สนับสนุนเชิงพาณิชย์",
-    "Get the apps to sync your files" : "ใช้แอพพลิเคชันในการผสานไฟล์ของคุณ",
+    "Get the apps to sync your files" : "ใช้แอพพลิเคชันในการประสานไฟล์ของคุณ",
     "Desktop client" : "เดสก์ทอปผู้ใช้",
     "Android app" : "แอพฯ แอนดรอยด์",
     "iOS app" : "แอพฯ IOS",
@@ -259,7 +264,6 @@
     "Create" : "สร้าง",
     "Admin Recovery Password" : "กู้คืนรหัสผ่านดูแลระบบ",
     "Enter the recovery password in order to recover the users files during password change" : "ป้อนรหัสผ่านการกู้คืนเพื่อกู้คืนไฟล์ผู้ใช้ในช่วงการเปลี่ยนรหัสผ่าน",
-    "Search Users" : "ค้นหาผู้ใช้",
     "Add Group" : "เพิ่มกลุ่ม",
     "Group" : "กลุ่ม",
     "Everyone" : "ทุกคน",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index a6afbd1f65..13d5ac9687 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -30,7 +30,9 @@ OC.L10N.register(
     "Unable to change password" : "Parola değiştirilemiyor",
     "Enabled" : "Etkin",
     "Not enabled" : "Etkin değil",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "uygulama mağazası ve Birleşmiş Bulut Paylaşımından uygulama kurma ve güncelleme",
     "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL eskide kalmış bir sürüm %s kullanıyor (%s). Lütfen işletim sisteminizi güncelleyin yoksa %s gibi özellikler düzgün çalışmayacaktır.",
     "A problem occurred, please check your log files (Error: %s)" : "Bir problem oluştu, lütfen log dosyalarını kontrol edin (Hata: %s)",
     "Migration Completed" : "Taşınma Tamamlandı",
     "Group already exists." : "Grup zaten mevcut.",
@@ -75,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "Kaldırılıyor ....",
     "Error while uninstalling app" : "Uygulama kaldırılırken hata",
     "Uninstall" : "Kaldır",
+    "An error occurred: {message}" : "Bir hata oluştu: {message}",
     "Select a profile picture" : "Bir profil fotoğrafı seçin",
     "Very weak password" : "Çok güçsüz parola",
     "Weak password" : "Güçsüz parola",
@@ -115,7 +118,6 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP sistem değişkenleri sorgusuna uygun olarak ayarlanmamış görünüyor. getenv(\"PATH\") komutu sadece boş bir cevap döndürüyor.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lütfen kurulum belgelendirmesindeki php ayarlama notlarını ve sunucudaki özellikle php-fpm kullanırken php ayarlamalarını kontrol edin.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Salt Okunur yapılandırma etkinleştirilmiş. Bu, bazı ayarların web arayüzü ile yapılandırılmasını önler. Ayrıca, bu dosya her güncelleme sırasında el ile yazılabilir yapılmalıdır.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
@@ -128,6 +130,7 @@ OC.L10N.register(
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum rehberlerini ↗</a> iki kez denetleyip <a href=\"#log-section\">günlük</a> içerisindeki hata ve uyarılara bakın.",
+    "All checks passed." : "Tüm kontroller geçildi.",
     "Open documentation" : "Belgelendirmeyi aç",
     "Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
     "Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
@@ -150,7 +153,12 @@ OC.L10N.register(
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
     "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Şifreleme tek yönlü bir işlemdir. Şifrele etkinleştirildiğinde, yönlendirilen tüm dosyalar sunucuda şifrelenecek ve daha sonra şifrelemenin kaldırılması mümkün olmayacaktır. Bu son uyarı: Gerçekten şifrelemeyi etkinleştirmek istiyor musunuz?",
+    "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Sunucu tarafında şifreleme tek yönlü bir işlemdir. Bir defa etkinleştirildiğinde sunucudaki tüm dosyalar şifrelenir ve ileri bir tarihte şifrelemeyi iptal etmek mümkün değildir",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud sunucunuza erişimi olan biri isteklere müdahale ederek veya oturum dosyalarında düz metin olarak saklanan parolayı kullanarak dosyalarınızın şifrelenmesini çözebilir. Bu nedenle sunucu tarafında şifreleme işlemi kötü niyetli sistem yöneticisine karşı koruma sağlamaz ama verinizi harici depolamada tutmanız durumunda yararlıdır.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Gerçek şifreleme modülüne bağlı olarak genel dosya boyutu artar (35%% veya varsayılan modül kullanıldığında daha fazla)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Veri kaybının önüne geçmek için düzenli olarak tüm şifreleme anahtarlarınızı yedeklemelisiniz (data/<user>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
     "Enable encryption" : "Şifrelemeyi aç",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
     "Select default encryption module:" : "Öntanımlı şifreleme modülünü seçin:",
@@ -177,8 +185,6 @@ OC.L10N.register(
     "More" : "Daha fazla",
     "Less" : "Daha az",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!",
-    "Transactional File Locking is enabled." : "İşlemsel Dosya Kilidi etkin.",
-    "Transactional File Locking is disabled." : "İşlemsel Dosya Kilidi devre dışı.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için farklı bir veritabanı arka ucuna geçmenizi öneriyoruz.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Başka bir veritabanına geçmek için komut satırı aracını kullanın: 'occ db:convert-type' veya <a target=\"_blank\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
@@ -196,6 +202,7 @@ OC.L10N.register(
     "licensed" : "lisanslı",
     "Documentation:" : "Belgelendirme:",
     "User documentation" : "Kullanıcı belgelendirmesi",
+    "Admin documentation" : "Yönetici belgelendirmesi",
     "Show description …" : "Açıklamayı göster...",
     "Hide description …" : "Açıklamayı gizle...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu uygulama, aşağıdaki bağımlılıklar sağlanmadığından yüklenemiyor:",
@@ -234,6 +241,7 @@ OC.L10N.register(
     "Upload new" : "Yeni yükle",
     "Select new from Files" : "Dosyalardan seç",
     "Remove image" : "Resmi kaldır",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Png veya jpg'den biri olmalıdır. İdeal olanı karedir ama kırpmanıza izin verilecektir. Dosya boyutu 20MB'ı geçemez.",
     "Your avatar is provided by your original account." : "Görüntü resminiz, özgün hesabınız tarafından sağlanıyor.",
     "Cancel" : "İptal",
     "Choose as profile image" : "Profil resmi olarak seç",
@@ -255,7 +263,6 @@ OC.L10N.register(
     "Create" : "Oluştur",
     "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
     "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
-    "Search Users" : "Kullanıcı Ara",
     "Add Group" : "Grup Ekle",
     "Group" : "Grup",
     "Everyone" : "Herkes",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 79923ef74f..a995fcdc92 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -28,7 +28,9 @@
     "Unable to change password" : "Parola değiştirilemiyor",
     "Enabled" : "Etkin",
     "Not enabled" : "Etkin değil",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "uygulama mağazası ve Birleşmiş Bulut Paylaşımından uygulama kurma ve güncelleme",
     "Federated Cloud Sharing" : "Birleşmiş Bulut Paylaşımı",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL eskide kalmış bir sürüm %s kullanıyor (%s). Lütfen işletim sisteminizi güncelleyin yoksa %s gibi özellikler düzgün çalışmayacaktır.",
     "A problem occurred, please check your log files (Error: %s)" : "Bir problem oluştu, lütfen log dosyalarını kontrol edin (Hata: %s)",
     "Migration Completed" : "Taşınma Tamamlandı",
     "Group already exists." : "Grup zaten mevcut.",
@@ -73,6 +75,7 @@
     "Uninstalling ...." : "Kaldırılıyor ....",
     "Error while uninstalling app" : "Uygulama kaldırılırken hata",
     "Uninstall" : "Kaldır",
+    "An error occurred: {message}" : "Bir hata oluştu: {message}",
     "Select a profile picture" : "Bir profil fotoğrafı seçin",
     "Very weak password" : "Çok güçsüz parola",
     "Weak password" : "Güçsüz parola",
@@ -113,7 +116,6 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP sistem değişkenleri sorgusuna uygun olarak ayarlanmamış görünüyor. getenv(\"PATH\") komutu sadece boş bir cevap döndürüyor.",
-    "Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm." : "Lütfen kurulum belgelendirmesindeki php ayarlama notlarını ve sunucudaki özellikle php-fpm kullanırken php ayarlamalarını kontrol edin.",
     "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "Salt Okunur yapılandırma etkinleştirilmiş. Bu, bazı ayarların web arayüzü ile yapılandırılmasını önler. Ayrıca, bu dosya her güncelleme sırasında el ile yazılabilir yapılmalıdır.",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP satırıçi doc bloklarını ayıklamak üzere yapılandırılmış gibi görünüyor. Bu, bazı çekirdek (core) uygulamalarını erişilemez yapacak.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Bu, muhtemelen Zend OPcache veya eAccelerator gibi bir önbellek/hızlandırıcı nedeniyle gerçekleşir.",
@@ -126,6 +128,7 @@
     "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Eğer kurulumunuz alan adının köküne yapılmamışsa ve sistem cron'u kullanıyorsa, URL oluşturma ile ilgili sorunlar oluşabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwrite.cli.url\" seçeneğini ayarlayın (Önerilen: \"%s\")",
     "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "Bu CLI ile cronjobı çalıştırmak mümkün değildi. Aşağıdaki teknik hatalar ortaya çıkmıştır:",
     "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "Lütfen <a target=\"_blank\" href=\"%s\">kurulum rehberlerini ↗</a> iki kez denetleyip <a href=\"#log-section\">günlük</a> içerisindeki hata ve uyarılara bakın.",
+    "All checks passed." : "Tüm kontroller geçildi.",
     "Open documentation" : "Belgelendirmeyi aç",
     "Allow apps to use the Share API" : "Uygulamaların paylaşım API'sini kullanmasına izin ver",
     "Allow users to share via link" : "Kullanıcıların bağlantı ile paylaşmasına izin ver",
@@ -148,7 +151,12 @@
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
     "Enable server-side encryption" : "Sunucu taraflı şifrelemeyi aç",
-    "Encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date. This is the final warning: Do you really want to enable encryption?" : "Şifreleme tek yönlü bir işlemdir. Şifrele etkinleştirildiğinde, yönlendirilen tüm dosyalar sunucuda şifrelenecek ve daha sonra şifrelemenin kaldırılması mümkün olmayacaktır. Bu son uyarı: Gerçekten şifrelemeyi etkinleştirmek istiyor musunuz?",
+    "Please read carefully before activating server-side encryption: " : "Lütfen sunucu tarafında şifrelemeyi etkinleştirmeden önce dikkatlice okuyun: ",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "Sunucu tarafında şifreleme tek yönlü bir işlemdir. Bir defa etkinleştirildiğinde sunucudaki tüm dosyalar şifrelenir ve ileri bir tarihte şifrelemeyi iptal etmek mümkün değildir",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "ownCloud sunucunuza erişimi olan biri isteklere müdahale ederek veya oturum dosyalarında düz metin olarak saklanan parolayı kullanarak dosyalarınızın şifrelenmesini çözebilir. Bu nedenle sunucu tarafında şifreleme işlemi kötü niyetli sistem yöneticisine karşı koruma sağlamaz ama verinizi harici depolamada tutmanız durumunda yararlıdır.",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "Gerçek şifreleme modülüne bağlı olarak genel dosya boyutu artar (35%% veya varsayılan modül kullanıldığında daha fazla)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "Veri kaybının önüne geçmek için düzenli olarak tüm şifreleme anahtarlarınızı yedeklemelisiniz (data/<user>/files_encryption and data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "Bu son uyarıdır: Şifrelemeyi etkinleştirmek istiyor musunuz?",
     "Enable encryption" : "Şifrelemeyi aç",
     "No encryption module loaded, please enable an encryption module in the app menu." : "Hiç şifrelenme modülü yüklenmemiş, lütfen uygulama menüsünden bir şifreleme modülü etkinleştirin.",
     "Select default encryption module:" : "Öntanımlı şifreleme modülünü seçin:",
@@ -175,8 +183,6 @@
     "More" : "Daha fazla",
     "Less" : "Daha az",
     "The logfile is bigger than 100 MB. Downloading it may take some time!" : "Günlük dosyası 100 MB'dan daha büyük. İndirmek zaman alabilir!",
-    "Transactional File Locking is enabled." : "İşlemsel Dosya Kilidi etkin.",
-    "Transactional File Locking is disabled." : "İşlemsel Dosya Kilidi devre dışı.",
     "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için farklı bir veritabanı arka ucuna geçmenizi öneriyoruz.",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Özellikle dosya eşitleme için masaüstü istemcisi kullanılırken SQLite kullanımı önerilmez.",
     "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "Başka bir veritabanına geçmek için komut satırı aracını kullanın: 'occ db:convert-type' veya <a target=\"_blank\" href=\"%s\">belgelendirmeye ↗</a> bakın.",
@@ -194,6 +200,7 @@
     "licensed" : "lisanslı",
     "Documentation:" : "Belgelendirme:",
     "User documentation" : "Kullanıcı belgelendirmesi",
+    "Admin documentation" : "Yönetici belgelendirmesi",
     "Show description …" : "Açıklamayı göster...",
     "Hide description …" : "Açıklamayı gizle...",
     "This app cannot be installed because the following dependencies are not fulfilled:" : "Bu uygulama, aşağıdaki bağımlılıklar sağlanmadığından yüklenemiyor:",
@@ -232,6 +239,7 @@
     "Upload new" : "Yeni yükle",
     "Select new from Files" : "Dosyalardan seç",
     "Remove image" : "Resmi kaldır",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "Png veya jpg'den biri olmalıdır. İdeal olanı karedir ama kırpmanıza izin verilecektir. Dosya boyutu 20MB'ı geçemez.",
     "Your avatar is provided by your original account." : "Görüntü resminiz, özgün hesabınız tarafından sağlanıyor.",
     "Cancel" : "İptal",
     "Choose as profile image" : "Profil resmi olarak seç",
@@ -253,7 +261,6 @@
     "Create" : "Oluştur",
     "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
     "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
-    "Search Users" : "Kullanıcı Ara",
     "Add Group" : "Grup Ekle",
     "Group" : "Grup",
     "Everyone" : "Herkes",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index 51a7e52636..d2d08df164 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -241,7 +241,6 @@ OC.L10N.register(
     "Create" : "Створити",
     "Admin Recovery Password" : "Пароль адміністратора для відновлення",
     "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
-    "Search Users" : "Шукати користувачів",
     "Add Group" : "Додати групу",
     "Group" : "Група",
     "Everyone" : "Всі",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index 29002db8d0..8105eb7e37 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -239,7 +239,6 @@
     "Create" : "Створити",
     "Admin Recovery Password" : "Пароль адміністратора для відновлення",
     "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
-    "Search Users" : "Шукати користувачів",
     "Add Group" : "Додати групу",
     "Group" : "Група",
     "Everyone" : "Всі",
diff --git a/settings/l10n/ur.js b/settings/l10n/ur.js
deleted file mode 100644
index 78fcf358b7..0000000000
--- a/settings/l10n/ur.js
+++ /dev/null
@@ -1,6 +0,0 @@
-OC.L10N.register(
-    "settings",
-    {
-    "Error" : "خرابی"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ur.json b/settings/l10n/ur.json
deleted file mode 100644
index 1c1fc3d16c..0000000000
--- a/settings/l10n/ur.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index e8703fa98f..992d70465e 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "settings",
     {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "Security & setup warnings" : "安全 & 设置警告",
     "Sharing" : "共享",
     "Server-side encryption" : "服务器端加密",
     "External Storage" : "外部存储",
@@ -23,20 +26,45 @@ OC.L10N.register(
     "No user supplied" : "没有满足的用户",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "请提供管理员恢复密码，否则所有用户的数据都将遗失。",
     "Wrong admin recovery password. Please check the password and try again." : "错误的管理员恢复密码。请检查密码并重试。",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "后端不支持密码更改，但用户的加密密钥已成功更新。",
     "Unable to change password" : "不能更改密码",
     "Enabled" : "开启",
     "Not enabled" : "未启用",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "通过应用程序商店或联合云共享安装和更新应用程序",
     "Federated Cloud Sharing" : "联合云共享",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL使用了过时 %s 版本 (%s)。请更新你的操作系统或功能比如 %s 将无法可靠地工作。",
+    "A problem occurred, please check your log files (Error: %s)" : "出现了故障，请检查你的日志文件 (错误: %s)",
     "Migration Completed" : "迁移完成",
+    "Group already exists." : "组已经存在。",
+    "Unable to add group." : "无法添加组。",
+    "Unable to delete group." : "无法删除组",
+    "log-level out of allowed range" : "日志级别超出允许的范围",
     "Saved" : "已保存",
     "test email settings" : "测试电子邮件设置",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "在发送电子邮件时出现问题。请修改您的设置。 (错误: %s)",
     "Email sent" : "邮件已发送",
     "You need to set your user email before being able to send test emails." : "在发送测试邮件前您需要设置您的用户电子邮件。",
+    "Invalid mail address" : "无效的电子邮件地址",
+    "A user with that name already exists." : "使用该名称的用户已存在。",
+    "Unable to create user." : "无法创建用户。",
+    "Your %s account was created" : "你的帐户 %s 已创建",
+    "Unable to delete user." : "不能删除用户",
+    "Forbidden" : "被禁止",
+    "Invalid user" : "用户无效",
+    "Unable to change mail address" : "无法更改邮箱地址",
     "Email saved" : "电子邮件已保存",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "你真的希望添加 \"{domain}\" 为信任域？",
     "Add trusted domain" : "添加信任域",
+    "Migration in progress. Please wait until the migration is finished" : "迁移正在进行中。请等待，直到完成迁移",
+    "Migration started …" : "迁移开始...",
     "Sending..." : "正在发送...",
+    "Official" : "官方",
+    "Approved" : "已认可",
+    "Experimental" : "实验",
     "All" : "全部",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方应用是由 ownCloud 社区开发。他们提供 ownCloud 的功能核心并准备用于生产。",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "已认可的应用是由值得信赖的开发商开发，并已通过了一个粗略的安全检查。他们放在一个开放的代码库并且维护人员认为他们是稳定的差不多可以正常使用。",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "此应用未检查安全问题，它是新的或已知是不稳定的。安装风险自担。",
     "Update to %s" : "更新为 %s",
     "Please wait...." : "请稍等....",
     "Error while disabling app" : "禁用 app 时出错",
@@ -49,6 +77,7 @@ OC.L10N.register(
     "Uninstalling ...." : "卸载中....",
     "Error while uninstalling app" : "卸载应用时发生了一个错误",
     "Uninstall" : "卸载",
+    "An error occurred: {message}" : "发生错误： {message}",
     "Select a profile picture" : "选择头像",
     "Very weak password" : "非常弱的密码",
     "Weak password" : "弱密码",
@@ -57,20 +86,24 @@ OC.L10N.register(
     "Strong password" : "强密码",
     "Valid until {date}" : "有效期至 {date}",
     "Delete" : "删除",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。",
     "Groups" : "组",
     "Unable to delete {objName}" : "无法删除 {objName}",
     "Error creating group" : "创建组时出错",
     "A valid group name must be provided" : "请提供一个有效的组名称",
     "deleted {groupName}" : "已删除 {groupName}",
     "undo" : "撤销",
+    "no group" : "没有组",
     "never" : "从不",
     "deleted {userName}" : "已删除 {userName}",
     "add group" : "增加组",
+    "Changing the password will result in data loss, because data recovery is not available for this user" : "更改密码会导致数据丢失，因为数据恢复不适用于此用户",
     "A valid username must be provided" : "必须提供合法的用户名",
     "Error creating user" : "创建用户出错",
     "A valid password must be provided" : "必须提供合法的密码",
+    "A valid email must be provided" : "必须提供合法的用户名",
     "__language_name__" : "简体中文",
-    "Sync clients" : "同步客户端",
+    "Sync clients" : "客户端",
     "Personal info" : "个人信息",
     "SSL root certificates" : "SSL 根证书",
     "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）",
@@ -84,11 +117,20 @@ OC.L10N.register(
     "NT LAN Manager" : "NT LAN 管理器",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 似乎没有设置好查询的系统环境变量。 用 getenv(\\\"PATH\\\") 测试只返回一个空值。",
+    "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "只读配置已启用。这样可防止通过 WEB 接口设置一些配置。此外，每次更新后该文件需要手动设置为可写。",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "你的服务器是运行于 Microsoft Windows 系统。我们强烈推荐使用 Linux 系统以获得最佳的用户体验。比如中文文件夹和文件名支持。",
+    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s 下版本 %2$s 已安装。基于稳定和性能的原因，我们强烈建议更新至 %1$s 版本。",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
     "System locale can not be set to a one which supports UTF-8." : "系统语系无法设置为支持 UTF-8 的语系。",
     "This means that there might be problems with certain characters in file names." : "这意味着一些文件名中的特定字符可能有问题。",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "我们强烈建议安装在系统上所需的软件包支持以下区域设置之一： %s.",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你不是安装在网域根目录而且又使用系统定时计划任务，那么可以导致 URL 链接生成问题。为了避免这些问题，请在你的 Config.php 文件中设置 \\\"overwrite.cli.url\\\" 选项为 webroot 安装根目录 (建议: \\\"%s\\\")",
+    "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "由于下面的错误，无法通过 CLI 执行定时计划任务:",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "请点击检查 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 安装向导 ↗</a>, 点击 <a href=\\\"#log-section\\\"> 日志 </a>查看详细错误和警告。",
+    "All checks passed." : "所有检查已通过。",
     "Open documentation" : "打开文档",
     "Allow apps to use the Share API" : "允许应用软件使用共享API",
     "Allow users to share via link" : "允许用户通过链接分享文件",
@@ -101,14 +143,28 @@ OC.L10N.register(
     "Enforce expiration date" : "强制过期日期",
     "Allow resharing" : "允许再次共享",
     "Restrict users to only share with users in their groups" : "限制仅与组内用户分享",
+    "Allow users to send mail notification for shared files to other users" : "允许用户发送共享文件的邮件通知给其他用户",
     "Exclude groups from sharing" : "在分享中排除组",
     "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
+    "Last cron job execution: %s." : "上次定时任务执行于： %s.",
+    "Last cron job execution: %s. Something seems wrong." : "上次定时任务执行于: %s. 似乎有些问题。",
     "Cron was not executed yet!" : "定时任务还未被执行！",
     "Execute one task with each page loaded" : "每个页面加载后执行一个任务",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟执行 cron.php。",
     "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
     "Enable server-side encryption" : "启用服务器端加密",
+    "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "服务器端加密是一个单向的过程。一旦启用加密，从该点向前所有文件都将在服务器上进行加密，它将无法在以后禁用加密",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "只要有权访问您的 ownCloud 服务器就可能解密你的文件，通过截获请求或读出以纯文本会话文件存储的用户密码。服务端加密。它不仅让你免遭恶意的管理员查看隐私，在保护你在外部托管的存储中的数据也非常有用。",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "根据实际加密模块上的一般文件大小而增加 (使用默认的模块时，35%% 以上)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "你应该定期备份所有加密密钥，以防数据永久丢失 (data/<user>/files_encryption 和 data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
     "Enable encryption" : "启用加密",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "没有加载加密模块，请在 APP 应用菜单中启用加密模块。",
+    "Select default encryption module:" : "选择默认的加密模块：",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "你需要升级你的加密密钥 (旧版 ownCloud <= 8.0) 。 请在应用中启用 \\\"Default encryption module\\\" 并运行 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "您需要将加密密钥从旧版(ownCloud<=8.0)迁移到新版。",
+    "Start migration" : "开始迁移",
     "This is used for sending out notifications." : "这被用于发送通知。",
     "Send mode" : "发送模式",
     "Encryption" : "加密",
@@ -121,30 +177,52 @@ OC.L10N.register(
     "Credentials" : "凭证",
     "SMTP Username" : "SMTP 用户名",
     "SMTP Password" : "SMTP 密码",
+    "Store credentials" : "存储凭据",
     "Test email settings" : "测试电子邮件设置",
     "Send email" : "发送邮件",
     "Log level" : "日志级别",
+    "Download logfile" : "下载日志文件",
     "More" : "更多",
     "Less" : "更少",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "日志文件超过 100 MB。下载可能需要一些时间！",
+    "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite 被用作数据库。对于较大数据量的安装和使用，我们建议您切换到不同的数据库后端。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite 。",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "要迁移到另一个数据库请使用命令行工具: 'occ db:convert-type', 或者查看 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 相关文档 ↗</a>.",
+    "How to do backups" : "如何做备份",
     "Advanced monitoring" : "高级监控",
     "Performance tuning" : "性能优化",
     "Improving the config.php" : "正在优化 config.php",
     "Theming" : "主题",
+    "Hardening and security guidance" : "强化和安全指南",
     "Version" : "版本",
+    "Developer documentation" : "开发者文档",
+    "Experimental applications ahead" : "未来的实验应用",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "实验应用程序没有在安全性的问题上作过多检查，新的或已知的不稳定 BUG 都在开发中。安装它们可能会导致数据丢失或安全漏洞。",
     "by" : "被",
+    "licensed" : "许可",
     "Documentation:" : "文档：",
     "User documentation" : "用户文档",
+    "Admin documentation" : "管理员文档",
+    "Show description …" : "显示描述...",
+    "Hide description …" : "隐藏描述...",
+    "This app cannot be installed because the following dependencies are not fulfilled:" : "此应用程序无法安装，因为以下依赖性不满足：",
     "Enable only for specific groups" : "仅对特定的组开放",
     "Uninstall App" : "卸载应用",
+    "Enable experimental apps" : "启用实验性应用程序",
+    "No apps found for your version" : "未找到适合当前版本的应用",
+    "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "亲，<br><br>现在我们为你开通了 %s 私有云帐户。<br><br>你的用户名： %s<br>访问网址： <a href=\\\"%s\\\">%s</a><br><br>",
     "Cheers!" : "干杯！",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "亲，\\n\\n 现在我们为你开通了 %s 私有去帐户。\\n\\n 你的用户名： %s\\n 访问网址： %s\\n 你的初始密码需要咨询系统管理员。或者你也可以在登录页面输入任意密码登录，\\n登录窗口将出现忘记密码链接，点击通过注册邮箱重设初始密码。\\n\\n",
     "Administrator documentation" : "管理员文档",
     "Online documentation" : "在线文档",
     "Forum" : "论坛",
+    "Issue tracker" : "问题跟踪",
+    "Commercial support" : "商业支持",
     "Get the apps to sync your files" : "安装应用进行文件同步",
     "Desktop client" : "桌面客户端",
     "Android app" : "Android 应用",
     "iOS app" : "iOS 应用",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "想支持ownCloud项目？请\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">参加开发</a>\n\t\t或者\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">帮助推广</a>吧！",
     "Show First Run Wizard again" : "再次显示首次运行向导",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
     "Password" : "密码",
@@ -152,13 +230,18 @@ OC.L10N.register(
     "Current password" : "当前密码",
     "New password" : "新密码",
     "Change password" : "修改密码",
+    "Full name" : "全名",
+    "No display name set" : "不显示名称设置",
     "Email" : "电子邮件",
     "Your email address" : "您的电子邮件",
     "Fill in an email address to enable password recovery and receive notifications" : "填入电子邮件地址从而启用密码恢复和接收通知",
+    "No email address set" : "尚未设置 Email 地址",
+    "You are member of the following groups:" : "您是以下组的成员：",
     "Profile picture" : "联系人图片",
     "Upload new" : "上传新的",
     "Select new from Files" : "从文件中选择一个新的",
     "Remove image" : "移除图片",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "png 或 jpg。正方形比较理想但你也可以之后对其进行裁剪。文件大小最大不允许超过 20MB。",
     "Your avatar is provided by your original account." : "您的头像由您的原始账户所提供。",
     "Cancel" : "取消",
     "Choose as profile image" : "用作头像",
@@ -168,14 +251,18 @@ OC.L10N.register(
     "Valid until" : "有效期至",
     "Issued By" : "授权由",
     "Valid until %s" : "有效期至 %s",
+    "Import root certificate" : "导入根证书",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社区{linkclose}开发，{githubopen}源代码{linkclose}在 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr> 许可证{linkclose}下发布。",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
+    "Show user backend" : "显示用户后端",
+    "Send email to new user" : "发送电子邮件给新用户",
+    "Show email address" : "显示邮件地址",
     "Username" : "用户名",
+    "E-Mail" : "E-Mail",
     "Create" : "创建",
     "Admin Recovery Password" : "管理恢复密码",
     "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
-    "Search Users" : "搜索用户",
     "Add Group" : "增加组",
     "Group" : "分组",
     "Everyone" : "所有人",
@@ -185,6 +272,7 @@ OC.L10N.register(
     "Unlimited" : "无限",
     "Other" : "其它",
     "Full Name" : "全名",
+    "Group Admin for" : "设为以下组管理员",
     "Quota" : "配额",
     "Storage Location" : "存储空间位置",
     "User Backend" : "用户后端",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 140962eaba..97eae6702a 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "Security & setup warnings" : "安全 & 设置警告",
     "Sharing" : "共享",
     "Server-side encryption" : "服务器端加密",
     "External Storage" : "外部存储",
@@ -21,20 +24,45 @@
     "No user supplied" : "没有满足的用户",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "请提供管理员恢复密码，否则所有用户的数据都将遗失。",
     "Wrong admin recovery password. Please check the password and try again." : "错误的管理员恢复密码。请检查密码并重试。",
+    "Backend doesn't support password change, but the user's encryption key was successfully updated." : "后端不支持密码更改，但用户的加密密钥已成功更新。",
     "Unable to change password" : "不能更改密码",
     "Enabled" : "开启",
     "Not enabled" : "未启用",
+    "installing and updating apps via the app store or Federated Cloud Sharing" : "通过应用程序商店或联合云共享安装和更新应用程序",
     "Federated Cloud Sharing" : "联合云共享",
+    "cURL is using an outdated %s version (%s). Please update your operating system or features such as %s will not work reliably." : "cURL使用了过时 %s 版本 (%s)。请更新你的操作系统或功能比如 %s 将无法可靠地工作。",
+    "A problem occurred, please check your log files (Error: %s)" : "出现了故障，请检查你的日志文件 (错误: %s)",
     "Migration Completed" : "迁移完成",
+    "Group already exists." : "组已经存在。",
+    "Unable to add group." : "无法添加组。",
+    "Unable to delete group." : "无法删除组",
+    "log-level out of allowed range" : "日志级别超出允许的范围",
     "Saved" : "已保存",
     "test email settings" : "测试电子邮件设置",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "在发送电子邮件时出现问题。请修改您的设置。 (错误: %s)",
     "Email sent" : "邮件已发送",
     "You need to set your user email before being able to send test emails." : "在发送测试邮件前您需要设置您的用户电子邮件。",
+    "Invalid mail address" : "无效的电子邮件地址",
+    "A user with that name already exists." : "使用该名称的用户已存在。",
+    "Unable to create user." : "无法创建用户。",
+    "Your %s account was created" : "你的帐户 %s 已创建",
+    "Unable to delete user." : "不能删除用户",
+    "Forbidden" : "被禁止",
+    "Invalid user" : "用户无效",
+    "Unable to change mail address" : "无法更改邮箱地址",
     "Email saved" : "电子邮件已保存",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "你真的希望添加 \"{domain}\" 为信任域？",
     "Add trusted domain" : "添加信任域",
+    "Migration in progress. Please wait until the migration is finished" : "迁移正在进行中。请等待，直到完成迁移",
+    "Migration started …" : "迁移开始...",
     "Sending..." : "正在发送...",
+    "Official" : "官方",
+    "Approved" : "已认可",
+    "Experimental" : "实验",
     "All" : "全部",
+    "Official apps are developed by and within the ownCloud community. They offer functionality central to ownCloud and are ready for production use." : "官方应用是由 ownCloud 社区开发。他们提供 ownCloud 的功能核心并准备用于生产。",
+    "Approved apps are developed by trusted developers and have passed a cursory security check. They are actively maintained in an open code repository and their maintainers deem them to be stable for casual to normal use." : "已认可的应用是由值得信赖的开发商开发，并已通过了一个粗略的安全检查。他们放在一个开放的代码库并且维护人员认为他们是稳定的差不多可以正常使用。",
+    "This app is not checked for security issues and is new or known to be unstable. Install at your own risk." : "此应用未检查安全问题，它是新的或已知是不稳定的。安装风险自担。",
     "Update to %s" : "更新为 %s",
     "Please wait...." : "请稍等....",
     "Error while disabling app" : "禁用 app 时出错",
@@ -47,6 +75,7 @@
     "Uninstalling ...." : "卸载中....",
     "Error while uninstalling app" : "卸载应用时发生了一个错误",
     "Uninstall" : "卸载",
+    "An error occurred: {message}" : "发生错误： {message}",
     "Select a profile picture" : "选择头像",
     "Very weak password" : "非常弱的密码",
     "Weak password" : "弱密码",
@@ -55,20 +84,24 @@
     "Strong password" : "强密码",
     "Valid until {date}" : "有效期至 {date}",
     "Delete" : "删除",
+    "An error occurred. Please upload an ASCII-encoded PEM certificate." : "出现了一个错误。请上传 ASCII 编码的 PEM 证书。",
     "Groups" : "组",
     "Unable to delete {objName}" : "无法删除 {objName}",
     "Error creating group" : "创建组时出错",
     "A valid group name must be provided" : "请提供一个有效的组名称",
     "deleted {groupName}" : "已删除 {groupName}",
     "undo" : "撤销",
+    "no group" : "没有组",
     "never" : "从不",
     "deleted {userName}" : "已删除 {userName}",
     "add group" : "增加组",
+    "Changing the password will result in data loss, because data recovery is not available for this user" : "更改密码会导致数据丢失，因为数据恢复不适用于此用户",
     "A valid username must be provided" : "必须提供合法的用户名",
     "Error creating user" : "创建用户出错",
     "A valid password must be provided" : "必须提供合法的密码",
+    "A valid email must be provided" : "必须提供合法的用户名",
     "__language_name__" : "简体中文",
-    "Sync clients" : "同步客户端",
+    "Sync clients" : "客户端",
     "Personal info" : "个人信息",
     "SSL root certificates" : "SSL 根证书",
     "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）",
@@ -82,11 +115,20 @@
     "NT LAN Manager" : "NT LAN 管理器",
     "SSL" : "SSL",
     "TLS" : "TLS",
+    "php does not seem to be setup properly to query system environment variables. The test with getenv(\"PATH\") only returns an empty response." : "PHP 似乎没有设置好查询的系统环境变量。 用 getenv(\\\"PATH\\\") 测试只返回一个空值。",
+    "The Read-Only config has been enabled. This prevents setting some configurations via the web-interface. Furthermore, the file needs to be made writable manually for every update." : "只读配置已启用。这样可防止通过 WEB 接口设置一些配置。此外，每次更新后该文件需要手动设置为可写。",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP 被设置为移除行内 <doc> 块，这将导致数个核心应用无法访问。",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "这可能是由缓存/加速器造成的，例如 Zend OPcache 或 eAccelerator。",
+    "Your server is running on Microsoft Windows. We highly recommend Linux for optimal user experience." : "你的服务器是运行于 Microsoft Windows 系统。我们强烈推荐使用 Linux 系统以获得最佳的用户体验。比如中文文件夹和文件名支持。",
+    "%1$s below version %2$s is installed, for stability and performance reasons we recommend to update to a newer %1$s version." : "%1$s 下版本 %2$s 已安装。基于稳定和性能的原因，我们强烈建议更新至 %1$s 版本。",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
     "System locale can not be set to a one which supports UTF-8." : "系统语系无法设置为支持 UTF-8 的语系。",
     "This means that there might be problems with certain characters in file names." : "这意味着一些文件名中的特定字符可能有问题。",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "我们强烈建议安装在系统上所需的软件包支持以下区域设置之一： %s.",
+    "If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the \"overwrite.cli.url\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你不是安装在网域根目录而且又使用系统定时计划任务，那么可以导致 URL 链接生成问题。为了避免这些问题，请在你的 Config.php 文件中设置 \\\"overwrite.cli.url\\\" 选项为 webroot 安装根目录 (建议: \\\"%s\\\")",
+    "It was not possible to execute the cronjob via CLI. The following technical errors have appeared:" : "由于下面的错误，无法通过 CLI 执行定时计划任务:",
+    "Please double check the <a target=\"_blank\" href=\"%s\">installation guides ↗</a>, and check for any errors or warnings in the <a href=\"#log-section\">log</a>." : "请点击检查 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 安装向导 ↗</a>, 点击 <a href=\\\"#log-section\\\"> 日志 </a>查看详细错误和警告。",
+    "All checks passed." : "所有检查已通过。",
     "Open documentation" : "打开文档",
     "Allow apps to use the Share API" : "允许应用软件使用共享API",
     "Allow users to share via link" : "允许用户通过链接分享文件",
@@ -99,14 +141,28 @@
     "Enforce expiration date" : "强制过期日期",
     "Allow resharing" : "允许再次共享",
     "Restrict users to only share with users in their groups" : "限制仅与组内用户分享",
+    "Allow users to send mail notification for shared files to other users" : "允许用户发送共享文件的邮件通知给其他用户",
     "Exclude groups from sharing" : "在分享中排除组",
     "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
+    "Last cron job execution: %s." : "上次定时任务执行于： %s.",
+    "Last cron job execution: %s. Something seems wrong." : "上次定时任务执行于: %s. 似乎有些问题。",
     "Cron was not executed yet!" : "定时任务还未被执行！",
     "Execute one task with each page loaded" : "每个页面加载后执行一个任务",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php 已注册于一个 webcron 服务来通过 http 每 15 分钟执行 cron.php。",
     "Use system's cron service to call the cron.php file every 15 minutes." : "使用系统 CRON 服务每 15 分钟执行一次 cron.php 文件。",
     "Enable server-side encryption" : "启用服务器端加密",
+    "Please read carefully before activating server-side encryption: " : "在激活服务器端加密之前，请仔细阅读：",
+    "Server-side encryption is a one way process. Once encryption is enabled, all files from that point forward will be encrypted on the server and it will not be possible to disable encryption at a later date" : "服务器端加密是一个单向的过程。一旦启用加密，从该点向前所有文件都将在服务器上进行加密，它将无法在以后禁用加密",
+    "Anyone who has privileged access to your ownCloud server can decrypt your files either by intercepting requests or reading out user passwords which are stored in plain text session files. Server-side encryption does therefore not protect against malicious administrators but is useful for protecting your data on externally hosted storage." : "只要有权访问您的 ownCloud 服务器就可能解密你的文件，通过截获请求或读出以纯文本会话文件存储的用户密码。服务端加密。它不仅让你免遭恶意的管理员查看隐私，在保护你在外部托管的存储中的数据也非常有用。",
+    "Depending on the actual encryption module the general file size is increased (by 35%% or more when using the default module)" : "根据实际加密模块上的一般文件大小而增加 (使用默认的模块时，35%% 以上)",
+    "You should regularly backup all encryption keys to prevent permanent data loss (data/<user>/files_encryption and data/files_encryption)" : "你应该定期备份所有加密密钥，以防数据永久丢失 (data/<user>/files_encryption 和 data/files_encryption)",
+    "This is the final warning: Do you really want to enable encryption?" : "这是最后一次警告：你真的想启用加密？",
     "Enable encryption" : "启用加密",
+    "No encryption module loaded, please enable an encryption module in the app menu." : "没有加载加密模块，请在 APP 应用菜单中启用加密模块。",
+    "Select default encryption module:" : "选择默认的加密模块：",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the \"Default encryption module\" and run 'occ encryption:migrate'" : "你需要升级你的加密密钥 (旧版 ownCloud <= 8.0) 。 请在应用中启用 \\\"Default encryption module\\\" 并运行 'occ encryption:migrate'",
+    "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one." : "您需要将加密密钥从旧版(ownCloud<=8.0)迁移到新版。",
+    "Start migration" : "开始迁移",
     "This is used for sending out notifications." : "这被用于发送通知。",
     "Send mode" : "发送模式",
     "Encryption" : "加密",
@@ -119,30 +175,52 @@
     "Credentials" : "凭证",
     "SMTP Username" : "SMTP 用户名",
     "SMTP Password" : "SMTP 密码",
+    "Store credentials" : "存储凭据",
     "Test email settings" : "测试电子邮件设置",
     "Send email" : "发送邮件",
     "Log level" : "日志级别",
+    "Download logfile" : "下载日志文件",
     "More" : "更多",
     "Less" : "更少",
+    "The logfile is bigger than 100 MB. Downloading it may take some time!" : "日志文件超过 100 MB。下载可能需要一些时间！",
+    "SQLite is used as database. For larger installations we recommend to switch to a different database backend." : "SQLite 被用作数据库。对于较大数据量的安装和使用，我们建议您切换到不同的数据库后端。",
     "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "特别当使用桌面客户端来同步文件时，不鼓励使用 SQLite 。",
+    "To migrate to another database use the command line tool: 'occ db:convert-type', or see the <a target=\"_blank\" href=\"%s\">documentation ↗</a>." : "要迁移到另一个数据库请使用命令行工具: 'occ db:convert-type', 或者查看 <a target=\\\"_blank\\\" href=\\\"%s\\\"> 相关文档 ↗</a>.",
+    "How to do backups" : "如何做备份",
     "Advanced monitoring" : "高级监控",
     "Performance tuning" : "性能优化",
     "Improving the config.php" : "正在优化 config.php",
     "Theming" : "主题",
+    "Hardening and security guidance" : "强化和安全指南",
     "Version" : "版本",
+    "Developer documentation" : "开发者文档",
+    "Experimental applications ahead" : "未来的实验应用",
+    "Experimental apps are not checked for security issues, new or known to be unstable and under heavy development. Installing them can cause data loss or security breaches." : "实验应用程序没有在安全性的问题上作过多检查，新的或已知的不稳定 BUG 都在开发中。安装它们可能会导致数据丢失或安全漏洞。",
     "by" : "被",
+    "licensed" : "许可",
     "Documentation:" : "文档：",
     "User documentation" : "用户文档",
+    "Admin documentation" : "管理员文档",
+    "Show description …" : "显示描述...",
+    "Hide description …" : "隐藏描述...",
+    "This app cannot be installed because the following dependencies are not fulfilled:" : "此应用程序无法安装，因为以下依赖性不满足：",
     "Enable only for specific groups" : "仅对特定的组开放",
     "Uninstall App" : "卸载应用",
+    "Enable experimental apps" : "启用实验性应用程序",
+    "No apps found for your version" : "未找到适合当前版本的应用",
+    "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "亲，<br><br>现在我们为你开通了 %s 私有云帐户。<br><br>你的用户名： %s<br>访问网址： <a href=\\\"%s\\\">%s</a><br><br>",
     "Cheers!" : "干杯！",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "亲，\\n\\n 现在我们为你开通了 %s 私有去帐户。\\n\\n 你的用户名： %s\\n 访问网址： %s\\n 你的初始密码需要咨询系统管理员。或者你也可以在登录页面输入任意密码登录，\\n登录窗口将出现忘记密码链接，点击通过注册邮箱重设初始密码。\\n\\n",
     "Administrator documentation" : "管理员文档",
     "Online documentation" : "在线文档",
     "Forum" : "论坛",
+    "Issue tracker" : "问题跟踪",
+    "Commercial support" : "商业支持",
     "Get the apps to sync your files" : "安装应用进行文件同步",
     "Desktop client" : "桌面客户端",
     "Android app" : "Android 应用",
     "iOS app" : "iOS 应用",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "想支持ownCloud项目？请\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">参加开发</a>\n\t\t或者\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">帮助推广</a>吧！",
     "Show First Run Wizard again" : "再次显示首次运行向导",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
     "Password" : "密码",
@@ -150,13 +228,18 @@
     "Current password" : "当前密码",
     "New password" : "新密码",
     "Change password" : "修改密码",
+    "Full name" : "全名",
+    "No display name set" : "不显示名称设置",
     "Email" : "电子邮件",
     "Your email address" : "您的电子邮件",
     "Fill in an email address to enable password recovery and receive notifications" : "填入电子邮件地址从而启用密码恢复和接收通知",
+    "No email address set" : "尚未设置 Email 地址",
+    "You are member of the following groups:" : "您是以下组的成员：",
     "Profile picture" : "联系人图片",
     "Upload new" : "上传新的",
     "Select new from Files" : "从文件中选择一个新的",
     "Remove image" : "移除图片",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "png 或 jpg。正方形比较理想但你也可以之后对其进行裁剪。文件大小最大不允许超过 20MB。",
     "Your avatar is provided by your original account." : "您的头像由您的原始账户所提供。",
     "Cancel" : "取消",
     "Choose as profile image" : "用作头像",
@@ -166,14 +249,18 @@
     "Valid until" : "有效期至",
     "Issued By" : "授权由",
     "Valid until %s" : "有效期至 %s",
+    "Import root certificate" : "导入根证书",
     "Developed by the {communityopen}ownCloud community{linkclose}, the {githubopen}source code{linkclose} is licensed under the {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr>{linkclose}." : "由 {communityopen}ownCloud 社区{linkclose}开发，{githubopen}源代码{linkclose}在 {licenseopen}<abbr title=\"Affero General Public License\">AGPL</abbr> 许可证{linkclose}下发布。",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
+    "Show user backend" : "显示用户后端",
+    "Send email to new user" : "发送电子邮件给新用户",
+    "Show email address" : "显示邮件地址",
     "Username" : "用户名",
+    "E-Mail" : "E-Mail",
     "Create" : "创建",
     "Admin Recovery Password" : "管理恢复密码",
     "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
-    "Search Users" : "搜索用户",
     "Add Group" : "增加组",
     "Group" : "分组",
     "Everyone" : "所有人",
@@ -183,6 +270,7 @@
     "Unlimited" : "无限",
     "Other" : "其它",
     "Full Name" : "全名",
+    "Group Admin for" : "设为以下组管理员",
     "Quota" : "配额",
     "Storage Location" : "存储空间位置",
     "User Backend" : "用户后端",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index 69298cb94e..9f3946a930 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -1,10 +1,16 @@
 OC.L10N.register(
     "settings",
     {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "Security & setup warnings" : "安全及設定警告",
     "Sharing" : "分享",
+    "Server-side encryption" : "伺服器端加密",
     "External Storage" : "外部儲存",
     "Cron" : "工作排程",
-    "Log" : "紀錄",
+    "Email server" : "郵件伺服器",
+    "Log" : "紀錄檔",
+    "Tips & tricks" : "技巧 & 提示",
     "Updates" : "更新",
     "Authentication error" : "認證錯誤",
     "Your full name has been changed." : "您的全名已變更。",
@@ -23,13 +29,30 @@ OC.L10N.register(
     "Unable to change password" : "無法修改密碼",
     "Enabled" : "已啓用",
     "Not enabled" : "無啟動",
+    "Migration Completed" : "遷移已完成",
     "Group already exists." : "群組已存在",
+    "Unable to add group." : "無法新增群組",
+    "Unable to delete group." : "無法刪除群組",
+    "log-level out of allowed range" : "log-level 超過允許範圍",
     "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "寄出郵件時發生問題，請檢查您的設定。（錯誤訊息：%s）",
     "Email sent" : "Email 已寄出",
     "You need to set your user email before being able to send test emails." : "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
-    "Email saved" : "Email已儲存",
+    "Invalid mail address" : "無效的 email 地址",
+    "A user with that name already exists." : "同名的使用者已經存在",
+    "Unable to create user." : "無法建立使用者",
+    "Your %s account was created" : "您的 %s 帳號已經建立",
+    "Unable to delete user." : "無法移除使用者",
+    "Forbidden" : "存取被拒",
+    "Invalid user" : "無效的使用者",
+    "Unable to change mail address" : "無法更改 email 地址",
+    "Email saved" : "Email 已儲存",
+    "Migration started …" : "遷移開始中 ...",
     "Sending..." : "寄送中...",
+    "Official" : "官方",
+    "Approved" : "已批准",
+    "Experimental" : "實驗性質",
     "All" : "所有",
     "Please wait...." : "請稍候...",
     "Error while disabling app" : "停用應用程式錯誤",
@@ -39,12 +62,17 @@ OC.L10N.register(
     "Updating...." : "更新中...",
     "Error while updating app" : "更新應用程式錯誤",
     "Updated" : "已更新",
+    "Uninstalling ...." : "正在解除安裝…",
+    "Error while uninstalling app" : "移除應用程式錯誤",
+    "Uninstall" : "解除安裝",
+    "An error occurred: {message}" : "發生錯誤：{message}",
     "Select a profile picture" : "選擇大頭貼",
     "Very weak password" : "非常弱的密碼",
     "Weak password" : "弱的密碼",
     "So-so password" : "普通的密碼",
     "Good password" : "好的密碼",
     "Strong password" : "很強的密碼",
+    "Valid until {date}" : "{date} 前有效",
     "Delete" : "刪除",
     "Groups" : "群組",
     "undo" : "復原",
@@ -74,10 +102,10 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知",
     "days" : "天",
     "Allow resharing" : "允許轉貼分享",
-    "Cron was not executed yet!" : "排程沒有執行!",
+    "Cron was not executed yet!" : "排程沒有執行！",
     "Execute one task with each page loaded" : "當頁面載入時，執行",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
-    "This is used for sending out notifications." : "這是使用於寄送通知。",
+    "This is used for sending out notifications." : "寄送通知用",
     "Send mode" : "寄送模式",
     "Encryption" : "加密",
     "From address" : "寄件地址",
@@ -85,20 +113,48 @@ OC.L10N.register(
     "Authentication required" : "必須驗證",
     "Server address" : "伺服器位址",
     "Port" : "連接埠",
-    "Credentials" : "認證",
+    "Credentials" : "帳密",
     "SMTP Username" : "SMTP 帳號",
     "SMTP Password" : "SMTP 密碼",
+    "Store credentials" : "儲存帳密",
     "Test email settings" : "測試郵件設定",
     "Send email" : "寄送郵件",
     "Log level" : "紀錄層級",
+    "Download logfile" : "下載記錄檔",
     "More" : "更多",
     "Less" : "更少",
+    "How to do backups" : "如何備份",
+    "Advanced monitoring" : "進階監控",
+    "Performance tuning" : "效能調校",
+    "Improving the config.php" : "改進 config.php",
+    "Theming" : "佈景主題",
+    "Hardening and security guidance" : "增強安全性",
     "Version" : "版本",
+    "Developer documentation" : "開發者說明文件",
+    "Experimental applications ahead" : "以下是實驗性質的應用程式",
     "by" : "由",
+    "licensed" : "許可證",
     "Documentation:" : "文件:",
+    "User documentation" : "用戶說明文件",
+    "Admin documentation" : "管理者文件",
+    "Show description …" : "顯示描述",
+    "Hide description …" : "隱藏描述",
+    "Uninstall App" : "刪除 App",
+    "Enable experimental apps" : "啟用測試中的應用程式",
+    "No apps found for your version" : "在您的版本中未找到任何應用程式",
+    "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "嗨，<br><br>通知您一聲，您現在有了 %s 的帳號。<br><br>您的帳號： %s<br>開通帳號： <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "太棒了！",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "嗨，\n\n通知您一聲，您現在有了 %s 的帳號。\n\n您的帳號：%s\n開通帳號：%s\n\n",
+    "Administrator documentation" : "管理者說明文件",
+    "Online documentation" : "線上說明文件",
     "Forum" : "論壇",
+    "Issue tracker" : "問題追蹤",
+    "Commercial support" : "商用支援",
     "Get the apps to sync your files" : "下載應用程式來同步您的檔案",
+    "Desktop client" : "桌面客戶端",
+    "Android app" : "Android 應用程式",
+    "iOS app" : "iOS 應用程式",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "若您想支援這個計畫\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">加入開發者</a>\n\t\t或\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">替我們宣傳</a>!",
     "Show First Run Wizard again" : "再次顯示首次使用精靈",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
     "Password" : "密碼",
@@ -106,31 +162,50 @@ OC.L10N.register(
     "Current password" : "目前密碼",
     "New password" : "新密碼",
     "Change password" : "變更密碼",
+    "Full name" : "全名",
+    "No display name set" : "未設置顯示名稱",
     "Email" : "信箱",
     "Your email address" : "您的電子郵件信箱",
     "Fill in an email address to enable password recovery and receive notifications" : "填入電子郵件地址來啟用忘記密碼和接收通知的功能",
+    "No email address set" : "未設置電子郵件信箱",
+    "You are member of the following groups:" : "您的會員帳號歸類在以下群組:",
     "Profile picture" : "個人資料照片",
     "Upload new" : "上傳新的",
     "Select new from Files" : "從已上傳的檔案中選一個",
     "Remove image" : "移除圖片",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "可以使用 png 或 jpg 格式，最好是方形的，但是您之後也可以裁剪它。圖片容量最大請勿超過 20 MB。",
     "Your avatar is provided by your original account." : "您的圖像是由您原來的帳號所提供的。",
     "Cancel" : "取消",
     "Choose as profile image" : "設定為大頭貼",
     "Language" : "語言",
     "Help translate" : "幫助翻譯",
+    "Common Name" : "Common Name",
+    "Show storage location" : "顯示儲存位置",
+    "Show last log in" : "顯示最近登入",
+    "Show user backend" : "顯示用戶後台",
+    "Send email to new user" : "寄送郵件給新用戶",
+    "Show email address" : "顯示電子郵件信箱",
     "Username" : "使用者名稱",
+    "E-Mail" : "電子郵件",
     "Create" : "建立",
     "Admin Recovery Password" : "管理者復原密碼",
     "Enter the recovery password in order to recover the users files during password change" : "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
+    "Add Group" : "新增群組",
     "Group" : "群組",
+    "Everyone" : "所有人",
+    "Admins" : "管理者",
     "Default Quota" : "預設容量限制",
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
     "Unlimited" : "無限制",
     "Other" : "其他",
     "Full Name" : "全名",
     "Quota" : "容量限制",
+    "Storage Location" : "儲存位置",
+    "User Backend" : "用戶後台",
+    "Last Login" : "上次登入",
     "change full name" : "變更全名",
     "set new password" : "設定新密碼",
+    "change email address" : "更改電子郵件地址",
     "Default" : "預設"
 },
 "nplurals=1; plural=0;");
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index 2d7122fd2b..ce87ffa614 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -1,8 +1,14 @@
 { "translations": {
+    "APCu" : "APCu",
+    "Redis" : "Redis",
+    "Security & setup warnings" : "安全及設定警告",
     "Sharing" : "分享",
+    "Server-side encryption" : "伺服器端加密",
     "External Storage" : "外部儲存",
     "Cron" : "工作排程",
-    "Log" : "紀錄",
+    "Email server" : "郵件伺服器",
+    "Log" : "紀錄檔",
+    "Tips & tricks" : "技巧 & 提示",
     "Updates" : "更新",
     "Authentication error" : "認證錯誤",
     "Your full name has been changed." : "您的全名已變更。",
@@ -21,13 +27,30 @@
     "Unable to change password" : "無法修改密碼",
     "Enabled" : "已啓用",
     "Not enabled" : "無啟動",
+    "Migration Completed" : "遷移已完成",
     "Group already exists." : "群組已存在",
+    "Unable to add group." : "無法新增群組",
+    "Unable to delete group." : "無法刪除群組",
+    "log-level out of allowed range" : "log-level 超過允許範圍",
     "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
+    "A problem occurred while sending the email. Please revise your settings. (Error: %s)" : "寄出郵件時發生問題，請檢查您的設定。（錯誤訊息：%s）",
     "Email sent" : "Email 已寄出",
     "You need to set your user email before being able to send test emails." : "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
-    "Email saved" : "Email已儲存",
+    "Invalid mail address" : "無效的 email 地址",
+    "A user with that name already exists." : "同名的使用者已經存在",
+    "Unable to create user." : "無法建立使用者",
+    "Your %s account was created" : "您的 %s 帳號已經建立",
+    "Unable to delete user." : "無法移除使用者",
+    "Forbidden" : "存取被拒",
+    "Invalid user" : "無效的使用者",
+    "Unable to change mail address" : "無法更改 email 地址",
+    "Email saved" : "Email 已儲存",
+    "Migration started …" : "遷移開始中 ...",
     "Sending..." : "寄送中...",
+    "Official" : "官方",
+    "Approved" : "已批准",
+    "Experimental" : "實驗性質",
     "All" : "所有",
     "Please wait...." : "請稍候...",
     "Error while disabling app" : "停用應用程式錯誤",
@@ -37,12 +60,17 @@
     "Updating...." : "更新中...",
     "Error while updating app" : "更新應用程式錯誤",
     "Updated" : "已更新",
+    "Uninstalling ...." : "正在解除安裝…",
+    "Error while uninstalling app" : "移除應用程式錯誤",
+    "Uninstall" : "解除安裝",
+    "An error occurred: {message}" : "發生錯誤：{message}",
     "Select a profile picture" : "選擇大頭貼",
     "Very weak password" : "非常弱的密碼",
     "Weak password" : "弱的密碼",
     "So-so password" : "普通的密碼",
     "Good password" : "好的密碼",
     "Strong password" : "很強的密碼",
+    "Valid until {date}" : "{date} 前有效",
     "Delete" : "刪除",
     "Groups" : "群組",
     "undo" : "復原",
@@ -72,10 +100,10 @@
     "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知",
     "days" : "天",
     "Allow resharing" : "允許轉貼分享",
-    "Cron was not executed yet!" : "排程沒有執行!",
+    "Cron was not executed yet!" : "排程沒有執行！",
     "Execute one task with each page loaded" : "當頁面載入時，執行",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
-    "This is used for sending out notifications." : "這是使用於寄送通知。",
+    "This is used for sending out notifications." : "寄送通知用",
     "Send mode" : "寄送模式",
     "Encryption" : "加密",
     "From address" : "寄件地址",
@@ -83,20 +111,48 @@
     "Authentication required" : "必須驗證",
     "Server address" : "伺服器位址",
     "Port" : "連接埠",
-    "Credentials" : "認證",
+    "Credentials" : "帳密",
     "SMTP Username" : "SMTP 帳號",
     "SMTP Password" : "SMTP 密碼",
+    "Store credentials" : "儲存帳密",
     "Test email settings" : "測試郵件設定",
     "Send email" : "寄送郵件",
     "Log level" : "紀錄層級",
+    "Download logfile" : "下載記錄檔",
     "More" : "更多",
     "Less" : "更少",
+    "How to do backups" : "如何備份",
+    "Advanced monitoring" : "進階監控",
+    "Performance tuning" : "效能調校",
+    "Improving the config.php" : "改進 config.php",
+    "Theming" : "佈景主題",
+    "Hardening and security guidance" : "增強安全性",
     "Version" : "版本",
+    "Developer documentation" : "開發者說明文件",
+    "Experimental applications ahead" : "以下是實驗性質的應用程式",
     "by" : "由",
+    "licensed" : "許可證",
     "Documentation:" : "文件:",
+    "User documentation" : "用戶說明文件",
+    "Admin documentation" : "管理者文件",
+    "Show description …" : "顯示描述",
+    "Hide description …" : "隱藏描述",
+    "Uninstall App" : "刪除 App",
+    "Enable experimental apps" : "啟用測試中的應用程式",
+    "No apps found for your version" : "在您的版本中未找到任何應用程式",
+    "Hey there,<br><br>just letting you know that you now have an %s account.<br><br>Your username: %s<br>Access it: <a href=\"%s\">%s</a><br><br>" : "嗨，<br><br>通知您一聲，您現在有了 %s 的帳號。<br><br>您的帳號： %s<br>開通帳號： <a href=\"%s\">%s</a><br><br>",
     "Cheers!" : "太棒了！",
+    "Hey there,\n\njust letting you know that you now have an %s account.\n\nYour username: %s\nAccess it: %s\n\n" : "嗨，\n\n通知您一聲，您現在有了 %s 的帳號。\n\n您的帳號：%s\n開通帳號：%s\n\n",
+    "Administrator documentation" : "管理者說明文件",
+    "Online documentation" : "線上說明文件",
     "Forum" : "論壇",
+    "Issue tracker" : "問題追蹤",
+    "Commercial support" : "商用支援",
     "Get the apps to sync your files" : "下載應用程式來同步您的檔案",
+    "Desktop client" : "桌面客戶端",
+    "Android app" : "Android 應用程式",
+    "iOS app" : "iOS 應用程式",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">spread the word</a>!" : "若您想支援這個計畫\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">加入開發者</a>\n\t\t或\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\" rel=\"noreferrer\">替我們宣傳</a>!",
     "Show First Run Wizard again" : "再次顯示首次使用精靈",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
     "Password" : "密碼",
@@ -104,31 +160,50 @@
     "Current password" : "目前密碼",
     "New password" : "新密碼",
     "Change password" : "變更密碼",
+    "Full name" : "全名",
+    "No display name set" : "未設置顯示名稱",
     "Email" : "信箱",
     "Your email address" : "您的電子郵件信箱",
     "Fill in an email address to enable password recovery and receive notifications" : "填入電子郵件地址來啟用忘記密碼和接收通知的功能",
+    "No email address set" : "未設置電子郵件信箱",
+    "You are member of the following groups:" : "您的會員帳號歸類在以下群組:",
     "Profile picture" : "個人資料照片",
     "Upload new" : "上傳新的",
     "Select new from Files" : "從已上傳的檔案中選一個",
     "Remove image" : "移除圖片",
+    "Either png or jpg. Ideally square but you will be able to crop it. The file is not allowed to exceed the maximum size of 20 MB." : "可以使用 png 或 jpg 格式，最好是方形的，但是您之後也可以裁剪它。圖片容量最大請勿超過 20 MB。",
     "Your avatar is provided by your original account." : "您的圖像是由您原來的帳號所提供的。",
     "Cancel" : "取消",
     "Choose as profile image" : "設定為大頭貼",
     "Language" : "語言",
     "Help translate" : "幫助翻譯",
+    "Common Name" : "Common Name",
+    "Show storage location" : "顯示儲存位置",
+    "Show last log in" : "顯示最近登入",
+    "Show user backend" : "顯示用戶後台",
+    "Send email to new user" : "寄送郵件給新用戶",
+    "Show email address" : "顯示電子郵件信箱",
     "Username" : "使用者名稱",
+    "E-Mail" : "電子郵件",
     "Create" : "建立",
     "Admin Recovery Password" : "管理者復原密碼",
     "Enter the recovery password in order to recover the users files during password change" : "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
+    "Add Group" : "新增群組",
     "Group" : "群組",
+    "Everyone" : "所有人",
+    "Admins" : "管理者",
     "Default Quota" : "預設容量限制",
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
     "Unlimited" : "無限制",
     "Other" : "其他",
     "Full Name" : "全名",
     "Quota" : "容量限制",
+    "Storage Location" : "儲存位置",
+    "User Backend" : "用戶後台",
+    "Last Login" : "上次登入",
     "change full name" : "變更全名",
     "set new password" : "設定新密碼",
+    "change email address" : "更改電子郵件地址",
     "Default" : "預設"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index e5fe9ff29a..8c58079c2c 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -25,48 +25,23 @@
  */
 
 return array(
-'bg_BG'=>'български език',
-'ca'=>'Català',
-'cs_CZ'=>'Čeština',
-'da'=>'Dansk',
-'de'=>'Deutsch (Persönlich)',
-'de_DE'=>'Deutsch (Förmlich)',
 'el'=>'Ελληνικά',
 'en'=>'English',
-'es'=>'Español',
-'et_EE'=>'Eesti',
 'fa'=>'فارسى',
 'fi_FI'=>'Suomi',
-'fr'=>'Français',
 'hi'=>'हिन्दी',
 'id'=>'Bahasa Indonesia',
-'it'=>'Italiano',
 'lb'=>'Lëtzebuergesch',
-//'l10n-de'=>'',
 'ms_MY'=>'Bahasa Melayu',
 'nb_NO'=>'Norwegian Bokmål',
-'nl'=>'Nederlands',
-'pl'=>'Polski',
 'pt_BR'=>'Português brasileiro',
 'pt_PT'=>'Português',
 'ro'=>'română',
-'ru'=>'Русский язык',
-'sr'=>'Српски',
 'sr@latin'=>'Srpski',
 'sv'=>'Svenska',
-'zh_CN'=>'简体中文',
-'sk_SK'=>'Slovenčina',
 'hu_HU'=>'Magyar',
-'eu'=>'Euskara',
-'lt_LT'=>'Lietuvių',
-'eo'=>'Esperanto',
-'tr'=>'Türkçe',
 'hr'=>'Hrvatski',
 'ar'=>'العربية',
-'he'=>'עִבְרִית,',
-'ia'=>'Interlingua',
-'sl'=>'Slovenski',
-'nn_NO'=>'Nynorsk',
 'lv'=>'Latviešu',
 'mk'=>'македонски',
 'uk'=>'Українська',
@@ -76,9 +51,7 @@ return array(
 'bn_BD'=>'Bengali',
 'ta_LK'=>'தமிழ்',
 'zh_HK'=>'繁體中文（香港）',
-'oc'=>'Occitan (post 1500)',
 'is'=>'Icelandic',
-'pl_PL'=>'Polski',
 'ka_GE'=>'Georgian for Georgia',
 'ku_IQ'=>'Kurdish Iraq',
 'si_LK'=>'Sinhala',
diff --git a/settings/personal.php b/settings/personal.php
index bbbba3b5b8..0cfdc9ed37 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -71,6 +71,7 @@ $languages=array();
 $commonlanguages = array();
 foreach($languageCodes as $lang) {
 	$l = \OC::$server->getL10N('settings', $lang);
+	// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
 	if(substr($l->t('__language_name__'), 0, 1) !== '_') {//first check if the language name is in the translation file
 		$ln=array('code'=>$lang, 'name'=> (string)$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])) {
@@ -94,6 +95,15 @@ ksort($commonlanguages);
 
 // sort now by displayed language not the iso-code
 usort( $languages, function ($a, $b) {
+	if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
+		// If a doesn't have a name, but b does, list b before a
+		return 1;
+	}
+	if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
+		// If a does have a name, but b doesn't, list a before b
+		return -1;
+	}
+	// Otherwise compare the names
 	return strcmp($a['name'], $b['name']);
 });
 
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 888ed82379..36088d9f8c 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -73,7 +73,7 @@ if ($_['getenvServerNotWorking']) {
 ?>
 	<li>
 		<?php p($l->t('php does not seem to be setup properly to query system environment variables. The test with getenv("PATH") only returns an empty response.')); ?><br>
-		<?php p($l->t('Please check the installation documentation for php configuration notes and the php configuration of your server, especially when using php-fpm.')); ?>
+		<?php print_unescaped($l->t('Please check the <a target="_blank" href="%s">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm.', link_to_docs('admin-php-fpm'))); ?>
 	</li>
 <?php
 }
@@ -124,6 +124,15 @@ if (!$_['has_fileinfo']) {
 <?php
 }
 
+// locking configured optimally?
+if ($_['fileLockingType'] === 'none') {
+	?>
+	<li>
+		<?php print_unescaped($l->t('Transactional file locking is disabled, this might lead to issues with race conditions. Enable \'filelocking.enabled\' in config.php to avoid these problems. See the <a target="_blank" href="%s">documentation ↗</a> for more information.', link_to_docs('admin-transactional-locking'))); ?>
+	</li>
+	<?php
+}
+
 // is locale working ?
 if (!$_['isLocaleWorking']) {
 	?>
@@ -172,11 +181,20 @@ if ($_['cronErrors']) {
 	<div class="loading"></div>
 	<ul class="errors hidden"></ul>
 	<ul class="warnings hidden"></ul>
-	<ul class="info hidden"></ul>
+	<ul class="info hidden">
+		<?php if ($_['fileLockingType'] === 'db'):?>
+		<li>
+			<?php print_unescaped($l->t('Transactional file locking is using the database as locking backend, for best performance it\'s advised to configure a memcache for locking. See the <a target="_blank" href="%s">documentation ↗</a> for more information.', link_to_docs('admin-transactional-locking'))); ?>
+		</li>
+		<?php endif; ?>
+	</ul>
 	<p class="hint hidden">
 		<?php print_unescaped($l->t('Please double check the <a target="_blank" href="%s">installation guides ↗</a>, and check for any errors or warnings in the <a href="#log-section">log</a>.', link_to_docs('admin-install'))); ?>
 	</p>
 </div>
+<div id="security-warning-state">
+	<span class="hidden icon-checkmark"><?php p($l->t('All checks passed.'));?></span>
+</div>
 </div>
 
 	<div class="section" id="shareAPI">
@@ -516,19 +534,6 @@ if ($_['cronErrors']) {
 	<?php endif; ?>
 </div>
 
-<div class="section" id="server-status">
-	<h2><?php p($l->t('Server status'));?></h2>
-	<ul>
-		<li>
-			<?php if ($_['fileLockingEnabled']) {
-				p($l->t('Transactional File Locking is enabled.'));
-			} else {
-				p($l->t('Transactional File Locking is disabled.'));
-			} ?>
-		</li>
-	</ul>
-</div>
-
 <div class="section" id="admin-tips">
 	<h2><?php p($l->t('Tips & tricks'));?></h2>
 	<ul>
@@ -551,16 +556,16 @@ if ($_['cronErrors']) {
 	</ul>
 </div>
 
+<?php if (!empty($_['updaterAppPanel'])): ?>
+	<div id="updater"><?php print_unescaped($_['updaterAppPanel']); ?></div>
+<?php endif; ?>
+
 <div class="section">
 	<h2><?php p($l->t('Version'));?></h2>
 	<strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?>
 	<?php include('settings.development.notice.php'); ?>
 </div>
 
-<?php if (!empty($_['updaterAppPanel'])): ?>
-	<div id="updater"><?php print_unescaped($_['updaterAppPanel']); ?></div>
-<?php endif; ?>
-
 <div class="section credits-footer">
 	<p><?php print_unescaped($theme->getShortFooter()); ?></p>
 </div>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 490133c9f2..c0adaf9c5a 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -83,7 +83,7 @@ if($_['passwordChangeSupported']) {
 		placeholder="<?php echo $l->t('New password');?>"
 		data-typetoggle="#personal-show"
 		autocomplete="off" autocapitalize="off" autocorrect="off" />
-	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label>
+	<input type="checkbox" id="personal-show" name="show" /><label for="personal-show" class="svg"></label>
 	<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
 	<br/>
 	<div class="strengthify-wrapper"></div>
diff --git a/settings/users.php b/settings/users.php
index d4e51900dd..843995a57f 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -41,7 +41,7 @@ $groupManager = \OC_Group::getManager();
 // Set the sort option: SORT_USERCOUNT or SORT_GROUPNAME
 $sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT;
 
-if (class_exists('\OCA\user_ldap\GROUP_LDAP')) {
+if (\OC_App::isEnabled('user_ldap')) {
 	$isLDAPUsed =
 		   $groupManager->isBackendUsed('\OCA\user_ldap\GROUP_LDAP')
 		|| $groupManager->isBackendUsed('\OCA\user_ldap\Group_Proxy');
diff --git a/status.php b/status.php
index 6e7bcea526..90250ff261 100644
--- a/status.php
+++ b/status.php
@@ -41,6 +41,7 @@ try {
 	if (OC::$CLI) {
 		print_r($values);
 	} else {
+		header('Access-Control-Allow-Origin: *');
 		header('Content-Type: application/json');
 		echo json_encode($values);
 	}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index bd94ca6775..86bedc3f32 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -8,9 +8,10 @@ if ($configDir) {
 
 require_once __DIR__ . '/../lib/base.php';
 
-// load minimum set of apps
-OC_App::loadApps(array('authentication'));
-OC_App::loadApps(array('filesystem', 'logging'));
+\OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests');
+
+// load all enabled apps
+\OC_App::loadApps();
 
 if (!class_exists('PHPUnit_Framework_TestCase')) {
 	require_once('PHPUnit/Autoload.php');
diff --git a/tests/core/avatar/avatarcontrollertest.php b/tests/core/avatar/avatarcontrollertest.php
index e8fb977fae..9accd5181c 100644
--- a/tests/core/avatar/avatarcontrollertest.php
+++ b/tests/core/avatar/avatarcontrollertest.php
@@ -96,8 +96,12 @@ class AvatarControllerTest extends \Test\TestCase {
 		// Configure userMock
 		$this->userMock->method('getDisplayName')->willReturn($this->user);
 		$this->userMock->method('getUID')->willReturn($this->user);
-		$this->container['UserManager']->method('get')
+		$this->container['UserManager']
+			->method('get')
 			->willReturnMap([[$this->user, $this->userMock]]);
+		$this->container['UserManager']
+			->method('userExists')
+			->willReturnMap([[$this->user, true]]);
 		$this->container['UserSession']->method('getUser')->willReturn($this->userMock);
 
 	}
@@ -120,11 +124,10 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * Fetch an avatar if a user has no avatar
 	 */
 	public function testGetAvatarNoAvatar() {
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->container['UserManager']->expects($this->once())->method('userExists');
+		$this->container['AvatarManager']->expects($this->once())->method('getAvatar')->willReturn($this->avatarMock);
 		$response = $this->avatarController->getAvatar($this->user, 32);
 
-		//Comment out until JS is fixed
-		//$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
 		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
 		$this->assertEquals($this->user, $response->getData()['data']['displayname']);
 	}
@@ -133,9 +136,11 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * Fetch the user's avatar
 	 */
 	public function testGetAvatar() {
+		$this->container['UserManager']->expects($this->once())->method('userExists');
+
 		$image = new Image(OC::$SERVERROOT.'/tests/data/testimage.jpg');
-		$this->avatarMock->method('get')->willReturn($image);
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
+		$this->avatarMock->expects($this->once())->method('get')->willReturn($image);
+		$this->container['AvatarManager']->expects($this->once())->method('getAvatar')->willReturn($this->avatarMock);
 
 		$response = $this->avatarController->getAvatar($this->user, 32);
 
@@ -150,21 +155,19 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * Fetch the avatar of a non-existing user
 	 */
 	public function testGetAvatarNoUser() {
-		$this->avatarMock->method('get')->willReturn(null);
-		$this->container['AvatarManager']->method('getAvatar')->willReturn($this->avatarMock);
-
+		$this->container['UserManager']->expects($this->once())->method('userExists');
 		$response = $this->avatarController->getAvatar($this->user . 'doesnotexist', 32);
 
 		//Comment out until JS is fixed
-		//$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-		$this->assertEquals('', $response->getData()['data']['displayname']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+		$this->assertEquals([], $response->getData());
 	}
 
 	/**
 	 * Make sure we get the correct size
 	 */
 	public function testGetAvatarSize() {
+		$this->container['UserManager']->expects($this->once())->method('userExists');
 		$this->avatarMock->expects($this->once())
 						 ->method('get')
 						 ->with($this->equalTo(32));
@@ -178,6 +181,7 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * We cannot get avatars that are 0 or negative
 	 */
 	public function testGetAvatarSizeMin() {
+		$this->container['UserManager']->expects($this->once())->method('userExists');
 		$this->avatarMock->expects($this->once())
 						 ->method('get')
 						 ->with($this->equalTo(64));
@@ -191,6 +195,7 @@ class AvatarControllerTest extends \Test\TestCase {
 	 * We do not support avatars larger than 2048*2048
 	 */
 	public function testGetAvatarSizeMax() {
+		$this->container['UserManager']->expects($this->once())->method('userExists');
 		$this->avatarMock->expects($this->once())
 						 ->method('get')
 						 ->with($this->equalTo(2048));
diff --git a/tests/core/command/encryption/changekeystorageroottest.php b/tests/core/command/encryption/changekeystorageroottest.php
new file mode 100644
index 0000000000..6cb52cdea9
--- /dev/null
+++ b/tests/core/command/encryption/changekeystorageroottest.php
@@ -0,0 +1,381 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 Tests\Core\Command\Encryption;
+
+
+use OC\Core\Command\Encryption\ChangeKeyStorageRoot;
+use OC\Encryption\Util;
+use OC\Files\View;
+use OCP\IConfig;
+use OCP\IUserManager;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Test\TestCase;
+
+class ChangeKeyStorageRootTest extends TestCase {
+
+	/** @var ChangeKeyStorageRoot */
+	protected $changeKeyStorageRoot;
+
+	/** @var View | \PHPUnit_Framework_MockObject_MockObject */
+	protected $view;
+
+	/** @var IUserManager | \PHPUnit_Framework_MockObject_MockObject */
+	protected $userManager;
+
+	/** @var IConfig | \PHPUnit_Framework_MockObject_MockObject */
+	protected $config;
+
+	/**  @var Util | \PHPUnit_Framework_MockObject_MockObject */
+	protected $util;
+
+	/** @var QuestionHelper | \PHPUnit_Framework_MockObject_MockObject */
+	protected $questionHelper;
+
+	/** @var InputInterface | \PHPUnit_Framework_MockObject_MockObject */
+	protected $inputInterface;
+
+	/** @var OutputInterface | \PHPUnit_Framework_MockObject_MockObject */
+	protected $outputInterface;
+
+	/** @var \OCP\UserInterface |  \PHPUnit_Framework_MockObject_MockObject */
+	protected $userInterface;
+
+	public function setUp() {
+		parent::setUp();
+
+		$this->view = $this->getMock('\OC\Files\View');
+		$this->userManager = $this->getMock('\OCP\IUserManager');
+		$this->config = $this->getMock('\OCP\IConfig');
+		$this->util = $this->getMockBuilder('OC\Encryption\Util')->disableOriginalConstructor()->getMock();
+		$this->questionHelper = $this->getMock('Symfony\Component\Console\Helper\QuestionHelper');
+		$this->inputInterface = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+		$this->outputInterface = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+		$this->userInterface = $this->getMock('\OCP\UserInterface');
+
+		$outputFormaterInterface = $this->getMock('Symfony\Component\Console\Formatter\OutputFormatterInterface');
+		$this->outputInterface->expects($this->any())->method('getFormatter')
+			->willReturn($outputFormaterInterface);
+
+		$this->changeKeyStorageRoot = new ChangeKeyStorageRoot(
+			$this->view,
+			$this->userManager,
+			$this->config,
+			$this->util,
+			$this->questionHelper
+		);
+
+	}
+
+	/**
+	 * @dataProvider dataTestExecute
+	 */
+	public function testExecute($newRoot, $answer, $successMoveKey) {
+
+		$changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot')
+			->setConstructorArgs(
+				[
+					$this->view,
+					$this->userManager,
+					$this->config,
+					$this->util,
+					$this->questionHelper
+				]
+			)->setMethods(['moveAllKeys'])->getMock();
+
+		$this->util->expects($this->once())->method('getKeyStorageRoot')
+			->willReturn('');
+		$this->inputInterface->expects($this->once())->method('getArgument')
+			->with('newRoot')->willReturn($newRoot);
+
+		if ($answer === true || $newRoot !== null) {
+			$changeKeyStorageRoot->expects($this->once())->method('moveAllKeys')
+				->willReturn($successMoveKey);
+		} else {
+			$changeKeyStorageRoot->expects($this->never())->method('moveAllKeys');
+		}
+
+		if ($successMoveKey === true) {
+			$this->util->expects($this->once())->method('setKeyStorageRoot');
+		} else {
+			$this->util->expects($this->never())->method('setKeyStorageRoot');
+		}
+
+		if ($newRoot === null) {
+			$this->questionHelper->expects($this->once())->method('ask')->willReturn($answer);
+		} else {
+			$this->questionHelper->expects($this->never())->method('ask');
+		}
+
+		$this->invokePrivate(
+			$changeKeyStorageRoot,
+			'execute',
+			[$this->inputInterface, $this->outputInterface]
+		);
+	}
+
+	public function dataTestExecute() {
+		return [
+			[null, true, true],
+			[null, true, false],
+			[null, false, null],
+			['/newRoot', null, true],
+			['/newRoot', null, false]
+		];
+	}
+
+	public function testMoveAllKeys() {
+
+		/** @var \OC\Core\Command\Encryption\ChangeKeyStorageRoot $changeKeyStorageRoot */
+		$changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot')
+			->setConstructorArgs(
+				[
+					$this->view,
+					$this->userManager,
+					$this->config,
+					$this->util,
+					$this->questionHelper
+				]
+			)->setMethods(['prepareNewRoot', 'moveSystemKeys', 'moveUserKeys'])->getMock();
+
+		$changeKeyStorageRoot->expects($this->at(0))->method('prepareNewRoot')->with('newRoot');
+		$changeKeyStorageRoot->expects($this->at(1))->method('moveSystemKeys')->with('oldRoot', 'newRoot');
+		$changeKeyStorageRoot->expects($this->at(2))->method('moveUserKeys')->with('oldRoot', 'newRoot', $this->outputInterface);
+
+		$this->invokePrivate($changeKeyStorageRoot, 'moveAllKeys', ['oldRoot', 'newRoot', $this->outputInterface]);
+
+	}
+
+	public function testPrepareNewRoot() {
+		$this->view->expects($this->once())->method('is_dir')->with('newRoot')
+			->willReturn(true);
+
+		$this->view->expects($this->once())->method('file_put_contents')
+			->with('newRoot/' . \OC\Encryption\Keys\Storage::KEY_STORAGE_MARKER,
+				'ownCloud will detect this folder as key storage root only if this file exists');
+
+		$this->invokePrivate($this->changeKeyStorageRoot, 'prepareNewRoot', ['newRoot']);
+	}
+
+	/**
+	 * @dataProvider dataTestPrepareNewRootException
+	 * @expectedException \Exception
+	 *
+	 * @param bool $dirExists
+	 * @param bool $couldCreateFile
+	 */
+	public function testPrepareNewRootException($dirExists, $couldCreateFile) {
+		$this->view->expects($this->once())->method('is_dir')->with('newRoot')
+			->willReturn($dirExists);
+		$this->view->expects($this->any())->method('file_put_contents')->willReturn($couldCreateFile);
+
+		$this->invokePrivate($this->changeKeyStorageRoot, 'prepareNewRoot', ['newRoot']);
+	}
+
+	public function dataTestPrepareNewRootException() {
+		return [
+			[true, false],
+			[false, true]
+		];
+	}
+
+	/**
+	 * @dataProvider dataTestMoveSystemKeys
+	 *
+	 * @param bool $dirExists
+	 * @param bool $targetExists
+	 * @param bool $executeRename
+	 */
+	public function testMoveSystemKeys($dirExists, $targetExists, $executeRename) {
+
+		$changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot')
+			->setConstructorArgs(
+				[
+					$this->view,
+					$this->userManager,
+					$this->config,
+					$this->util,
+					$this->questionHelper
+				]
+			)->setMethods(['targetExists'])->getMock();
+
+		$this->view->expects($this->once())->method('is_dir')
+			->with('oldRoot/files_encryption')->willReturn($dirExists);
+		$changeKeyStorageRoot->expects($this->any())->method('targetExists')
+			->with('newRoot/files_encryption')->willReturn($targetExists);
+
+		if ($executeRename) {
+			$this->view->expects($this->once())->method('rename')
+			->with('oldRoot/files_encryption', 'newRoot/files_encryption');
+		} else {
+			$this->view->expects($this->never())->method('rename');
+		}
+
+		$this->invokePrivate($changeKeyStorageRoot, 'moveSystemKeys', ['oldRoot', 'newRoot']);
+
+	}
+
+	public function dataTestMoveSystemKeys() {
+		return [
+			[true, false, true],
+			[false, true, false],
+			[true, true, false],
+			[false, false, false]
+		];
+	}
+
+
+	public function testMoveUserKeys() {
+
+		$changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot')
+			->setConstructorArgs(
+				[
+					$this->view,
+					$this->userManager,
+					$this->config,
+					$this->util,
+					$this->questionHelper
+				]
+			)->setMethods(['setupUserFS', 'moveUserEncryptionFolder'])->getMock();
+
+		$this->userManager->expects($this->once())->method('getBackends')
+			->willReturn([$this->userInterface]);
+		$this->userInterface->expects($this->once())->method('getUsers')
+			->willReturn(['user1', 'user2']);
+		$changeKeyStorageRoot->expects($this->exactly(2))->method('setupUserFS');
+		$changeKeyStorageRoot->expects($this->exactly(2))->method('moveUserEncryptionFolder');
+
+		$this->invokePrivate($changeKeyStorageRoot, 'moveUserKeys', ['oldRoot', 'newRoot', $this->outputInterface]);
+	}
+
+	/**
+	 * @dataProvider dataTestMoveUserEncryptionFolder
+	 *
+	 * @param bool $userExists
+	 * @param bool $isDir
+	 * @param bool $targetExists
+	 * @param bool $shouldRename
+	 */
+	public function testMoveUserEncryptionFolder($userExists, $isDir, $targetExists, $shouldRename) {
+
+		$changeKeyStorageRoot = $this->getMockBuilder('OC\Core\Command\Encryption\ChangeKeyStorageRoot')
+			->setConstructorArgs(
+				[
+					$this->view,
+					$this->userManager,
+					$this->config,
+					$this->util,
+					$this->questionHelper
+				]
+			)->setMethods(['targetExists', 'prepareParentFolder'])->getMock();
+
+		$this->userManager->expects($this->once())->method('userExists')
+			->willReturn($userExists);
+		$this->view->expects($this->any())->method('is_dir')
+			->willReturn($isDir);
+		$changeKeyStorageRoot->expects($this->any())->method('targetExists')
+			->willReturn($targetExists);
+
+		if ($shouldRename) {
+			$changeKeyStorageRoot->expects($this->once())->method('prepareParentFolder')
+				->with('newRoot/user1');
+			$this->view->expects($this->once())->method('rename')
+				->with('oldRoot/user1/files_encryption', 'newRoot/user1/files_encryption');
+		} else {
+			$changeKeyStorageRoot->expects($this->never())->method('prepareParentFolder');
+			$this->view->expects($this->never())->method('rename');
+		}
+
+		$this->invokePrivate($changeKeyStorageRoot, 'moveUserEncryptionFolder', ['user1', 'oldRoot', 'newRoot']);
+
+	}
+
+	public function dataTestMoveUserEncryptionFolder() {
+		return [
+			[true, true, false, true],
+			[true, false, true, false],
+			[false, true, true, false],
+			[false, false, true, false],
+			[false, true, false, false],
+			[false, true, true, false],
+			[false, false, false, false]
+		];
+	}
+
+
+	/**
+	 * @dataProvider dataTestPrepareParentFolder
+	 */
+	public function testPrepareParentFolder($path, $pathExists) {
+		$this->view->expects($this->any())->method('file_exists')
+			->willReturnCallback(
+				function($fileExistsPath) use ($path, $pathExists) {
+					if ($path === $fileExistsPath) {
+						return $pathExists;
+					}
+					return false;
+				}
+			);
+
+		if ($pathExists === false) {
+			$subDirs = explode('/', ltrim($path, '/'));
+			$this->view->expects($this->exactly(count($subDirs)))->method('mkdir');
+		} else {
+			$this->view->expects($this->never())->method('mkdir');
+		}
+
+		$this->invokePrivate(
+			$this->changeKeyStorageRoot,
+			'prepareParentFolder',
+			[$path]
+		);
+	}
+
+	public function dataTestPrepareParentFolder() {
+		return [
+			['/user/folder/sub_folder/keystorage', true],
+			['/user/folder/sub_folder/keystorage', false]
+		];
+	}
+
+	public function testTargetExists() {
+		$this->view->expects($this->once())->method('file_exists')->with('path')
+			->willReturn(false);
+
+		$this->assertFalse(
+			$this->invokePrivate($this->changeKeyStorageRoot, 'targetExists', ['path'])
+		);
+	}
+
+	/**
+	 * @expectedException \Exception
+	 */
+	public function testTargetExistsException() {
+		$this->view->expects($this->once())->method('file_exists')->with('path')
+			->willReturn(true);
+
+		$this->invokePrivate($this->changeKeyStorageRoot, 'targetExists', ['path']);
+	}
+
+}
diff --git a/tests/core/command/encryption/encryptalltest.php b/tests/core/command/encryption/encryptalltest.php
new file mode 100644
index 0000000000..41edee6987
--- /dev/null
+++ b/tests/core/command/encryption/encryptalltest.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * @author Björn Schießle <schiessle@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 Tests\Core\Command\Encryption;
+
+
+use OC\Core\Command\Encryption\EncryptAll;
+use Test\TestCase;
+
+class EncryptAllTest extends TestCase {
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\IConfig */
+	protected $config;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\Encryption\IManager  */
+	protected $encryptionManager;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\App\IAppManager  */
+	protected $appManager;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject  | \Symfony\Component\Console\Input\InputInterface */
+	protected $consoleInput;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Output\OutputInterface */
+	protected $consoleOutput;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \Symfony\Component\Console\Helper\QuestionHelper */
+	protected $questionHelper;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject | \OCP\Encryption\IEncryptionModule */
+	protected $encryptionModule;
+
+	/** @var  EncryptAll */
+	protected $command;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->encryptionManager = $this->getMockBuilder('OCP\Encryption\IManager')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->appManager = $this->getMockBuilder('OCP\App\IAppManager')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->questionHelper = $this->getMockBuilder('Symfony\Component\Console\Helper\QuestionHelper')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+		$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+
+	}
+
+	public function testEncryptAll() {
+		// trash bin needs to be disabled in order to avoid adding dummy files to the users
+		// trash bin which gets deleted during the encryption process
+		$this->appManager->expects($this->once())->method('disableApp')->with('files_trashbin');
+		// enable single user mode to avoid that other user login during encryption
+		// destructor should disable the single user mode again
+		$this->config->expects($this->once())->method('getSystemValue')->with('singleUser', false)->willReturn(false);
+		$this->config->expects($this->at(1))->method('setSystemValue')->with('singleUser', true);
+		$this->config->expects($this->at(2))->method('setSystemValue')->with('singleUser', false);
+
+		new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
+	}
+
+	/**
+	 * @dataProvider dataTestExecute
+	 */
+	public function testExecute($answer, $askResult) {
+
+		$command = new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
+
+		$this->encryptionManager->expects($this->once())->method('isEnabled')->willReturn(true);
+		$this->questionHelper->expects($this->once())->method('ask')->willReturn($askResult);
+
+		if ($answer === 'Y' || $answer === 'y') {
+			$this->encryptionManager->expects($this->once())
+				->method('getEncryptionModule')->willReturn($this->encryptionModule);
+			$this->encryptionModule->expects($this->once())
+				->method('encryptAll')->with($this->consoleInput, $this->consoleOutput);
+		} else {
+			$this->encryptionManager->expects($this->never())->method('getEncryptionModule');
+			$this->encryptionModule->expects($this->never())->method('encryptAll');
+		}
+
+		$this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+	public function dataTestExecute() {
+		return [
+			['y', true], ['Y', true], ['n', false], ['N', false], ['', false]
+		];
+	}
+
+	/**
+	 * @expectedException \Exception
+	 */
+	public function testExecuteException() {
+		$command = new EncryptAll($this->encryptionManager, $this->appManager, $this->config, $this->questionHelper);
+		$this->encryptionManager->expects($this->once())->method('isEnabled')->willReturn(false);
+		$this->encryptionManager->expects($this->never())->method('getEncryptionModule');
+		$this->encryptionModule->expects($this->never())->method('encryptAll');
+		$this->invokePrivate($command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+}
diff --git a/tests/core/command/maintenance/mimetype/updatedbtest.php b/tests/core/command/maintenance/mimetype/updatedbtest.php
new file mode 100644
index 0000000000..217301102c
--- /dev/null
+++ b/tests/core/command/maintenance/mimetype/updatedbtest.php
@@ -0,0 +1,184 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 Tests\Core\Command\Maintenance\Mimetype;
+
+use OC\Core\Command\Maintenance\Mimetype\UpdateDB;
+use Test\TestCase;
+use OCP\Files\IMimeTypeDetector;
+use OCP\Files\IMimeTypeLoader;
+
+class UpdateDBTest extends TestCase {
+	/** @var IMimeTypeDetector */
+	protected $detector;
+	/** @var IMimeTypeLoader */
+	protected $loader;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleInput;
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $consoleOutput;
+
+	/** @var \Symfony\Component\Console\Command\Command */
+	protected $command;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->detector = $this->getMockBuilder('OC\Files\Type\Detection')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->loader = $this->getMockBuilder('OC\Files\Type\Loader')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
+		$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
+
+		$this->command = new UpdateDB($this->detector, $this->loader);
+	}
+
+	public function testNoop() {
+		$this->consoleInput->method('getOption')
+			->with('repair-filecache')
+			->willReturn(false);
+
+		$this->detector->expects($this->once())
+			->method('getAllMappings')
+			->willReturn([
+				'ext' => ['testing/existingmimetype']
+			]);
+		$this->loader->expects($this->once())
+			->method('exists')
+			->with('testing/existingmimetype')
+			->willReturn(true);
+
+		$this->loader->expects($this->never())
+			->method('updateFilecache');
+
+		$this->consoleOutput->expects($this->at(0))
+			->method('writeln')
+			->with('Added 0 new mimetypes');
+		$this->consoleOutput->expects($this->at(1))
+			->method('writeln')
+			->with('Updated 0 filecache rows');
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+	public function testAddMimetype() {
+		$this->consoleInput->method('getOption')
+			->with('repair-filecache')
+			->willReturn(false);
+
+		$this->detector->expects($this->once())
+			->method('getAllMappings')
+			->willReturn([
+				'ext' => ['testing/existingmimetype'],
+				'new' => ['testing/newmimetype']
+			]);
+		$this->loader->expects($this->exactly(2))
+			->method('exists')
+			->will($this->returnValueMap([
+				['testing/existingmimetype', true],
+				['testing/newmimetype', false],
+			]));
+		$this->loader->expects($this->exactly(2))
+			->method('getId')
+			->will($this->returnValueMap([
+				['testing/existingmimetype', 1],
+				['testing/newmimetype', 2],
+			]));
+
+		$this->loader->expects($this->once())
+			->method('updateFilecache')
+			->with('new', 2)
+			->willReturn(3);
+
+		$this->consoleOutput->expects($this->at(0))
+			->method('writeln')
+			->with('Added mimetype "testing/newmimetype" to database');
+		$this->consoleOutput->expects($this->at(1))
+			->method('writeln')
+			->with('Updated 3 filecache rows for mimetype "testing/newmimetype"');
+
+		$this->consoleOutput->expects($this->at(2))
+			->method('writeln')
+			->with('Added 1 new mimetypes');
+		$this->consoleOutput->expects($this->at(3))
+			->method('writeln')
+			->with('Updated 3 filecache rows');
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+	public function testSkipComments() {
+		$this->detector->expects($this->once())
+			->method('getAllMappings')
+			->willReturn([
+				'_comment' => 'some comment in the JSON'
+			]);
+		$this->loader->expects($this->never())
+			->method('exists');
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+
+	public function testRepairFilecache() {
+		$this->consoleInput->method('getOption')
+			->with('repair-filecache')
+			->willReturn(true);
+
+		$this->detector->expects($this->once())
+			->method('getAllMappings')
+			->willReturn([
+				'ext' => ['testing/existingmimetype'],
+			]);
+		$this->loader->expects($this->exactly(1))
+			->method('exists')
+			->will($this->returnValueMap([
+				['testing/existingmimetype', true],
+			]));
+		$this->loader->expects($this->exactly(1))
+			->method('getId')
+			->will($this->returnValueMap([
+				['testing/existingmimetype', 1],
+			]));
+
+		$this->loader->expects($this->once())
+			->method('updateFilecache')
+			->with('ext', 1)
+			->willReturn(3);
+
+		$this->consoleOutput->expects($this->at(0))
+			->method('writeln')
+			->with('Updated 3 filecache rows for mimetype "testing/existingmimetype"');
+
+		$this->consoleOutput->expects($this->at(1))
+			->method('writeln')
+			->with('Added 0 new mimetypes');
+		$this->consoleOutput->expects($this->at(2))
+			->method('writeln')
+			->with('Updated 3 filecache rows');
+
+		self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
+	}
+}
diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/lostpassword/controller/lostcontrollertest.php
index f82fc1ba3f..0f8cb4fc5c 100644
--- a/tests/core/lostpassword/controller/lostcontrollertest.php
+++ b/tests/core/lostpassword/controller/lostcontrollertest.php
@@ -1,9 +1,22 @@
 <?php
 /**
- * Copyright (c) 2014-2015 Lukas Reschke <lukas@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * @author Lukas Reschke <lukas@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Core\LostPassword\Controller;
@@ -47,6 +60,8 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 			->disableOriginalConstructor()->getMock();
 		$this->container['SecureRandom'] = $this->getMockBuilder('\OCP\Security\ISecureRandom')
 			->disableOriginalConstructor()->getMock();
+		$this->container['TimeFactory'] = $this->getMockBuilder('\OCP\AppFramework\Utility\ITimeFactory')
+			->disableOriginalConstructor()->getMock();
 		$this->container['IsEncryptionEnabled'] = true;
 		$this->lostController = $this->container['LostController'];
 	}
@@ -116,6 +131,10 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 			->method('userExists')
 			->with('ExistingUser')
 			->will($this->returnValue(true));
+		$this->container['TimeFactory']
+			->expects($this->once())
+			->method('getTime')
+			->will($this->returnValue(12348));
 		$this->container['Config']
 			->expects($this->once())
 			->method('getUserValue')
@@ -128,7 +147,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 		$this->container['Config']
 			->expects($this->once())
 			->method('setUserValue')
-			->with('ExistingUser', 'owncloud', 'lostpassword', 'ThisIsMaybeANotSoSecretToken!');
+			->with('ExistingUser', 'owncloud', 'lostpassword', '12348:ThisIsMaybeANotSoSecretToken!');
 		$this->container['URLGenerator']
 			->expects($this->once())
 			->method('linkToRouteAbsolute')
@@ -190,7 +209,11 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 		$this->container['Config']
 			->expects($this->once())
 			->method('setUserValue')
-			->with('ExistingUser', 'owncloud', 'lostpassword', 'ThisIsMaybeANotSoSecretToken!');
+			->with('ExistingUser', 'owncloud', 'lostpassword', '12348:ThisIsMaybeANotSoSecretToken!');
+		$this->container['TimeFactory']
+			->expects($this->once())
+			->method('getTime')
+			->will($this->returnValue(12348));
 		$this->container['URLGenerator']
 			->expects($this->once())
 			->method('linkToRouteAbsolute')
@@ -256,9 +279,13 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 			->expects($this->once())
 			->method('getUserValue')
 			->with('ValidTokenUser', 'owncloud', 'lostpassword', null)
-			->will($this->returnValue('TheOnlyAndOnlyOneTokenToResetThePassword'));
+			->will($this->returnValue('12345:TheOnlyAndOnlyOneTokenToResetThePassword'));
 		$user = $this->getMockBuilder('\OCP\IUser')
 			->disableOriginalConstructor()->getMock();
+		$user
+			->expects($this->once())
+			->method('getLastLogin')
+			->will($this->returnValue(12344));
 		$user->expects($this->once())
 			->method('setPassword')
 			->with('NewPassword')
@@ -272,12 +299,94 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 			->expects($this->once())
 			->method('deleteUserValue')
 			->with('ValidTokenUser', 'owncloud', 'lostpassword');
+		$this->container['TimeFactory']
+			->expects($this->once())
+			->method('getTime')
+			->will($this->returnValue(12348));
 
 		$response = $this->lostController->setPassword('TheOnlyAndOnlyOneTokenToResetThePassword', 'ValidTokenUser', 'NewPassword', true);
 		$expectedResponse = array('status' => 'success');
 		$this->assertSame($expectedResponse, $response);
 	}
 
+	public function testSetPasswordExpiredToken() {
+		$this->container['Config']
+			->expects($this->once())
+			->method('getUserValue')
+			->with('ValidTokenUser', 'owncloud', 'lostpassword', null)
+			->will($this->returnValue('12345:TheOnlyAndOnlyOneTokenToResetThePassword'));
+		$user = $this->getMockBuilder('\OCP\IUser')
+			->disableOriginalConstructor()->getMock();
+		$this->container['UserManager']
+			->expects($this->once())
+			->method('get')
+			->with('ValidTokenUser')
+			->will($this->returnValue($user));
+		$this->container['TimeFactory']
+			->expects($this->once())
+			->method('getTime')
+			->will($this->returnValue(55546));
+
+		$response = $this->lostController->setPassword('TheOnlyAndOnlyOneTokenToResetThePassword', 'ValidTokenUser', 'NewPassword', true);
+		$expectedResponse = [
+			'status' => 'error',
+			'msg' => 'Couldn\'t reset password because the token is expired',
+		];
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testSetPasswordInvalidDataInDb() {
+		$this->container['Config']
+			->expects($this->once())
+			->method('getUserValue')
+			->with('ValidTokenUser', 'owncloud', 'lostpassword', null)
+			->will($this->returnValue('TheOnlyAndOnlyOneTokenToResetThePassword'));
+		$user = $this->getMockBuilder('\OCP\IUser')
+			->disableOriginalConstructor()->getMock();
+		$this->container['UserManager']
+			->expects($this->once())
+			->method('get')
+			->with('ValidTokenUser')
+			->will($this->returnValue($user));
+
+		$response = $this->lostController->setPassword('TheOnlyAndOnlyOneTokenToResetThePassword', 'ValidTokenUser', 'NewPassword', true);
+		$expectedResponse = [
+			'status' => 'error',
+			'msg' => 'Couldn\'t reset password because the token is invalid',
+		];
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testSetPasswordExpiredTokenDueToLogin() {
+		$this->container['Config']
+			->expects($this->once())
+			->method('getUserValue')
+			->with('ValidTokenUser', 'owncloud', 'lostpassword', null)
+			->will($this->returnValue('12345:TheOnlyAndOnlyOneTokenToResetThePassword'));
+		$user = $this->getMockBuilder('\OCP\IUser')
+			->disableOriginalConstructor()->getMock();
+		$user
+			->expects($this->once())
+			->method('getLastLogin')
+			->will($this->returnValue(12346));
+		$this->container['UserManager']
+			->expects($this->once())
+			->method('get')
+			->with('ValidTokenUser')
+			->will($this->returnValue($user));
+		$this->container['TimeFactory']
+			->expects($this->once())
+			->method('getTime')
+			->will($this->returnValue(12345));
+
+		$response = $this->lostController->setPassword('TheOnlyAndOnlyOneTokenToResetThePassword', 'ValidTokenUser', 'NewPassword', true);
+		$expectedResponse = [
+			'status' => 'error',
+			'msg' => 'Couldn\'t reset password because the token is expired',
+		];
+		$this->assertSame($expectedResponse, $response);
+	}
+
 	public function testIsSetPasswordWithoutTokenFailing() {
 		$this->container['Config']
 			->expects($this->once())
diff --git a/tests/data/certificates/badCertificate.crt b/tests/data/certificates/badCertificate.crt
index dcb1895fba..c61c1e6aec 100644
--- a/tests/data/certificates/badCertificate.crt
+++ b/tests/data/certificates/badCertificate.crt
@@ -1,13 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIICATCCAWoCCQDNdmb4pJrUeDANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJB
-VTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0
-cyBQdHkgTHRkMB4XDTE0MDgyNzA4NDg1MVoXDTE1MDgyNzA4NDg1MVowRTELMAkG
-A1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0
-IFdpZGdpdHMgUHR5IEx0ZDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvrMe
-x5D45HVMV2U4kqTU0mzHAihHT6r+OtO6g7S9yIlJZGGVcEet6An78Ow7aYM141eI
-Jfbvqql7OIblHXSw7mvkw4bOQ1ee5lmJYOYCgaMNJ6mBLJfpK9xwidb0ZvhWOA8P
-DLIiBKA3T5ChXCzilD5GF2+H/BXBE9lL9tuDjM0CAwEAATANBgkqhkiG9w0BAQUF
-AAOBgQCJwfJe7j+aNkopw+P8uxobfOnMWU9XC4Pu+39TVLeakeSqu2Y8vJSHmkjF
-WK3VXAJr33Eul5VP/3SWGwuRPd9X4i4iLh1gJfYvi9MJf1lQNYncGCM+xtdrNu2O
-u0yexkOBRrapDYjcv58BiOaFgvFLquKvtVj9HlcYRfwfM77uKQ==
+MIIDtTCCAp2gAwIBAgIJAJ9c5xX3Bf7cMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQwHhcNMTUwODI3MjAxOTEzWhcNMjUwODI0MjAxOTEzWjBF
+MQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50
+ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApYxB04E1rGUCopazf8PsW+3EYrX8J1Ze4g3jRJEmzqHLB4+T4h45LwLl
+D7OLJCLdYA8sfEruInokNV1oUBGDwBWdZA1w7d4o7Wgwiz7WE0FQwkA7YpvtKK2K
+Xvv5wltdUzI+WpbfhHzlg8XIDCPA0ayWx2CDyqsHMXYNOvov1vPbIASF0nBGnRSK
+5Eu7KUKK5UkO8+G6RqBwxQkd/tB2GV68npls++QzA0nf3IIHcc+yNQqaMnb5CVxg
+z2i98VuvCPzYY/EWHkIGdSSKRqRG4sqRegb6d/qf46NfjVYLziLfsFGFH4fLVy6n
+IxkP0gdnoTGu8K8H6wm57GViGLLsPwIDAQABo4GnMIGkMB0GA1UdDgQWBBRrMYy8
+SOqiMiVdo/dfyN6yftK+jzB1BgNVHSMEbjBsgBRrMYy8SOqiMiVdo/dfyN6yftK+
+j6FJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV
+BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAJ9c5xX3Bf7cMAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHargAErj8TAhMfozjgqRihCSOIO5DX7
+W/7mBImP6B76ctP+PWzEaGrOPO81WR5apZP72cwnXD6WABKd1YhMSyr2NI++y5jP
+c3KF/3MpGu4ZYV39JUVpfeq5Fzu9d9C49tj384vljixsxeaCUKuZYqyPuHeGr14u
+7UytsqYORRy/rG4xm0mhk/srOzKJlRenSc9QiWH2Mxst55+cj7zXXFG54N7rI3UU
+9e4Lc2NHQLv3Xv6FunC9mB/AUuEcI6XS6CqNyzAtPAvbO6MZGwUft/S/2TAyqJB0
+VsXK3j3X8DJCwruNLGA3Q/TAYHqrElYg8N4b6w4LD91WbrRyWvkCXmM=
 -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/tests/data/certificates/goodCertificate.crt b/tests/data/certificates/goodCertificate.crt
index 4a5d7bd32f..4072c8db2d 100644
--- a/tests/data/certificates/goodCertificate.crt
+++ b/tests/data/certificates/goodCertificate.crt
@@ -1,15 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIICazCCAdQCCQCySF7HjQD78DANBgkqhkiG9w0BAQUFADB6MQswCQYDVQQGEwJD
-SDEPMA0GA1UECBMGWnVyaWNoMQ8wDQYDVQQHEwZadXJpY2gxFjAUBgNVBAoTDW93
-bkNsb3VkIEluYy4xETAPBgNVBAsTCFNlY3VyaXR5MR4wHAYDVQQDExVzZWN1cml0
-eS5vd25jbG91ZC5jb20wHhcNMTQwODI3MDg0NTUyWhcNMTUwODI3MDg0NTUyWjB6
-MQswCQYDVQQGEwJDSDEPMA0GA1UECBMGWnVyaWNoMQ8wDQYDVQQHEwZadXJpY2gx
-FjAUBgNVBAoTDW93bkNsb3VkIEluYy4xETAPBgNVBAsTCFNlY3VyaXR5MR4wHAYD
-VQQDExVzZWN1cml0eS5vd25jbG91ZC5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0A
-MIGJAoGBAL55lB4RvU0pTyh7YsLCxPBq43xxkRZBxfZENoflCIUsBo7/mXNz2zVO
-476oQ4L47heUOX3j8kemOgPmWEqA34JB8rusijCy5WqFBLnm4HsRLa66i+Jgd+Yl
-QhcKvhGas1K/CVTG4oSLoAmA2coZUL94uxnRtd8aluflHMNGApIlAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADgYEADo08zWdOtIvCKFDnLbzRwIjSYTlAtQtQaULv7KQe3qIn
-iaFAi6fAynHfdC8/2tvmSeniw0OZBkrfVGIVtUbwCSrljNSUY/lWrUR0pE61lb4r
-DpX0JZjlk48XEaErRVDfu3wq6n/2nYg6HnaLOPwt8OSYYrxzvXlFPrKBH3q6R+M=
+MIIEADCCAuigAwIBAgIJAN0NPgU09qt9MA0GCSqGSIb3DQEBBQUAMF0xCzAJBgNV
+BAYTAkNIMRIwEAYDVQQIEwlTdC5HYWxsZW4xGjAYBgNVBAoTEW93bkNsb3VkIFNl
+Y3VyaXR5MR4wHAYDVQQDExVzZWN1cml0eS5vd25jbG91ZC5jb20wHhcNMTUwODI3
+MjAwMzQyWhcNMjUwODI0MjAwMzQyWjBdMQswCQYDVQQGEwJDSDESMBAGA1UECBMJ
+U3QuR2FsbGVuMRowGAYDVQQKExFvd25DbG91ZCBTZWN1cml0eTEeMBwGA1UEAxMV
+c2VjdXJpdHkub3duY2xvdWQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAlxdUFrwhvT+Exp78Nk0A8Zpfi9/XoLyQkKWH162HX++mxtGXrFKAl5PT
+fKRAv0VqY8hincT+6AlzQkdtiOi5OSVFJpeubtSKrShJQyDKmGLlDntanfLc69GT
+EhkznHmA8AeQMK/NApQpOSC+nmdxpu1aKk7QkSYfpmZ41HF8zKWJTyXzFPZGKw+l
+YxfzIxmUMIIZvfeWE3hq3qlJcS+KO8NcCHEpoiVvZp7PpfDTnyOQVjSkWg55c4j6
+cqNgJ93WTOTOE+3D1XF43Oo+0VQivJn7/tQmIOAg+YyL3Sjmzjb8sP0ksx17vpLO
+Z73UShJw5AGtoaS4oQkSd/+qYBwQMwIDAQABo4HCMIG/MB0GA1UdDgQWBBSG7JAe
+KoR82sQ60QhMNWdU4qY6YzCBjwYDVR0jBIGHMIGEgBSG7JAeKoR82sQ60QhMNWdU
+4qY6Y6FhpF8wXTELMAkGA1UEBhMCQ0gxEjAQBgNVBAgTCVN0LkdhbGxlbjEaMBgG
+A1UEChMRb3duQ2xvdWQgU2VjdXJpdHkxHjAcBgNVBAMTFXNlY3VyaXR5Lm93bmNs
+b3VkLmNvbYIJAN0NPgU09qt9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBAJL9LKzWSJCTG0r+pNXw6Xy2DW9xbi3YsUeelkMKMqurmiH59P90juOJQgIC
+B1Jcn/U0rzpJpolI3jJNjHzs/kI4MDkzcKGV84Pqwj+PSdMFK3OCWH/J81lUhrCj
+H3yguZ/JpAisInVeBqg6lRf0X+S8jJIp4ZP2XZJsX70XgkRsEaC9TrlxtFsm839t
+WhroMb25Njm9eAdSYrx5PFDwN8TtJlb5Ve3uZL8D0uBv+p0kWjkt1TrDk2x78F6b
+5ExmE9+APc0gcLtSVwIGX6FDXOcOA8ndkp7p4K0CDnMZfFAU0oKxvnDxehrVKQEL
+os/cq7EKmmsY/rM0uJ6L0ka4WUk=
 -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/tests/karma.config.js b/tests/karma.config.js
index 7b3877f776..d3280b2939 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -70,6 +70,16 @@ module.exports = function(config) {
 				],
 				testFiles: ['apps/files_external/tests/js/*.js']
 			},
+			{
+				name: 'files_versions',
+				srcFiles: [
+					// need to enforce loading order...
+					'apps/files_versions/js/versionmodel.js',
+					'apps/files_versions/js/versioncollection.js',
+					'apps/files_versions/js/versionstabview.js'
+				],
+				testFiles: ['apps/files_versions/tests/js/**/*.js']
+			},
 			{
 				name: 'settings',
 				srcFiles: [
diff --git a/tests/lib/appconfig.php b/tests/lib/appconfig.php
index 5a2cb3f88f..98420abe7b 100644
--- a/tests/lib/appconfig.php
+++ b/tests/lib/appconfig.php
@@ -7,49 +7,123 @@
  * See the COPYING-README file.
  */
 
-class Test_Appconfig extends \Test\TestCase {
+namespace Test\Lib;
+
+use Test\TestCase;
+
+class AppConfig extends TestCase {
 	/** @var \OCP\IAppConfig */
 	protected $appConfig;
 
 	/** @var \OCP\IDBConnection */
 	protected $connection;
 
+	protected $originalConfig;
+
 	public function setUp() {
 		parent::setUp();
 
 		$this->connection = \OC::$server->getDatabaseConnection();
-		$this->registerAppConfig(new \OC\AppConfig(\OC::$server->getDatabaseConnection()));
+		$sql = $this->connection->getQueryBuilder();
+		$sql->select('*')
+			->from('appconfig');
+		$result = $sql->execute();
+		$this->originalConfig = $result->fetchAll();
+		$result->closeCursor();
 
-		$query = $this->connection->prepare('DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ?');
-		$query->execute(array('testapp'));
-		$query->execute(array('someapp'));
-		$query->execute(array('123456'));
-		$query->execute(array('anotherapp'));
+		$sql = $this->connection->getQueryBuilder();
+		$sql->delete('appconfig');
+		$sql->execute();
 
-		$query = $this->connection->prepare('INSERT INTO `*PREFIX*appconfig` VALUES (?, ?, ?)');
+		$this->registerAppConfig(new \OC\AppConfig($this->connection));
 
-		$query->execute(array('testapp', 'enabled', 'true'));
-		$query->execute(array('testapp', 'installed_version', '1.2.3'));
-		$query->execute(array('testapp', 'depends_on', 'someapp'));
-		$query->execute(array('testapp', 'deletethis', 'deletethis'));
-		$query->execute(array('testapp', 'key', 'value'));
+		$sql = $this->connection->getQueryBuilder();
+		$sql->insert('appconfig')
+			->values([
+				'appid' => $sql->createParameter('appid'),
+				'configkey' => $sql->createParameter('configkey'),
+				'configvalue' => $sql->createParameter('configvalue'),
+			]);
 
-		$query->execute(array('someapp', 'key', 'value'));
-		$query->execute(array('someapp', 'otherkey', 'othervalue'));
+		$sql->setParameters([
+			'appid' => 'testapp',
+			'configkey' => 'enabled',
+			'configvalue' => 'true',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'testapp',
+			'configkey' => 'installed_version',
+			'configvalue' => '1.2.3',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'testapp',
+			'configkey' => 'depends_on',
+			'configvalue' => 'someapp',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'testapp',
+			'configkey' => 'deletethis',
+			'configvalue' => 'deletethis',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'testapp',
+			'configkey' => 'key',
+			'configvalue' => 'value',
+		])->execute();
 
-		$query->execute(array('123456', 'key', 'value'));
-		$query->execute(array('123456', 'enabled', 'false'));
+		$sql->setParameters([
+			'appid' => 'someapp',
+			'configkey' => 'key',
+			'configvalue' => 'value',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'someapp',
+			'configkey' => 'otherkey',
+			'configvalue' => 'othervalue',
+		])->execute();
 
-		$query->execute(array('anotherapp', 'key', 'value'));
-		$query->execute(array('anotherapp', 'enabled', 'false'));
+		$sql->setParameters([
+			'appid' => '123456',
+			'configkey' => 'key',
+			'configvalue' => 'value',
+		])->execute();
+		$sql->setParameters([
+			'appid' => '123456',
+			'configkey' => 'enabled',
+			'configvalue' => 'false',
+		])->execute();
+
+		$sql->setParameters([
+			'appid' => 'anotherapp',
+			'configkey' => 'key',
+			'configvalue' => 'value',
+		])->execute();
+		$sql->setParameters([
+			'appid' => 'anotherapp',
+			'configkey' => 'enabled',
+			'configvalue' => 'false',
+		])->execute();
 	}
 
 	public function tearDown() {
-		$query = $this->connection->prepare('DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ?');
-		$query->execute(array('testapp'));
-		$query->execute(array('someapp'));
-		$query->execute(array('123456'));
-		$query->execute(array('anotherapp'));
+		$sql = $this->connection->getQueryBuilder();
+		$sql->delete('appconfig');
+		$sql->execute();
+
+		$sql = $this->connection->getQueryBuilder();
+		$sql->insert('appconfig')
+			->values([
+				'appid' => $sql->createParameter('appid'),
+				'configkey' => $sql->createParameter('configkey'),
+				'configvalue' => $sql->createParameter('configvalue'),
+			]);
+
+		foreach ($this->originalConfig as $configs) {
+			$sql->setParameter('appid', $configs['appid'])
+				->setParameter('configkey', $configs['configkey'])
+				->setParameter('configvalue', $configs['configvalue']);
+			$sql->execute();
+		}
 
 		$this->registerAppConfig(new \OC\AppConfig(\OC::$server->getDatabaseConnection()));
 		parent::tearDown();
@@ -61,217 +135,185 @@ class Test_Appconfig extends \Test\TestCase {
 	 * @param \OCP\IAppConfig $appConfig
 	 */
 	protected function registerAppConfig($appConfig) {
-		\OC::$server->registerService('AppConfig', function ($c) use ($appConfig) {
+		\OC::$server->registerService('AppConfig', function () use ($appConfig) {
 			return $appConfig;
 		});
 	}
 
-	public function getAppConfigs() {
-		return [
-			[new \OC\AppConfig(\OC::$server->getDatabaseConnection())],
-		];
+	public function testGetApps() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$this->assertEquals([
+			'anotherapp',
+			'someapp',
+			'testapp',
+			'123456',
+		], $config->getApps());
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testGetApps($callable) {
-		$query = \OC_DB::prepare('SELECT DISTINCT `appid` FROM `*PREFIX*appconfig` ORDER BY `appid`');
-		$result = $query->execute();
-		$expected = array();
-		while ($row = $result->fetchRow()) {
-			$expected[] = $row['appid'];
-		}
-		sort($expected);
-		$apps = call_user_func([$callable, 'getApps']);
-		$this->assertEquals($expected, $apps);
+	public function testGetKeys() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$keys = $config->getKeys('testapp');
+		$this->assertEquals([
+			'deletethis',
+			'depends_on',
+			'enabled',
+			'installed_version',
+			'key',
+		], $keys);
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testGetKeys($callable) {
-		$query = \OC_DB::prepare('SELECT `configkey` FROM `*PREFIX*appconfig` WHERE `appid` = ?');
-		$result = $query->execute(array('testapp'));
-		$expected = array();
-		while($row = $result->fetchRow()) {
-			$expected[] = $row["configkey"];
-		}
-		sort($expected);
-		$keys = call_user_func([$callable, 'getKeys'], 'testapp');
-		$this->assertEquals($expected, $keys);
-	}
+	public function testGetValue() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testGetValue($callable) {
-		$value = call_user_func([$callable, 'getValue'], 'testapp', 'installed_version');
+		$value = $config->getValue('testapp', 'installed_version');
 		$this->assertConfigKey('testapp', 'installed_version', $value);
 
-		$value = call_user_func([$callable, 'getValue'], 'testapp', 'nonexistant');
+		$value = $config->getValue('testapp', 'nonexistant');
 		$this->assertNull($value);
 
-		$value = call_user_func([$callable, 'getValue'], 'testapp', 'nonexistant', 'default');
+		$value = $config->getValue('testapp', 'nonexistant', 'default');
 		$this->assertEquals('default', $value);
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testHasKey($callable) {
-		$value = call_user_func([$callable, 'hasKey'], 'testapp', 'installed_version');
-		$this->assertTrue($value);
+	public function testHasKey() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
 
-		$value = call_user_func([$callable, 'hasKey'], 'nonexistant', 'nonexistant');
-		$this->assertFalse($value);
+		$this->assertTrue($config->hasKey('testapp', 'installed_version'));
+		$this->assertFalse($config->hasKey('testapp', 'nonexistant'));
+		$this->assertFalse($config->hasKey('nonexistant', 'nonexistant'));
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testSetValue($callable) {
-		call_user_func([$callable, 'setValue'], 'testapp', 'installed_version', '1.33.7');
+	public function testSetValueUpdate() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$this->assertEquals('1.2.3', $config->getValue('testapp', 'installed_version'));
+		$this->assertConfigKey('testapp', 'installed_version', '1.2.3');
+
+		$wasModified = $config->setValue('testapp', 'installed_version', '1.2.3');
+		if (!(\OC::$server->getDatabaseConnection() instanceof \OC\DB\OracleConnection)) {
+			$this->assertFalse($wasModified);
+		}
+
+		$this->assertEquals('1.2.3', $config->getValue('testapp', 'installed_version'));
+		$this->assertConfigKey('testapp', 'installed_version', '1.2.3');
+
+		$this->assertTrue($config->setValue('testapp', 'installed_version', '1.33.7'));
+
+
+		$this->assertEquals('1.33.7', $config->getValue('testapp', 'installed_version'));
 		$this->assertConfigKey('testapp', 'installed_version', '1.33.7');
 
-		call_user_func([$callable, 'setValue'], 'someapp', 'somekey', 'somevalue');
+		$config->setValue('someapp', 'somekey', 'somevalue');
 		$this->assertConfigKey('someapp', 'somekey', 'somevalue');
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testDeleteKey($callable) {
-		call_user_func([$callable, 'deleteKey'], 'testapp', 'deletethis');
-		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `configkey` = ?');
-		$query->execute(array('testapp', 'deletethis'));
-		$result = (bool)$query->fetchRow();
+	public function testSetValueInsert() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$this->assertFalse($config->hasKey('someapp', 'somekey'));
+		$this->assertNull($config->getValue('someapp', 'somekey'));
+
+		$this->assertTrue($config->setValue('someapp', 'somekey', 'somevalue'));
+
+		$this->assertTrue($config->hasKey('someapp', 'somekey'));
+		$this->assertEquals('somevalue', $config->getValue('someapp', 'somekey'));
+		$this->assertConfigKey('someapp', 'somekey', 'somevalue');
+
+		$wasInserted = $config->setValue('someapp', 'somekey', 'somevalue');
+		if (!(\OC::$server->getDatabaseConnection() instanceof \OC\DB\OracleConnection)) {
+			$this->assertFalse($wasInserted);
+		}
+	}
+
+	public function testDeleteKey() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$this->assertTrue($config->hasKey('testapp', 'deletethis'));
+
+		$config->deleteKey('testapp', 'deletethis');
+
+		$this->assertFalse($config->hasKey('testapp', 'deletethis'));
+
+		$sql = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$sql->select('configvalue')
+			->from('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('appid')))
+			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+			->setParameter('appid', 'testapp')
+			->setParameter('configkey', 'deletethis');
+		$query = $sql->execute();
+		$result = $query->fetch();
+		$query->closeCursor();
 		$this->assertFalse($result);
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testDeleteApp($callable) {
-		call_user_func([$callable, 'deleteApp'], 'someapp');
-		$query = \OC_DB::prepare('SELECT `configkey` FROM `*PREFIX*appconfig` WHERE `appid` = ?');
-		$query->execute(array('someapp'));
-		$result = (bool)$query->fetchRow();
+	public function testDeleteApp() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$this->assertTrue($config->hasKey('someapp', 'otherkey'));
+
+		$config->deleteApp('someapp');
+
+		$this->assertFalse($config->hasKey('someapp', 'otherkey'));
+
+		$sql = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$sql->select('configvalue')
+			->from('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('appid')))
+			->setParameter('appid', 'someapp');
+		$query = $sql->execute();
+		$result = $query->fetch();
+		$query->closeCursor();
 		$this->assertFalse($result);
 	}
 
-	/**
-	 * @dataProvider getAppConfigs
-	 *
-	 * @param mixed $callable
-	 */
-	public function testGetValues($callable) {
-		$this->assertFalse(call_user_func([$callable, 'getValues'], 'testapp', 'enabled'));
+	public function testGetValuesNotAllowed() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
 
-		$query = \OC_DB::prepare('SELECT `configkey`, `configvalue` FROM `*PREFIX*appconfig` WHERE `appid` = ?');
-		$query->execute(array('testapp'));
-		$expected = array();
-		while ($row = $query->fetchRow()) {
+		$this->assertFalse($config->getValues('testapp', 'enabled'));
+
+		$this->assertFalse($config->getValues(false, false));
+	}
+
+	public function testGetValues() {
+		$config = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+
+		$sql = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$sql->select(['configkey', 'configvalue'])
+			->from('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('appid')))
+			->setParameter('appid', 'testapp');
+		$query = $sql->execute();
+		$expected = [];
+		while ($row = $query->fetch()) {
 			$expected[$row['configkey']] = $row['configvalue'];
 		}
-		$values = call_user_func([$callable, 'getValues'], 'testapp', false);
+		$query->closeCursor();
+
+		$values = $config->getValues('testapp', false);
 		$this->assertEquals($expected, $values);
 
-		$query = \OC_DB::prepare('SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig` WHERE `configkey` = ?');
-		$query->execute(array('enabled'));
-		$expected = array();
-		while ($row = $query->fetchRow()) {
+		$sql = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$sql->select(['appid', 'configvalue'])
+			->from('appconfig')
+			->where($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+			->setParameter('configkey', 'enabled');
+		$query = $sql->execute();
+		$expected = [];
+		while ($row = $query->fetch()) {
 			$expected[$row['appid']] = $row['configvalue'];
 		}
-		$values = call_user_func([$callable, 'getValues'], false, 'enabled');
+		$query->closeCursor();
+
+		$values = $config->getValues(false, 'enabled');
 		$this->assertEquals($expected, $values);
 	}
 
-	public function testSetValueUnchanged() {
-		$statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false);
-		$statementMock->expects($this->once())
-			->method('fetch')
-			->will($this->returnValue(false));
-
-		$connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
-		$connectionMock->expects($this->once())
-			->method('executeQuery')
-			->with($this->equalTo('SELECT `configvalue`, `configkey` FROM `*PREFIX*appconfig`'
-				.' WHERE `appid` = ?'), $this->equalTo(array('bar')))
-			->will($this->returnValue($statementMock));
-		$connectionMock->expects($this->once())
-			->method('insertIfNotExist')
-			->with($this->equalTo('*PREFIX*appconfig'),
-				$this->equalTo(
-					array(
-						'appid' => 'bar',
-						'configkey' => 'foo',
-						'configvalue' => 'v1',
-					)
-				), $this->equalTo(['appid', 'configkey']))
-			->willReturn(1);
-		$connectionMock->expects($this->never())
-			->method('update');
-
-		$appconfig = new OC\AppConfig($connectionMock);
-		$appconfig->setValue('bar', 'foo', 'v1');
-		$appconfig->setValue('bar', 'foo', 'v1');
-		$appconfig->setValue('bar', 'foo', 'v1');
-	}
-
-	public function testSetValueUnchanged2() {
-		$statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false);
-		$statementMock->expects($this->once())
-			->method('fetch')
-			->will($this->returnValue(false));
-
-		$connectionMock = $this->getMock('\OC\DB\Connection', array(), array(), '', false);
-		$connectionMock->expects($this->once())
-			->method('executeQuery')
-			->with($this->equalTo('SELECT `configvalue`, `configkey` FROM `*PREFIX*appconfig`'
-				.' WHERE `appid` = ?'), $this->equalTo(array('bar')))
-			->will($this->returnValue($statementMock));
-		$connectionMock->expects($this->once())
-			->method('insertIfNotExist')
-			->with($this->equalTo('*PREFIX*appconfig'),
-				$this->equalTo(
-					array(
-						'appid' => 'bar',
-						'configkey' => 'foo',
-						'configvalue' => 'v1',
-					)
-				), $this->equalTo(['appid', 'configkey']))
-			->willReturn(1);
-		$connectionMock->expects($this->once())
-			->method('update')
-			->with($this->equalTo('*PREFIX*appconfig'),
-				$this->equalTo(array('configvalue' => 'v2')),
-				$this->equalTo(array('appid' => 'bar', 'configkey' => 'foo'))
-				);
-
-		$appconfig = new OC\AppConfig($connectionMock);
-		$appconfig->setValue('bar', 'foo', 'v1');
-		$appconfig->setValue('bar', 'foo', 'v2');
-		$appconfig->setValue('bar', 'foo', 'v2');
-	}
-
 	public function testSettingConfigParallel() {
-		$appConfig1 = new OC\AppConfig(\OC::$server->getDatabaseConnection());
-		$appConfig2 = new OC\AppConfig(\OC::$server->getDatabaseConnection());
+		$appConfig1 = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
+		$appConfig2 = new \OC\AppConfig(\OC::$server->getDatabaseConnection());
 		$appConfig1->getValue('testapp', 'foo', 'v1');
 		$appConfig2->getValue('testapp', 'foo', 'v1');
 
@@ -286,12 +328,19 @@ class Test_Appconfig extends \Test\TestCase {
 	 * @param string $app
 	 * @param string $key
 	 * @param string $expected
-	 * @throws \OC\DatabaseException
 	 */
 	protected function assertConfigKey($app, $key, $expected) {
-		$query = \OC_DB::prepare('SELECT `configvalue` FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `configkey` = ?');
-		$result = $query->execute([$app, $key]);
-		$actual = $result->fetchRow();
+		$sql = \OC::$server->getDatabaseConnection()->getQueryBuilder();
+		$sql->select('configvalue')
+			->from('appconfig')
+			->where($sql->expr()->eq('appid', $sql->createParameter('appid')))
+			->andWhere($sql->expr()->eq('configkey', $sql->createParameter('configkey')))
+			->setParameter('appid', $app)
+			->setParameter('configkey', $key);
+		$query = $sql->execute();
+		$actual = $query->fetch();
+		$query->closeCursor();
+
 		$this->assertEquals($expected, $actual['configvalue']);
 	}
 }
diff --git a/tests/lib/appframework/controller/ApiControllerTest.php b/tests/lib/appframework/controller/ApiControllerTest.php
index 137e5950f6..573fe7f3ba 100644
--- a/tests/lib/appframework/controller/ApiControllerTest.php
+++ b/tests/lib/appframework/controller/ApiControllerTest.php
@@ -38,6 +38,7 @@ class ApiControllerTest extends \Test\TestCase {
         $request = new Request(
             ['server' => ['HTTP_ORIGIN' => 'test']],
             $this->getMock('\OCP\Security\ISecureRandom'),
+            $this->getMock('\OCP\Security\ICrypto'),
             $this->getMock('\OCP\IConfig')
         );
         $this->controller = new ChildApiController('app', $request, 'verbs',
diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php
index 0d7716da41..243014a91a 100644
--- a/tests/lib/appframework/controller/ControllerTest.php
+++ b/tests/lib/appframework/controller/ControllerTest.php
@@ -76,6 +76,7 @@ class ControllerTest extends \Test\TestCase {
 				'method' => 'hi',
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 
diff --git a/tests/lib/appframework/controller/OCSControllerTest.php b/tests/lib/appframework/controller/OCSControllerTest.php
index 92b092cf0e..292a56e3ca 100644
--- a/tests/lib/appframework/controller/OCSControllerTest.php
+++ b/tests/lib/appframework/controller/OCSControllerTest.php
@@ -43,6 +43,7 @@ class OCSControllerTest extends \Test\TestCase {
 				],
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$controller = new ChildOCSController('app', $request, 'verbs',
@@ -64,6 +65,7 @@ class OCSControllerTest extends \Test\TestCase {
 		$controller = new ChildOCSController('app', new Request(
 			[],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		));
 		$expected = "<?xml version=\"1.0\"?>\n" .
@@ -96,6 +98,7 @@ class OCSControllerTest extends \Test\TestCase {
 		$controller = new ChildOCSController('app', new Request(
 			[],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		));
 		$expected = "<?xml version=\"1.0\"?>\n" .
@@ -128,6 +131,7 @@ class OCSControllerTest extends \Test\TestCase {
 		$controller = new ChildOCSController('app', new Request(
 			[],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		));
 		$expected = '{"ocs":{"meta":{"status":"failure","statuscode":400,"message":"OK",' .
diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
index 0cbdddbb20..598e70beff 100644
--- a/tests/lib/appframework/dependencyinjection/DIContainerTest.php
+++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
@@ -74,6 +74,7 @@ class DIContainerTest extends \Test\TestCase {
 		$this->container['Request'] = new Request(
 			['method' => 'GET'],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$security = $this->container['SecurityMiddleware'];
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
index 02c86df8e7..c25fd7b6f8 100644
--- a/tests/lib/appframework/http/DispatcherTest.php
+++ b/tests/lib/appframework/http/DispatcherTest.php
@@ -295,6 +295,7 @@ class DispatcherTest extends \Test\TestCase {
 				'method' => 'POST'
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->dispatcher = new Dispatcher(
@@ -322,6 +323,7 @@ class DispatcherTest extends \Test\TestCase {
 				'method' => 'POST',
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->dispatcher = new Dispatcher(
@@ -352,6 +354,7 @@ class DispatcherTest extends \Test\TestCase {
 				'method' => 'GET'
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->dispatcher = new Dispatcher(
@@ -381,6 +384,7 @@ class DispatcherTest extends \Test\TestCase {
 				'method' => 'GET'
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->dispatcher = new Dispatcher(
@@ -411,6 +415,7 @@ class DispatcherTest extends \Test\TestCase {
 				'method' => 'PUT'
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->dispatcher = new Dispatcher(
@@ -443,6 +448,7 @@ class DispatcherTest extends \Test\TestCase {
 				'method' => 'POST'
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->dispatcher = new Dispatcher(
diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php
index e9be3e7390..4bcc8305db 100644
--- a/tests/lib/appframework/http/HttpTest.php
+++ b/tests/lib/appframework/http/HttpTest.php
@@ -65,6 +65,14 @@ class HttpTest extends \Test\TestCase {
 	}
 
 
+	public function testQuotedEtagMatchReturnsNotModified() {
+		$http = new Http(array('HTTP_IF_NONE_MATCH' => '"hi"'));
+
+		$header = $http->getStatusHeader(Http::STATUS_OK, null, 'hi');
+		$this->assertEquals('HTTP/1.1 304 Not Modified', $header);
+	}
+
+
 	public function testLastModifiedMatchReturnsNotModified() {
 		$dateTime = new \DateTime(null, new \DateTimeZone('GMT'));
 		$dateTime->setTimestamp('12');
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
index 692237f57b..a98f5fc894 100644
--- a/tests/lib/appframework/http/JSONResponseTest.php
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -66,13 +66,27 @@ class JSONResponseTest extends \Test\TestCase {
 		$this->assertEquals($expected, $this->json->render());
 	}
 
+	/**
+	 * @return array
+	 */
+	public function renderDataProvider() {
+		return [
+			[
+				['test' => 'hi'], '{"test":"hi"}',
+			],
+			[
+				['<h1>test' => '<h1>hi'], '{"\u003Ch1\u003Etest":"\u003Ch1\u003Ehi"}',
+			],
+		];
+	}
 
-	public function testRender() {
-		$params = array('test' => 'hi');
-		$this->json->setData($params);
-
-		$expected = '{"test":"hi"}';
-
+	/**
+	 * @dataProvider renderDataProvider
+	 * @param array $input
+	 * @param string $expected
+	 */
+	public function testRender(array $input, $expected) {
+		$this->json->setData($input);
 		$this->assertEquals($expected, $this->json->render());
 	}
 
diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php
index 10a9e486c9..deb2890986 100644
--- a/tests/lib/appframework/http/RequestTest.php
+++ b/tests/lib/appframework/http/RequestTest.php
@@ -10,6 +10,7 @@
 
 namespace OC\AppFramework\Http;
 
+use OC\Security\Crypto;
 use OCP\Security\ISecureRandom;
 use OCP\IConfig;
 
@@ -53,6 +54,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -85,6 +87,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -96,8 +99,8 @@ class RequestTest extends \Test\TestCase {
 
 
 	/**
-	* @expectedException \RuntimeException
-	*/
+	 * @expectedException \RuntimeException
+	 */
 	public function testImmutableArrayAccess() {
 		$vars = array(
 			'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
@@ -107,6 +110,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -115,8 +119,8 @@ class RequestTest extends \Test\TestCase {
 	}
 
 	/**
-	* @expectedException \RuntimeException
-	*/
+	 * @expectedException \RuntimeException
+	 */
 	public function testImmutableMagicAccess() {
 		$vars = array(
 			'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
@@ -126,6 +130,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -134,8 +139,8 @@ class RequestTest extends \Test\TestCase {
 	}
 
 	/**
-	* @expectedException \LogicException
-	*/
+	 * @expectedException \LogicException
+	 */
 	public function testGetTheMethodRight() {
 		$vars = array(
 			'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
@@ -145,6 +150,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -161,6 +167,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -182,6 +189,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -206,6 +214,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -230,6 +239,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -250,6 +260,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -274,6 +285,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -303,6 +315,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -324,6 +337,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			$vars,
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -347,6 +361,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			[],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -358,6 +373,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			[],
 			\OC::$server->getSecureRandom(),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -382,6 +398,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -410,6 +427,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -438,6 +456,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -470,6 +489,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -497,6 +517,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			[],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -506,10 +527,10 @@ class RequestTest extends \Test\TestCase {
 
 	public function testGetServerProtocolWithProtoValid() {
 		$this->config
-				->expects($this->exactly(2))
-				->method('getSystemValue')
-				->with('overwriteprotocol')
-				->will($this->returnValue(''));
+			->expects($this->exactly(2))
+			->method('getSystemValue')
+			->with('overwriteprotocol')
+			->will($this->returnValue(''));
 
 		$requestHttps = new Request(
 			[
@@ -518,6 +539,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -528,6 +550,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -551,6 +574,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -571,6 +595,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -587,6 +612,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			[],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -607,6 +633,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -628,6 +655,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -716,6 +744,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -732,6 +761,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -749,6 +779,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -766,6 +797,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -793,6 +825,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			[],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -814,6 +847,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -840,6 +874,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -866,6 +901,7 @@ class RequestTest extends \Test\TestCase {
 				],
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -882,6 +918,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			[],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -909,6 +946,7 @@ class RequestTest extends \Test\TestCase {
 		$request = new Request(
 			[],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -924,6 +962,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -944,6 +983,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -964,6 +1004,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -986,6 +1027,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -1008,6 +1050,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -1030,6 +1073,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -1052,6 +1096,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -1105,6 +1150,7 @@ class RequestTest extends \Test\TestCase {
 				]
 			],
 			$this->secureRandom,
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->config,
 			$this->stream
 		);
@@ -1144,6 +1190,7 @@ class RequestTest extends \Test\TestCase {
 					]
 				],
 				$this->secureRandom,
+				$this->getMock('\OCP\Security\ICrypto'),
 				$this->config,
 				$this->stream
 			])
@@ -1157,17 +1204,25 @@ class RequestTest extends \Test\TestCase {
 	}
 
 	public function testPassesCSRFCheckWithGet() {
+		$crypto = $this->getMock('\OCP\Security\ICrypto');
+		$crypto
+			->expects($this->once())
+			->method('decrypt')
+			->with('1c637c4147e40a8a8f09428ec2059cebea3480c27b402b4e793c69710a731513|wlXxNUaFqHuQnZr5|e6ab49c9e0e20c8d3607e02f1d8e6ec17ad6020ae10b7d64ab4b0a6318c0875940943a6aa303dc090fea0b4cd5b9fb8bcbecac4308a2bd15d9f369cdc22121a4', 'secret')
+			->will($this->returnValue('MyStoredRequestToken'));
+
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
 			->setConstructorArgs([
 				[
 					'get' => [
-						'requesttoken' => 'MyStoredRequestToken',
+						'requesttoken' => '1c637c4147e40a8a8f09428ec2059cebea3480c27b402b4e793c69710a731513|wlXxNUaFqHuQnZr5|e6ab49c9e0e20c8d3607e02f1d8e6ec17ad6020ae10b7d64ab4b0a6318c0875940943a6aa303dc090fea0b4cd5b9fb8bcbecac4308a2bd15d9f369cdc22121a4:secret',
 					],
 					'requesttoken' => 'MyStoredRequestToken',
 				],
 				$this->secureRandom,
+				$crypto,
 				$this->config,
 				$this->stream
 			])
@@ -1177,17 +1232,25 @@ class RequestTest extends \Test\TestCase {
 	}
 
 	public function testPassesCSRFCheckWithPost() {
+		$crypto = $this->getMock('\OCP\Security\ICrypto');
+		$crypto
+			->expects($this->once())
+			->method('decrypt')
+			->with('1c637c4147e40a8a8f09428ec2059cebea3480c27b402b4e793c69710a731513|wlXxNUaFqHuQnZr5|e6ab49c9e0e20c8d3607e02f1d8e6ec17ad6020ae10b7d64ab4b0a6318c0875940943a6aa303dc090fea0b4cd5b9fb8bcbecac4308a2bd15d9f369cdc22121a4', 'secret')
+			->will($this->returnValue('MyStoredRequestToken'));
+
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
 			->setConstructorArgs([
 				[
 					'post' => [
-						'requesttoken' => 'MyStoredRequestToken',
+						'requesttoken' => '1c637c4147e40a8a8f09428ec2059cebea3480c27b402b4e793c69710a731513|wlXxNUaFqHuQnZr5|e6ab49c9e0e20c8d3607e02f1d8e6ec17ad6020ae10b7d64ab4b0a6318c0875940943a6aa303dc090fea0b4cd5b9fb8bcbecac4308a2bd15d9f369cdc22121a4:secret',
 					],
 					'requesttoken' => 'MyStoredRequestToken',
 				],
 				$this->secureRandom,
+				$crypto,
 				$this->config,
 				$this->stream
 			])
@@ -1197,17 +1260,24 @@ class RequestTest extends \Test\TestCase {
 	}
 
 	public function testPassesCSRFCheckWithHeader() {
+		$crypto = $this->getMock('\OCP\Security\ICrypto');
+		$crypto
+			->expects($this->once())
+			->method('decrypt')
+			->with('1c637c4147e40a8a8f09428ec2059cebea3480c27b402b4e793c69710a731513|wlXxNUaFqHuQnZr5|e6ab49c9e0e20c8d3607e02f1d8e6ec17ad6020ae10b7d64ab4b0a6318c0875940943a6aa303dc090fea0b4cd5b9fb8bcbecac4308a2bd15d9f369cdc22121a4', 'secret')
+			->will($this->returnValue('MyStoredRequestToken'));
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
 			->setConstructorArgs([
 				[
 					'server' => [
-						'HTTP_REQUESTTOKEN' => 'MyStoredRequestToken',
+						'HTTP_REQUESTTOKEN' => '1c637c4147e40a8a8f09428ec2059cebea3480c27b402b4e793c69710a731513|wlXxNUaFqHuQnZr5|e6ab49c9e0e20c8d3607e02f1d8e6ec17ad6020ae10b7d64ab4b0a6318c0875940943a6aa303dc090fea0b4cd5b9fb8bcbecac4308a2bd15d9f369cdc22121a4:secret',
 					],
 					'requesttoken' => 'MyStoredRequestToken',
 				],
 				$this->secureRandom,
+				$crypto,
 				$this->config,
 				$this->stream
 			])
@@ -1216,18 +1286,34 @@ class RequestTest extends \Test\TestCase {
 		$this->assertTrue($request->passesCSRFCheck());
 	}
 
-	public function testPassesCSRFCheckWithInvalidToken() {
+	public function invalidTokenDataProvider() {
+		return [
+			['InvalidSentToken'],
+			['InvalidSentToken:InvalidSecret'],
+			[null],
+			[''],
+		];
+	}
+
+	/**
+	 * @dataProvider invalidTokenDataProvider
+	 * @param string $invalidToken
+	 */
+	public function testPassesCSRFCheckWithInvalidToken($invalidToken) {
+		$crypto = new Crypto($this->config, $this->secureRandom);
+
 		/** @var Request $request */
 		$request = $this->getMockBuilder('\OC\AppFramework\Http\Request')
 			->setMethods(['getScriptName'])
 			->setConstructorArgs([
 				[
 					'server' => [
-						'HTTP_REQUESTTOKEN' => 'MyInvalidSentToken',
+						'HTTP_REQUESTTOKEN' => $invalidToken,
 					],
 					'requesttoken' => 'MyStoredRequestToken',
 				],
 				$this->secureRandom,
+				$crypto,
 				$this->config,
 				$this->stream
 			])
@@ -1243,6 +1329,7 @@ class RequestTest extends \Test\TestCase {
 			->setConstructorArgs([
 				[],
 				$this->secureRandom,
+				$this->getMock('\OCP\Security\ICrypto'),
 				$this->config,
 				$this->stream
 			])
diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
index a873152579..eab45b03c9 100644
--- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
@@ -133,6 +133,7 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 				new Request(
 					['method' => 'GET'],
 					$this->getMock('\OCP\Security\ISecureRandom'),
+					$this->getMock('\OCP\Security\ICrypto'),
 					$this->getMock('\OCP\IConfig')
 				)
 			]
diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php
index 33f04e1383..8e077b37e2 100644
--- a/tests/lib/appframework/middleware/MiddlewareTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareTest.php
@@ -61,6 +61,7 @@ class MiddlewareTest extends \Test\TestCase {
 				new Request(
 					[],
 					$this->getMock('\OCP\Security\ISecureRandom'),
+					$this->getMock('\OCP\Security\ICrypto'),
 					$this->getMock('\OCP\IConfig')
 				)
 			]
diff --git a/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php
index ca526fb859..f5e6106dc3 100644
--- a/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php
+++ b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php
@@ -42,6 +42,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 				]
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->reflector->reflect($this, __FUNCTION__);
@@ -61,6 +62,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 				]
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$middleware = new CORSMiddleware($request, $this->reflector, $this->session);
@@ -78,6 +80,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$request = new Request(
 			[],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->reflector->reflect($this, __FUNCTION__);
@@ -101,6 +104,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 				]
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->reflector->reflect($this, __FUNCTION__);
@@ -119,6 +123,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$request = new Request(
 			[],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->reflector->reflect($this, __FUNCTION__);
@@ -144,6 +149,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 				'PHP_AUTH_PW' => 'pass'
 			]],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->session->expects($this->once())
@@ -169,6 +175,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 				'PHP_AUTH_PW' => 'pass'
 			]],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->session->expects($this->once())
@@ -190,6 +197,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 				'PHP_AUTH_PW' => 'pass'
 			]],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$middleware = new CORSMiddleware($request, $this->reflector, $this->session);
@@ -206,6 +214,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 				'PHP_AUTH_PW' => 'pass'
 			]],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$middleware = new CORSMiddleware($request, $this->reflector, $this->session);
@@ -226,6 +235,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 				'PHP_AUTH_PW' => 'pass'
 			]],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$middleware = new CORSMiddleware($request, $this->reflector, $this->session);
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
index 347a0423ea..3b4d7987e9 100644
--- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
+++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
@@ -322,6 +322,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 				]
 			],
 			$this->getMock('\OCP\Security\ISecureRandom'),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->middleware = $this->getMiddleware(true, true);
diff --git a/tests/lib/appframework/middleware/sessionmiddlewaretest.php b/tests/lib/appframework/middleware/sessionmiddlewaretest.php
index 11c1600f51..06390e96d4 100644
--- a/tests/lib/appframework/middleware/sessionmiddlewaretest.php
+++ b/tests/lib/appframework/middleware/sessionmiddlewaretest.php
@@ -36,6 +36,7 @@ class SessionMiddlewareTest extends \Test\TestCase {
 		$this->request = new Request(
 			[],
 			$this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(),
+			$this->getMock('\OCP\Security\ICrypto'),
 			$this->getMock('\OCP\IConfig')
 		);
 		$this->reflector = new ControllerMethodReflector();
diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php
index bf63094a9e..6d9d3bd8eb 100644
--- a/tests/lib/autoloader.php
+++ b/tests/lib/autoloader.php
@@ -16,7 +16,7 @@ class AutoLoader extends TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$this->loader = new \OC\AutoLoader();
+		$this->loader = new \OC\AutoLoader([]);
 	}
 
 	public function testLeadingSlashOnClassName() {
diff --git a/tests/lib/connector/sabre/DummyGetResponsePluginTest.php b/tests/lib/connector/sabre/DummyGetResponsePluginTest.php
index fa8f069462..096c2c5f0d 100644
--- a/tests/lib/connector/sabre/DummyGetResponsePluginTest.php
+++ b/tests/lib/connector/sabre/DummyGetResponsePluginTest.php
@@ -59,6 +59,10 @@ class DummyGetResponsePluginTest extends TestCase {
 		$response
 			->expects($this->once())
 			->method('setBody');
+		$response
+			->expects($this->once())
+			->method('setStatus')
+			->with(200);
 
 		$this->assertSame(false, $this->dummyGetResponsePlugin->httpGet($request, $response));
 	}
diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php
index 246f7f6d0a..e5605dd7cc 100644
--- a/tests/lib/connector/sabre/file.php
+++ b/tests/lib/connector/sabre/file.php
@@ -114,7 +114,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->atLeastOnce())
 			->method('resolvePath')
 			->will($this->returnCallback(
-				function($path) use ($storage){
+				function ($path) use ($storage) {
 					return [$storage, $path];
 				}
 			));
@@ -172,7 +172,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->atLeastOnce())
 			->method('resolvePath')
 			->will($this->returnCallback(
-				function($path) use ($storage){
+				function ($path) use ($storage) {
 					return [$storage, $path];
 				}
 			));
@@ -210,7 +210,9 @@ class File extends \Test\TestCase {
 		$caughtException = null;
 		try {
 			// last chunk
+			$file->acquireLock(ILockingProvider::LOCK_SHARED);
 			$file->put('test data two');
+			$file->releaseLock(ILockingProvider::LOCK_SHARED);
 		} catch (\Exception $e) {
 			$caughtException = $e;
 		}
@@ -249,7 +251,15 @@ class File extends \Test\TestCase {
 
 		$file = new \OC\Connector\Sabre\File($view, $info);
 
-		return $file->put($this->getStream('test data'));
+		// beforeMethod locks
+		$view->lockFile($path, ILockingProvider::LOCK_SHARED);
+
+		$result = $file->put($this->getStream('test data'));
+
+		// afterMethod unlocks
+		$view->unlockFile($path, ILockingProvider::LOCK_SHARED);
+
+		return $result;
 	}
 
 	/**
@@ -431,7 +441,13 @@ class File extends \Test\TestCase {
 		// action
 		$thrown = false;
 		try {
+			// beforeMethod locks
+			$view->lockFile('/test.txt', ILockingProvider::LOCK_SHARED);
+
 			$file->put($this->getStream('test data'));
+
+			// afterMethod unlocks
+			$view->unlockFile('/test.txt', ILockingProvider::LOCK_SHARED);
 		} catch (\Sabre\DAV\Exception\BadRequest $e) {
 			$thrown = true;
 		}
@@ -458,7 +474,13 @@ class File extends \Test\TestCase {
 		// action
 		$thrown = false;
 		try {
+			// beforeMethod locks
+			$view->lockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
+
 			$file->put($this->getStream('test data'));
+
+			// afterMethod unlocks
+			$view->unlockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
 		} catch (\OC\Connector\Sabre\Exception\FileLocked $e) {
 			$thrown = true;
 		}
@@ -519,7 +541,13 @@ class File extends \Test\TestCase {
 		// action
 		$thrown = false;
 		try {
+			// beforeMethod locks
+			$view->lockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
+
 			$file->put($this->getStream('test data'));
+
+			// afterMethod unlocks
+			$view->unlockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
 		} catch (\OC\Connector\Sabre\Exception\InvalidPath $e) {
 			$thrown = true;
 		}
@@ -577,7 +605,13 @@ class File extends \Test\TestCase {
 		// action
 		$thrown = false;
 		try {
+			// beforeMethod locks
+			$view->lockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
+
 			$file->put($this->getStream('test data'));
+
+			// afterMethod unlocks
+			$view->unlockFile($info->getPath(), ILockingProvider::LOCK_SHARED);
 		} catch (\Sabre\DAV\Exception\BadRequest $e) {
 			$thrown = true;
 		}
@@ -702,7 +736,7 @@ class File extends \Test\TestCase {
 		$eventHandler->expects($this->once())
 			->method('writeCallback')
 			->will($this->returnCallback(
-				function() use ($view, $path, &$wasLockedPre){
+				function () use ($view, $path, &$wasLockedPre) {
 					$wasLockedPre = $this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_SHARED);
 					$wasLockedPre = $wasLockedPre && !$this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE);
 				}
@@ -710,7 +744,7 @@ class File extends \Test\TestCase {
 		$eventHandler->expects($this->once())
 			->method('postWriteCallback')
 			->will($this->returnCallback(
-				function() use ($view, $path, &$wasLockedPost){
+				function () use ($view, $path, &$wasLockedPost) {
 					$wasLockedPost = $this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_SHARED);
 					$wasLockedPost = $wasLockedPost && !$this->isFileLocked($view, $path, \OCP\Lock\ILockingProvider::LOCK_EXCLUSIVE);
 				}
@@ -729,8 +763,14 @@ class File extends \Test\TestCase {
 			'postWriteCallback'
 		);
 
+		// beforeMethod locks
+		$view->lockFile($path, ILockingProvider::LOCK_SHARED);
+
 		$this->assertNotEmpty($file->put($this->getStream('test data')));
 
+		// afterMethod unlocks
+		$view->unlockFile($path, ILockingProvider::LOCK_SHARED);
+
 		$this->assertTrue($wasLockedPre, 'File was locked during pre-hooks');
 		$this->assertTrue($wasLockedPost, 'File was locked during post-hooks');
 
diff --git a/tests/lib/connector/sabre/requesttest/uploadtest.php b/tests/lib/connector/sabre/requesttest/uploadtest.php
index 2cc912d07f..b8cd44afda 100644
--- a/tests/lib/connector/sabre/requesttest/uploadtest.php
+++ b/tests/lib/connector/sabre/requesttest/uploadtest.php
@@ -19,18 +19,26 @@ class UploadTest extends RequestTest {
 		$this->assertEquals(201, $response->getStatus());
 		$this->assertTrue($view->file_exists('foo.txt'));
 		$this->assertEquals('asd', $view->file_get_contents('foo.txt'));
+
+		$info = $view->getFileInfo('foo.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
+		$this->assertEquals(3, $info->getSize());
 	}
 
 	public function testUploadOverWrite() {
 		$user = $this->getUniqueID();
 		$view = $this->setupUser($user, 'pass');
 
-		$view->file_put_contents('foo.txt', 'bar');
+		$view->file_put_contents('foo.txt', 'foobar');
 
 		$response = $this->request($view, $user, 'pass', 'PUT', '/foo.txt', 'asd');
 
 		$this->assertEquals(204, $response->getStatus());
 		$this->assertEquals('asd', $view->file_get_contents('foo.txt'));
+
+		$info = $view->getFileInfo('foo.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
+		$this->assertEquals(3, $info->getSize());
 	}
 
 	public function testChunkedUpload() {
@@ -49,6 +57,10 @@ class UploadTest extends RequestTest {
 		$this->assertTrue($view->file_exists('foo.txt'));
 
 		$this->assertEquals('asdbar', $view->file_get_contents('foo.txt'));
+
+		$info = $view->getFileInfo('foo.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
+		$this->assertEquals(6, $info->getSize());
 	}
 
 	public function testChunkedUploadOverWrite() {
@@ -66,6 +78,10 @@ class UploadTest extends RequestTest {
 		$this->assertEquals(201, $response->getStatus());
 
 		$this->assertEquals('asdbar', $view->file_get_contents('foo.txt'));
+
+		$info = $view->getFileInfo('foo.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
+		$this->assertEquals(6, $info->getSize());
 	}
 
 	public function testChunkedUploadOutOfOrder() {
@@ -84,5 +100,9 @@ class UploadTest extends RequestTest {
 		$this->assertTrue($view->file_exists('foo.txt'));
 
 		$this->assertEquals('asdbar', $view->file_get_contents('foo.txt'));
+
+		$info = $view->getFileInfo('foo.txt');
+		$this->assertInstanceOf('\OC\Files\FileInfo', $info);
+		$this->assertEquals(6, $info->getSize());
 	}
 }
diff --git a/tests/lib/encryption/keys/storage.php b/tests/lib/encryption/keys/storage.php
index 2f3aa3527b..b5b91f886a 100644
--- a/tests/lib/encryption/keys/storage.php
+++ b/tests/lib/encryption/keys/storage.php
@@ -37,6 +37,9 @@ class StorageTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	protected $view;
 
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	protected $config;
+
 	public function setUp() {
 		parent::setUp();
 
@@ -48,6 +51,10 @@ class StorageTest extends TestCase {
 			->disableOriginalConstructor()
 			->getMock();
 
+		$this->config = $this->getMockBuilder('OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+
 		$this->storage = new Storage($this->view, $this->util);
 	}
 
@@ -88,7 +95,7 @@ class StorageTest extends TestCase {
 	 * @param bool $originalKeyExists
 	 * @param string $expectedKeyContent
 	 */
-	public function testGetFileKey2($path, $strippedPartialName, $originalKeyExists, $expectedKeyContent) {
+	public function testGetFileKey($path, $strippedPartialName, $originalKeyExists, $expectedKeyContent) {
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
 			->willReturnMap([
@@ -414,9 +421,12 @@ class StorageTest extends TestCase {
 	 *
 	 * @param string $path
 	 * @param boolean $systemWideMountPoint
+	 * @param string $storageRoot
 	 * @param string $expected
 	 */
-	public function testGetPathToKeys($path, $systemWideMountPoint, $expected) {
+	public function testGetPathToKeys($path, $systemWideMountPoint, $storageRoot, $expected) {
+
+		$this->invokePrivate($this->storage, 'root_dir', [$storageRoot]);
 
 		$this->util->expects($this->any())
 			->method('getUidAndFilename')
@@ -431,10 +441,12 @@ class StorageTest extends TestCase {
 	}
 
 	public function dataTestGetPathToKeys() {
-		return array(
-			array('/user1/files/source.txt', false, '/user1/files_encryption/keys/files/source.txt/'),
-			array('/user1/files/source.txt', true, '/files_encryption/keys/files/source.txt/')
-		);
+		return [
+			['/user1/files/source.txt', false, '', '/user1/files_encryption/keys/files/source.txt/'],
+			['/user1/files/source.txt', true, '', '/files_encryption/keys/files/source.txt/'],
+			['/user1/files/source.txt', false, 'storageRoot', '/storageRoot/user1/files_encryption/keys/files/source.txt/'],
+			['/user1/files/source.txt', true, 'storageRoot', '/storageRoot/files_encryption/keys/files/source.txt/'],
+		];
 	}
 
 	public function testKeySetPreparation() {
@@ -463,4 +475,39 @@ class StorageTest extends TestCase {
 		$this->assertSame($expected, $args[0]);
 	}
 
+	/**
+	 * @dataProvider dataTestGetFileKeyDir
+	 *
+	 * @param bool $isSystemWideMountPoint
+	 * @param string $storageRoot
+	 * @param string $expected
+	 */
+	public function testGetFileKeyDir($isSystemWideMountPoint, $storageRoot, $expected) {
+
+		$path = '/user1/files/foo/bar.txt';
+		$owner = 'user1';
+		$relativePath = '/foo/bar.txt';
+
+		$this->invokePrivate($this->storage, 'root_dir', [$storageRoot]);
+
+		$this->util->expects($this->once())->method('isSystemWideMountPoint')
+			->willReturn($isSystemWideMountPoint);
+		$this->util->expects($this->once())->method('getUidAndFilename')
+			->with($path)->willReturn([$owner, $relativePath]);
+
+		$this->assertSame($expected,
+			$this->invokePrivate($this->storage, 'getFileKeyDir', ['OC_DEFAULT_MODULE', $path])
+		);
+
+	}
+
+	public function dataTestGetFileKeyDir() {
+		return [
+			[false, '', '/user1/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+			[true, '', '/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+			[false, 'newStorageRoot', '/newStorageRoot/user1/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+			[true, 'newStorageRoot', '/newStorageRoot/files_encryption/keys/foo/bar.txt/OC_DEFAULT_MODULE/'],
+		];
+	}
+
 }
diff --git a/tests/lib/encryption/managertest.php b/tests/lib/encryption/managertest.php
index 9af7bc2c13..6355c706b6 100644
--- a/tests/lib/encryption/managertest.php
+++ b/tests/lib/encryption/managertest.php
@@ -19,12 +19,20 @@ class ManagerTest extends TestCase {
 	/** @var \PHPUnit_Framework_MockObject_MockObject */
 	private $l10n;
 
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	private $view;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject */
+	private $util;
+
 	public function setUp() {
 		parent::setUp();
 		$this->config = $this->getMock('\OCP\IConfig');
 		$this->logger = $this->getMock('\OCP\ILogger');
 		$this->l10n = $this->getMock('\OCP\Il10n');
-		$this->manager = new Manager($this->config, $this->logger, $this->l10n);
+		$this->view = $this->getMock('\OC\Files\View');
+		$this->util = $this->getMockBuilder('\OC\Encryption\Util')->disableOriginalConstructor()->getMock();
+		$this->manager = new Manager($this->config, $this->logger, $this->l10n, $this->view, $this->util);
 	}
 
 	public function testManagerIsDisabled() {
diff --git a/tests/lib/encryption/utiltest.php b/tests/lib/encryption/utiltest.php
index 5aadb4e857..449326bb35 100644
--- a/tests/lib/encryption/utiltest.php
+++ b/tests/lib/encryption/utiltest.php
@@ -109,7 +109,11 @@ class UtilTest extends TestCase {
 	/**
 	 * @dataProvider providePathsForTestIsExcluded
 	 */
-	public function testIsExcluded($path, $expected) {
+	public function testIsExcluded($path, $keyStorageRoot, $expected) {
+		$this->config->expects($this->once())
+			->method('getAppValue')
+			->with('core', 'encryption_key_storage_root', '')
+			->willReturn($keyStorageRoot);
 		$this->userManager
 			->expects($this->any())
 			->method('userExists')
@@ -122,11 +126,14 @@ class UtilTest extends TestCase {
 
 	public function providePathsForTestIsExcluded() {
 		return array(
-			array('/files_encryption', true),
-			array('files_encryption/foo.txt', true),
-			array('test/foo.txt', false),
-			array('/user1/files_encryption/foo.txt', true),
-			array('/user1/files/foo.txt', false),
+			array('/files_encryption', '', true),
+			array('files_encryption/foo.txt', '', true),
+			array('test/foo.txt', '', false),
+			array('/user1/files_encryption/foo.txt', '', true),
+			array('/user1/files/foo.txt', '', false),
+			array('/keyStorage/user1/files/foo.txt', 'keyStorage', true),
+			array('/keyStorage/files_encryption', '/keyStorage', true),
+			array('keyStorage/user1/files_encryption', '/keyStorage/', true),
 
 		);
 	}
diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
index 4a88e2acd3..96795cb02e 100644
--- a/tests/lib/files/node/folder.php
+++ b/tests/lib/files/node/folder.php
@@ -143,38 +143,13 @@ class Folder extends \Test\TestCase {
 			->method('getUser')
 			->will($this->returnValue($this->user));
 
-		/**
-		 * @var \OC\Files\Storage\Storage | \PHPUnit_Framework_MockObject_MockObject $storage
-		 */
-		$storage = $this->getMock('\OC\Files\Storage\Storage');
-
-		$cache = $this->getMock('\OC\Files\Cache\Cache', array(), array(''));
-		$cache->expects($this->any())
-			->method('getStatus')
-			->with('foo')
-			->will($this->returnValue(Cache::COMPLETE));
-
-		$cache->expects($this->once())
-			->method('getFolderContents')
-			->with('foo')
-			->will($this->returnValue(array(
-				array('fileid' => 2, 'path' => '/bar/foo/asd', 'name' => 'asd', 'size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain'),
-				array('fileid' => 3, 'path' => '/bar/foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'httpd/unix-directory')
-			)));
-
-		$root->expects($this->once())
-			->method('getMountsIn')
-			->with('/bar/foo')
-			->will($this->returnValue(array()));
-
-		$storage->expects($this->any())
-			->method('getCache')
-			->will($this->returnValue($cache));
-
 		$view->expects($this->any())
-			->method('resolvePath')
+			->method('getDirectoryContent')
 			->with('/bar/foo')
-			->will($this->returnValue(array($storage, 'foo')));
+			->will($this->returnValue(array(
+				new FileInfo('/bar/foo/asd', null, 'foo/asd', ['fileid' => 2, 'path' => '/bar/foo/asd', 'name' => 'asd', 'size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain'], null),
+				new FileInfo('/bar/foo/qwerty', null, 'foo/qwerty', ['fileid' => 3, 'path' => '/bar/foo/qwerty', 'name' => 'qwerty', 'size' => 200, 'mtime' => 55, 'mimetype' => 'httpd/unix-directory'], null)
+			)));
 
 		$node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
 		$children = $node->getDirectoryListing();
@@ -183,6 +158,8 @@ class Folder extends \Test\TestCase {
 		$this->assertInstanceOf('\OC\Files\Node\Folder', $children[1]);
 		$this->assertEquals('asd', $children[0]->getName());
 		$this->assertEquals('qwerty', $children[1]->getName());
+		$this->assertEquals(2, $children[0]->getId());
+		$this->assertEquals(3, $children[1]->getId());
 	}
 
 	public function testGet() {
diff --git a/tests/lib/files/storage/wrapper/encryption.php b/tests/lib/files/storage/wrapper/encryption.php
index c49e6bb0d1..36a5b288c6 100644
--- a/tests/lib/files/storage/wrapper/encryption.php
+++ b/tests/lib/files/storage/wrapper/encryption.php
@@ -194,7 +194,7 @@ class Encryption extends \Test\Files\Storage\Storage {
 	protected function buildMockModule() {
 		$this->encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule')
 			->disableOriginalConstructor()
-			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable'])
+			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable', 'encryptAll'])
 			->getMock();
 
 		$this->encryptionModule->expects($this->any())->method('getId')->willReturn('UNIT_TEST_MODULE');
@@ -241,59 +241,14 @@ class Encryption extends \Test\Files\Storage\Storage {
 		$this->instance->rename($source, $target);
 	}
 
-	/**
-	 * @dataProvider dataTestCopyAndRename
-	 *
-	 * @param string $source
-	 * @param string $target
-	 * @param $encryptionEnabled
-	 * @param boolean $copyKeysReturn
-	 * @param boolean $shouldUpdate
-	 */
-	public function testCopyEncryption($source,
-							 $target,
-							 $encryptionEnabled,
-							 $copyKeysReturn,
-							 $shouldUpdate) {
-
-		if ($encryptionEnabled) {
-			$this->keyStore
-				->expects($this->once())
-				->method('copyKeys')
-				->willReturn($copyKeysReturn);
-			$this->cache->expects($this->atLeastOnce())
-				->method('put')
-				->willReturnCallback(function($path, $data) {
-					$this->assertArrayHasKey('encrypted', $data);
-					$this->assertTrue($data['encrypted']);
-				});
-		} else {
-			$this->cache->expects($this->never())->method('put');
-			$this->keyStore->expects($this->never())->method('copyKeys');
-		}
-		$this->util->expects($this->any())
-			->method('isFile')->willReturn(true);
-		$this->util->expects($this->any())
-			->method('isExcluded')->willReturn(false);
-		$this->encryptionManager->expects($this->once())
-			->method('isEnabled')->willReturn($encryptionEnabled);
-		if ($shouldUpdate) {
-			$this->update->expects($this->once())
-				->method('update');
-		} else {
-			$this->update->expects($this->never())
-				->method('update');
-		}
-
-		$this->instance->mkdir($source);
-		$this->instance->mkdir(dirname($target));
-		$this->instance->copy($source, $target);
-
-		if ($encryptionEnabled) {
-			$this->assertSame($this->dummySize,
-				$this->instance->filesize($target)
-			);
-		}
+	public function testCopyEncryption() {
+		$this->instance->file_put_contents('source.txt', 'bar');
+		$this->instance->copy('source.txt', 'target.txt');
+		$this->assertSame('bar', $this->instance->file_get_contents('target.txt'));
+		$targetMeta = $this->instance->getMetaData('target.txt');
+		$sourceMeta = $this->instance->getMetaData('source.txt');
+		$this->assertSame($sourceMeta['encrypted'], $targetMeta['encrypted']);
+		$this->assertSame($sourceMeta['size'], $targetMeta['size']);
 	}
 
 	/**
diff --git a/tests/lib/files/stream/encryption.php b/tests/lib/files/stream/encryption.php
index 281ec0a14a..ed3b5b1b15 100644
--- a/tests/lib/files/stream/encryption.php
+++ b/tests/lib/files/stream/encryption.php
@@ -305,7 +305,7 @@ class Encryption extends \Test\TestCase {
 	protected function buildMockModule() {
 		$encryptionModule = $this->getMockBuilder('\OCP\Encryption\IEncryptionModule')
 			->disableOriginalConstructor()
-			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable'])
+			->setMethods(['getId', 'getDisplayName', 'begin', 'end', 'encrypt', 'decrypt', 'update', 'shouldEncrypt', 'getUnencryptedBlockSize', 'isReadable', 'encryptAll'])
 			->getMock();
 
 		$encryptionModule->expects($this->any())->method('getId')->willReturn('UNIT_TEST_MODULE');
diff --git a/tests/lib/files/type/loadertest.php b/tests/lib/files/type/loadertest.php
new file mode 100644
index 0000000000..7f87afd2f4
--- /dev/null
+++ b/tests/lib/files/type/loadertest.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * @author Robin McCorkell <rmccorkell@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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\Type;
+
+use \OC\Files\Type\Loader;
+use \OCP\IDBConnection;
+
+class LoaderTest extends \Test\TestCase {
+	/** @var IDBConnection */
+	protected $db;
+	/** @var Loader */
+	protected $loader;
+
+	protected function setUp() {
+		$this->db = \OC::$server->getDatabaseConnection();
+		$this->loader = new Loader($this->db);
+	}
+
+	protected function tearDown() {
+		$deleteMimetypes = $this->db->getQueryBuilder();
+		$deleteMimetypes->delete('mimetypes')
+			->where($deleteMimetypes->expr()->like(
+				'mimetype', $deleteMimetypes->createPositionalParameter('testing/%')
+			));
+		$deleteMimetypes->execute();
+	}
+
+
+	public function testGetMimetype() {
+		$qb = $this->db->getQueryBuilder();
+		$qb->insert('mimetypes')
+			->values([
+				'mimetype' => $qb->createPositionalParameter('testing/mymimetype')
+			]);
+		$qb->execute();
+
+		$this->assertTrue($this->loader->exists('testing/mymimetype'));
+		$mimetypeId = $this->loader->getId('testing/mymimetype');
+		$this->assertNotNull($mimetypeId);
+
+		$mimetype = $this->loader->getMimetypeById($mimetypeId);
+		$this->assertEquals('testing/mymimetype', $mimetype);
+	}
+
+	public function testGetNonexistentMimetype() {
+		$this->assertFalse($this->loader->exists('testing/nonexistent'));
+		// hopefully this ID doesn't exist
+		$this->assertNull($this->loader->getMimetypeById(12345));
+	}
+
+	public function testStore() {
+		$this->assertFalse($this->loader->exists('testing/mymimetype'));
+		$mimetypeId = $this->loader->getId('testing/mymimetype');
+
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('mimetype')
+			->from('mimetypes')
+			->where($qb->expr()->eq('id', $qb->createPositionalParameter($mimetypeId)));
+
+		$mimetype = $qb->execute()->fetch();
+		$this->assertEquals('testing/mymimetype', $mimetype['mimetype']);
+
+		$this->assertEquals('testing/mymimetype', $this->loader->getMimetypeById($mimetypeId));
+		$this->assertEquals($mimetypeId, $this->loader->getId('testing/mymimetype'));
+	}
+
+	public function testStoreExists() {
+		$mimetypeId = $this->loader->getId('testing/mymimetype');
+		$mimetypeId2 = $this->loader->getId('testing/mymimetype');
+
+		$this->assertEquals($mimetypeId, $mimetypeId2);
+	}
+
+}
diff --git a/apps/files_sharing/ajax/testremote.php b/tests/lib/lock/dblockingprovider.php
similarity index 53%
rename from apps/files_sharing/ajax/testremote.php
rename to tests/lib/lock/dblockingprovider.php
index 0a0548dbbd..fd6550d9c4 100644
--- a/apps/files_sharing/ajax/testremote.php
+++ b/tests/lib/lock/dblockingprovider.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * @author Lukas Reschke <lukas@owncloud.com>
- * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
@@ -21,26 +19,25 @@
  *
  */
 
-OCP\JSON::callCheck();
-OCP\JSON::checkAppEnabled('files_sharing');
+namespace Test\Lock;
 
-$remote = $_GET['remote'];
+class DBLockingProvider extends LockingProvider {
 
-function testUrl($url) {
-	try {
-		$result = file_get_contents($url);
-		$data = json_decode($result);
-		// public link mount is only supported in ownCloud 7+
-		return is_object($data) and !empty($data->version) and version_compare($data->version, '7.0.0', '>=');
-	} catch (Exception $e) {
-		return false;
+	/**
+	 * @var \OCP\IDBConnection
+	 */
+	private $connection;
+
+	/**
+	 * @return \OCP\Lock\ILockingProvider
+	 */
+	protected function getInstance() {
+		$this->connection = \OC::$server->getDatabaseConnection();
+		return new \OC\Lock\DBLockingProvider($this->connection, \OC::$server->getLogger());
+	}
+
+	public function tearDown() {
+		$this->connection->executeQuery('DELETE FROM `*PREFIX*file_locks`');
+		parent::tearDown();
 	}
 }
-
-if (testUrl('https://' . $remote . '/status.php')) {
-	echo 'https';
-} elseif (testUrl('http://' . $remote . '/status.php')) {
-	echo 'http';
-} else {
-	echo 'false';
-}
diff --git a/tests/lib/lock/lockingprovider.php b/tests/lib/lock/lockingprovider.php
index efd6e1939f..ca72c1bb7f 100644
--- a/tests/lib/lock/lockingprovider.php
+++ b/tests/lib/lock/lockingprovider.php
@@ -120,6 +120,36 @@ abstract class LockingProvider extends TestCase {
 		$this->assertFalse($this->instance->isLocked('asd', ILockingProvider::LOCK_EXCLUSIVE));
 	}
 
+	public function testReleaseAllAfterChange() {
+		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+		$this->instance->acquireLock('bar', ILockingProvider::LOCK_SHARED);
+		$this->instance->acquireLock('asd', ILockingProvider::LOCK_EXCLUSIVE);
+
+		$this->instance->changeLock('bar', ILockingProvider::LOCK_EXCLUSIVE);
+
+		$this->instance->releaseAll();
+
+		$this->assertFalse($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+		$this->assertFalse($this->instance->isLocked('bar', ILockingProvider::LOCK_SHARED));
+		$this->assertFalse($this->instance->isLocked('bar', ILockingProvider::LOCK_EXCLUSIVE));
+		$this->assertFalse($this->instance->isLocked('asd', ILockingProvider::LOCK_EXCLUSIVE));
+	}
+
+	public function testReleaseAllAfterUnlock() {
+		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
+		$this->instance->acquireLock('bar', ILockingProvider::LOCK_SHARED);
+		$this->instance->acquireLock('asd', ILockingProvider::LOCK_EXCLUSIVE);
+
+		$this->instance->releaseLock('bar', ILockingProvider::LOCK_SHARED);
+
+		$this->instance->releaseAll();
+
+		$this->assertFalse($this->instance->isLocked('foo', ILockingProvider::LOCK_SHARED));
+		$this->assertFalse($this->instance->isLocked('asd', ILockingProvider::LOCK_EXCLUSIVE));
+	}
+
 	public function testReleaseAfterReleaseAll() {
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
 		$this->instance->acquireLock('foo', ILockingProvider::LOCK_SHARED);
diff --git a/tests/lib/memcache/memcached.php b/tests/lib/memcache/memcached.php
index 51a78996dd..3ea9216029 100644
--- a/tests/lib/memcache/memcached.php
+++ b/tests/lib/memcache/memcached.php
@@ -26,4 +26,27 @@ class Memcached extends Cache {
 		parent::setUp();
 		$this->instance = new \OC\Memcache\Memcached($this->getUniqueID());
 	}
+
+	public function testClear() {
+		// Memcached is sometimes broken with clear(), so we don't test it thoroughly
+		$value='ipsum lorum';
+		$this->instance->set('1_value1', $value);
+		$this->instance->set('1_value2', $value);
+		$this->instance->set('2_value1', $value);
+		$this->instance->set('3_value1', $value);
+
+		$this->assertTrue($this->instance->clear('1_'));
+
+		$this->assertFalse($this->instance->hasKey('1_value1'));
+		$this->assertFalse($this->instance->hasKey('1_value2'));
+		//$this->assertTrue($this->instance->hasKey('2_value1'));
+		//$this->assertTrue($this->instance->hasKey('3_value1'));
+
+		$this->assertTrue($this->instance->clear());
+
+		$this->assertFalse($this->instance->hasKey('1_value1'));
+		$this->assertFalse($this->instance->hasKey('1_value2'));
+		$this->assertFalse($this->instance->hasKey('2_value1'));
+		$this->assertFalse($this->instance->hasKey('3_value1'));
+	}
 }
diff --git a/tests/lib/notification/actiontest.php b/tests/lib/notification/actiontest.php
new file mode 100644
index 0000000000..e319c250cc
--- /dev/null
+++ b/tests/lib/notification/actiontest.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 Test\Notification;
+
+
+use OC\Notification\Action;
+use OC\Notification\IAction;
+use Test\TestCase;
+
+class ActionTest extends TestCase {
+	/** @var IAction */
+	protected $action;
+
+	public function setUp() {
+		parent::setUp();
+		$this->action = new Action();
+	}
+
+	public function dataSetLabel() {
+		return [
+			['test1'],
+			[str_repeat('a', 1)],
+			[str_repeat('a', 32)],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetLabel
+	 * @param string $label
+	 */
+	public function testSetLabel($label) {
+		$this->assertSame('', $this->action->getLabel());
+		$this->action->setLabel($label);
+		$this->assertSame($label, $this->action->getLabel());
+	}
+
+	public function dataSetLabelInvalid() {
+		return [
+			[true],
+			[false],
+			[0],
+			[1],
+			[''],
+			[str_repeat('a', 33)],
+			[[]],
+			[[str_repeat('a', 33)]],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetLabelInvalid
+	 * @param string $label
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetLabelInvalid($label) {
+		$this->action->setLabel($label);
+	}
+
+	public function dataSetParsedLabel() {
+		return [
+			['test1'],
+			[str_repeat('a', 1)],
+			[str_repeat('a', 32)],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetParsedLabel
+	 * @param string $label
+	 */
+	public function testSetParsedLabel($label) {
+		$this->assertSame('', $this->action->getParsedLabel());
+		$this->action->setParsedLabel($label);
+		$this->assertSame($label, $this->action->getParsedLabel());
+	}
+
+	public function dataSetParsedLabelInvalid() {
+		return [
+			[true],
+			[false],
+			[0],
+			[1],
+			[''],
+			[[]],
+			[[str_repeat('a', 33)]],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetParsedLabelInvalid
+	 * @param string $label
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetParsedLabelInvalid($label) {
+		$this->action->setParsedLabel($label);
+	}
+
+	public function dataSetLink() {
+		return [
+			['test1', 'GET'],
+			['test2', 'POST'],
+			[str_repeat('a', 1), 'PUT'],
+			[str_repeat('a', 256), 'DELETE'],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetLink
+	 * @param string $link
+	 * @param string $type
+	 */
+	public function testSetLink($link, $type) {
+		$this->assertSame('', $this->action->getLink());
+		$this->action->setLink($link, $type);
+		$this->assertSame($link, $this->action->getLink());
+		$this->assertSame($type, $this->action->getRequestType());
+	}
+
+	public function dataSetLinkInvalid() {
+		return [
+			// Invalid link
+			[true, 'GET'],
+			[false, 'GET'],
+			[0, 'GET'],
+			[1, 'GET'],
+			['', 'GET'],
+			[str_repeat('a', 257), 'GET'],
+			[[], 'GET'],
+			[[str_repeat('a', 257)], 'GET'],
+
+			// Invalid type
+			['url', 'notGET'],
+			['url', true],
+			['url', false],
+			['url', 0],
+			['url', 1],
+			['url', []],
+			['url', ['GET']],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetLinkInvalid
+	 * @param string $link
+	 * @param string $type
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetLinkInvalid($link, $type) {
+		$this->action->setLink($link, $type);
+	}
+
+	public function dataSetIcon() {
+		return [
+			['test1'],
+			[str_repeat('a', 1)],
+			[str_repeat('a', 64)],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetIcon
+	 * @param string $icon
+	 */
+	public function testSetIcon($icon) {
+		$this->assertSame('', $this->action->getIcon());
+		$this->action->setIcon($icon);
+		$this->assertSame($icon, $this->action->getIcon());
+	}
+
+	public function dataSetIconInvalid() {
+		return [
+			[true],
+			[false],
+			[0],
+			[1],
+			[''],
+			[str_repeat('a', 65)],
+			[[]],
+			[[str_repeat('a', 65)]],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetIconInvalid
+	 * @param string $icon
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetIconInvalid($icon) {
+		$this->action->setIcon($icon);
+	}
+
+	public function testIsValid() {
+		$this->assertFalse($this->action->isValid());
+		$this->assertFalse($this->action->isValidParsed());
+		$this->action->setLabel('label');
+		$this->assertFalse($this->action->isValid());
+		$this->assertFalse($this->action->isValidParsed());
+		$this->action->setLink('link', 'GET');
+		$this->assertTrue($this->action->isValid());
+		$this->assertFalse($this->action->isValidParsed());
+	}
+
+	public function testIsValidParsed() {
+		$this->assertFalse($this->action->isValid());
+		$this->assertFalse($this->action->isValidParsed());
+		$this->action->setParsedLabel('label');
+		$this->assertFalse($this->action->isValid());
+		$this->assertFalse($this->action->isValidParsed());
+		$this->action->setLink('link', 'GET');
+		$this->assertFalse($this->action->isValid());
+		$this->assertTrue($this->action->isValidParsed());
+	}
+}
diff --git a/tests/lib/notification/managertest.php b/tests/lib/notification/managertest.php
new file mode 100644
index 0000000000..fa2a0586f9
--- /dev/null
+++ b/tests/lib/notification/managertest.php
@@ -0,0 +1,345 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 Test\Notification;
+
+use OC\Notification\Manager;
+use OC\Notification\IManager;
+use Test\TestCase;
+
+class ManagerTest extends TestCase {
+	/** @var IManager */
+	protected $manager;
+
+	public function setUp() {
+		parent::setUp();
+		$this->manager = new Manager();
+	}
+
+	public function testRegisterApp() {
+		$app = $this->getMockBuilder('OC\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$closure = function() use ($app) {
+			return $app;
+		};
+
+		$this->assertEquals([], $this->invokePrivate($this->manager, 'getApps'));
+
+		$this->manager->registerApp($closure);
+
+		$this->assertEquals([$app], $this->invokePrivate($this->manager, 'getApps'));
+		$this->assertEquals([$app], $this->invokePrivate($this->manager, 'getApps'));
+
+		$this->manager->registerApp($closure);
+
+		$this->assertEquals([$app, $app], $this->invokePrivate($this->manager, 'getApps'));
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testRegisterAppInvalid() {
+		$notifier = $this->getMockBuilder('OC\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$closure = function() use ($notifier) {
+			return $notifier;
+		};
+
+		$this->manager->registerApp($closure);
+
+		$this->invokePrivate($this->manager, 'getApps');
+	}
+
+	public function testRegisterNotifier() {
+		$notifier = $this->getMockBuilder('OC\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$closure = function() use ($notifier) {
+			return $notifier;
+		};
+
+		$this->assertEquals([], $this->invokePrivate($this->manager, 'getNotifiers'));
+
+		$this->manager->registerNotifier($closure);
+
+		$this->assertEquals([$notifier], $this->invokePrivate($this->manager, 'getNotifiers'));
+		$this->assertEquals([$notifier], $this->invokePrivate($this->manager, 'getNotifiers'));
+
+		$this->manager->registerNotifier($closure);
+
+		$this->assertEquals([$notifier, $notifier], $this->invokePrivate($this->manager, 'getNotifiers'));
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testRegisterNotifierInvalid() {
+		$app = $this->getMockBuilder('OC\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$closure = function() use ($app) {
+			return $app;
+		};
+
+		$this->manager->registerNotifier($closure);
+
+		$this->invokePrivate($this->manager, 'getNotifiers');
+	}
+
+	public function testCreateNotification() {
+		$action = $this->manager->createNotification();
+		$this->assertInstanceOf('OC\Notification\INotification', $action);
+	}
+
+	public function testNotify() {
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValid')
+			->willReturn(true);
+
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
+		$app = $this->getMockBuilder('OC\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app->expects($this->once())
+			->method('notify')
+			->with($notification);
+
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
+		$app2 = $this->getMockBuilder('OC\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app2->expects($this->once())
+			->method('notify')
+			->with($notification);
+
+		$this->manager->registerApp(function() use ($app) {
+			return $app;
+		});
+		$this->manager->registerApp(function() use ($app2) {
+			return $app2;
+		});
+
+		$this->manager->notify($notification);
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testNotifyInvalid() {
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValid')
+			->willReturn(false);
+
+		$this->manager->notify($notification);
+	}
+
+	public function testPrepare() {
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(true);
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification2 */
+		$notification2 = $this->getMockBuilder('OC\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification2->expects($this->exactly(2))
+			->method('isValidParsed')
+			->willReturn(true);
+
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
+		$notifier = $this->getMockBuilder('OC\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+		$notifier->expects($this->once())
+			->method('prepare')
+			->with($notification, 'en')
+			->willReturnArgument(0);
+
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier2 */
+		$notifier2 = $this->getMockBuilder('OC\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+		$notifier2->expects($this->once())
+			->method('prepare')
+			->with($notification, 'en')
+			->willReturn($notification2);
+
+		$this->manager->registerNotifier(function() use ($notifier) {
+			return $notifier;
+		});
+		$this->manager->registerNotifier(function() use ($notifier2) {
+			return $notifier2;
+		});
+
+		$this->assertEquals($notification2, $this->manager->prepare($notification, 'en'));
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testPrepareInvalid() {
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(false);
+
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
+		$notifier = $this->getMockBuilder('OC\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+		$notifier->expects($this->once())
+			->method('prepare')
+			->with($notification, 'de')
+			->willReturnArgument(0);
+
+		$this->manager->registerNotifier(function() use ($notifier) {
+			return $notifier;
+		});
+
+		$this->manager->prepare($notification, 'de');
+	}
+
+	public function testPrepareNotifierThrows() {
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(true);
+
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $notifier */
+		$notifier = $this->getMockBuilder('OC\Notification\INotifier')
+			->disableOriginalConstructor()
+			->getMock();
+		$notifier->expects($this->once())
+			->method('prepare')
+			->with($notification, 'de')
+			->willThrowException(new \InvalidArgumentException);
+
+		$this->manager->registerNotifier(function() use ($notifier) {
+			return $notifier;
+		});
+
+		$this->assertEquals($notification, $this->manager->prepare($notification, 'de'));
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testPrepareNoNotifier() {
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+		$notification->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(false);
+
+		$this->manager->prepare($notification, 'en');
+	}
+
+	public function testMarkProcessed() {
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
+		$app = $this->getMockBuilder('OC\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app->expects($this->once())
+			->method('markProcessed')
+			->with($notification);
+
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
+		$app2 = $this->getMockBuilder('OC\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app2->expects($this->once())
+			->method('markProcessed')
+			->with($notification);
+
+		$this->manager->registerApp(function() use ($app) {
+			return $app;
+		});
+		$this->manager->registerApp(function() use ($app2) {
+			return $app2;
+		});
+
+		$this->manager->markProcessed($notification);
+	}
+
+	public function testGetCount() {
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('OC\Notification\INotification')
+			->disableOriginalConstructor()
+			->getMock();
+
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app */
+		$app = $this->getMockBuilder('OC\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app->expects($this->once())
+			->method('getCount')
+			->with($notification)
+			->willReturn(21);
+
+		/** @var \OC\Notification\IApp|\PHPUnit_Framework_MockObject_MockObject $app2 */
+		$app2 = $this->getMockBuilder('OC\Notification\IApp')
+			->disableOriginalConstructor()
+			->getMock();
+		$app2->expects($this->once())
+			->method('getCount')
+			->with($notification)
+			->willReturn(42);
+
+		$this->manager->registerApp(function() use ($app) {
+			return $app;
+		});
+		$this->manager->registerApp(function() use ($app2) {
+			return $app2;
+		});
+
+		$this->assertSame(63, $this->manager->getCount($notification));
+	}
+}
diff --git a/tests/lib/notification/notificationtest.php b/tests/lib/notification/notificationtest.php
new file mode 100644
index 0000000000..a790a53eaa
--- /dev/null
+++ b/tests/lib/notification/notificationtest.php
@@ -0,0 +1,601 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 Test\Notification;
+
+
+use OC\Notification\Notification;
+use OC\Notification\INotification;
+use Test\TestCase;
+
+class NotificationTest extends TestCase {
+	/** @var INotification */
+	protected $notification;
+
+	public function setUp() {
+		parent::setUp();
+		$this->notification = new Notification();
+	}
+
+	protected function dataValidString($maxLength) {
+		$dataSets = [
+			['test1'],
+			[str_repeat('a', 1)],
+		];
+		if ($maxLength !== false) {
+			$dataSets[] = [str_repeat('a', $maxLength)];
+		}
+		return $dataSets;
+	}
+
+	protected function dataInvalidString($maxLength) {
+		$dataSets = [
+			[true],
+			[false],
+			[0],
+			[1],
+			[''],
+			[[]],
+		];
+		if ($maxLength !== false) {
+			$dataSets[] = [str_repeat('a', $maxLength + 1)];
+			$dataSets[] = [[str_repeat('a', $maxLength + 1)]];
+		}
+		return $dataSets;
+	}
+
+	protected function dataValidInt() {
+		return [
+			[0],
+			[1],
+			[time()],
+		];
+	}
+
+	protected function dataInvalidInt() {
+		return [
+			[true],
+			[false],
+			[''],
+			['a'],
+			[str_repeat('a', 256)],
+			[[]],
+			[['a']],
+			[[str_repeat('a', 256)]],
+		];
+	}
+
+	public function dataSetApp() {
+		return $this->dataValidString(32);
+	}
+
+	/**
+	 * @dataProvider dataSetApp
+	 * @param string $app
+	 */
+	public function testSetApp($app) {
+		$this->assertSame('', $this->notification->getApp());
+		$this->notification->setApp($app);
+		$this->assertSame($app, $this->notification->getApp());
+	}
+
+	public function dataSetAppInvalid() {
+		return $this->dataInvalidString(32);
+	}
+
+	/**
+	 * @dataProvider dataSetAppInvalid
+	 * @param mixed $app
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetAppInvalid($app) {
+		$this->notification->setApp($app);
+	}
+
+	public function dataSetUser() {
+		return $this->dataValidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetUser
+	 * @param string $user
+	 */
+	public function testSetUser($user) {
+		$this->assertSame('', $this->notification->getUser());
+		$this->notification->setUser($user);
+		$this->assertSame($user, $this->notification->getUser());
+	}
+
+	public function dataSetUserInvalid() {
+		return $this->dataInvalidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetUserInvalid
+	 * @param mixed $user
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetUserInvalid($user) {
+		$this->notification->setUser($user);
+	}
+
+	public function dataSetTimestamp() {
+		return $this->dataValidInt();
+	}
+
+	/**
+	 * @dataProvider dataSetTimestamp
+	 * @param int $timestamp
+	 */
+	public function testSetTimestamp($timestamp) {
+		$this->assertSame(0, $this->notification->getTimestamp());
+		$this->notification->setTimestamp($timestamp);
+		$this->assertSame($timestamp, $this->notification->getTimestamp());
+	}
+
+	public function dataSetTimestampInvalid() {
+		return $this->dataInvalidInt();
+	}
+
+	/**
+	 * @dataProvider dataSetTimestampInvalid
+	 * @param mixed $timestamp
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetTimestampInvalid($timestamp) {
+		$this->notification->setTimestamp($timestamp);
+	}
+
+	public function dataSetObject() {
+		return [
+			['a', 1],
+			[str_repeat('a', 64), time()],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetObject
+	 * @param string $type
+	 * @param int $id
+	 */
+	public function testSetObject($type, $id) {
+		$this->assertSame('', $this->notification->getObjectType());
+		$this->assertSame(0, $this->notification->getObjectId());
+		$this->notification->setObject($type, $id);
+		$this->assertSame($type, $this->notification->getObjectType());
+		$this->assertSame($id, $this->notification->getObjectId());
+	}
+
+	public function dataSetObjectTypeInvalid() {
+		return $this->dataInvalidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetObjectTypeInvalid
+	 * @param mixed $type
+	 *
+	 * @expectedException \InvalidArgumentException
+	 * @expectedMessage 'The given object type is invalid'
+	 */
+	public function testSetObjectTypeInvalid($type) {
+		$this->notification->setObject($type, 1337);
+	}
+
+	public function dataSetObjectIdInvalid() {
+		return $this->dataInvalidInt();
+	}
+
+	/**
+	 * @dataProvider dataSetObjectIdInvalid
+	 * @param mixed $id
+	 *
+	 * @expectedException \InvalidArgumentException
+	 * @expectedMessage 'The given object id is invalid'
+	 */
+	public function testSetObjectIdInvalid($id) {
+		$this->notification->setObject('object', $id);
+	}
+
+	public function dataSetSubject() {
+		return [
+			['a', []],
+			[str_repeat('a', 64), [str_repeat('a', 160)]],
+			[str_repeat('a', 64), array_fill(0, 160, 'a')],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetSubject
+	 * @param string $subject
+	 * @param array $parameters
+	 */
+	public function testSetSubject($subject, $parameters) {
+		$this->assertSame('', $this->notification->getSubject());
+		$this->assertSame([], $this->notification->getSubjectParameters());
+		$this->notification->setSubject($subject, $parameters);
+		$this->assertSame($subject, $this->notification->getSubject());
+		$this->assertSame($parameters, $this->notification->getSubjectParameters());
+	}
+
+	public function dataSetSubjectInvalidSubject() {
+		return $this->dataInvalidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetSubjectInvalidSubject
+	 * @param mixed $subject
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetSubjectInvalidSubject($subject) {
+		$this->notification->setSubject($subject, []);
+	}
+
+	public function dataSetParsedSubject() {
+		return $this->dataValidString(false);
+	}
+
+	/**
+	 * @dataProvider dataSetParsedSubject
+	 * @param string $subject
+	 */
+	public function testSetParsedSubject($subject) {
+		$this->assertSame('', $this->notification->getParsedSubject());
+		$this->notification->setParsedSubject($subject);
+		$this->assertSame($subject, $this->notification->getParsedSubject());
+	}
+
+	public function dataSetParsedSubjectInvalid() {
+		return $this->dataInvalidString(false);
+	}
+
+	/**
+	 * @dataProvider dataSetParsedSubjectInvalid
+	 * @param mixed $subject
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetParsedSubjectInvalid($subject) {
+		$this->notification->setParsedSubject($subject);
+	}
+
+	public function dataSetMessage() {
+		return [
+			['a', []],
+			[str_repeat('a', 64), [str_repeat('a', 160)]],
+			[str_repeat('a', 64), array_fill(0, 160, 'a')],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSetMessage
+	 * @param string $message
+	 * @param array $parameters
+	 */
+	public function testSetMessage($message, $parameters) {
+		$this->assertSame('', $this->notification->getMessage());
+		$this->assertSame([], $this->notification->getMessageParameters());
+		$this->notification->setMessage($message, $parameters);
+		$this->assertSame($message, $this->notification->getMessage());
+		$this->assertSame($parameters, $this->notification->getMessageParameters());
+	}
+
+	public function dataSetMessageInvalidMessage() {
+		return $this->dataInvalidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetMessageInvalidMessage
+	 * @param mixed $message
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetMessageInvalidMessage($message) {
+		$this->notification->setMessage($message, []);
+	}
+
+	public function dataSetParsedMessage() {
+		return $this->dataValidString(false);
+	}
+
+	/**
+	 * @dataProvider dataSetParsedMessage
+	 * @param string $message
+	 */
+	public function testSetParsedMessage($message) {
+		$this->assertSame('', $this->notification->getParsedMessage());
+		$this->notification->setParsedMessage($message);
+		$this->assertSame($message, $this->notification->getParsedMessage());
+	}
+
+	public function dataSetParsedMessageInvalid() {
+		return $this->dataInvalidString(false);
+	}
+
+	/**
+	 * @dataProvider dataSetParsedMessageInvalid
+	 * @param mixed $message
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetParsedMessageInvalid($message) {
+		$this->notification->setParsedMessage($message);
+	}
+
+	public function dataSetLink() {
+		return $this->dataValidString(4000);
+	}
+
+	/**
+	 * @dataProvider dataSetLink
+	 * @param string $link
+	 */
+	public function testSetLink($link) {
+		$this->assertSame('', $this->notification->getLink());
+		$this->notification->setLink($link);
+		$this->assertSame($link, $this->notification->getLink());
+	}
+
+	public function dataSetLinkInvalid() {
+		return $this->dataInvalidString(4000);
+	}
+
+	/**
+	 * @dataProvider dataSetLinkInvalid
+	 * @param mixed $link
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetLinkInvalid($link) {
+		$this->notification->setLink($link);
+	}
+
+	public function dataSetIcon() {
+		return $this->dataValidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetIcon
+	 * @param string $icon
+	 */
+	public function testSetIcon($icon) {
+		$this->assertSame('', $this->notification->getIcon());
+		$this->notification->setIcon($icon);
+		$this->assertSame($icon, $this->notification->getIcon());
+	}
+
+	public function dataSetIconInvalid() {
+		return $this->dataInvalidString(64);
+	}
+
+	/**
+	 * @dataProvider dataSetIconInvalid
+	 * @param mixed $icon
+	 *
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testSetIconInvalid($icon) {
+		$this->notification->setIcon($icon);
+	}
+
+	public function testCreateAction() {
+		$action = $this->notification->createAction();
+		$this->assertInstanceOf('OC\Notification\IAction', $action);
+	}
+
+	public function testAddAction() {
+		/** @var \OC\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OC\Notification\IAction')
+			->disableOriginalConstructor()
+			->getMock();
+		$action->expects($this->once())
+			->method('isValid')
+			->willReturn(true);
+		$action->expects($this->never())
+			->method('isValidParsed');
+
+		$this->notification->addAction($action);
+
+		$this->assertEquals([$action], $this->notification->getActions());
+		$this->assertEquals([], $this->notification->getParsedActions());
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testAddActionInvalid() {
+		/** @var \OC\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OC\Notification\IAction')
+			->disableOriginalConstructor()
+			->getMock();
+		$action->expects($this->once())
+			->method('isValid')
+			->willReturn(false);
+		$action->expects($this->never())
+			->method('isValidParsed');
+
+		$this->notification->addAction($action);
+	}
+
+	public function testAddParsedAction() {
+		/** @var \OC\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OC\Notification\IAction')
+			->disableOriginalConstructor()
+			->getMock();
+		$action->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(true);
+		$action->expects($this->never())
+			->method('isValid');
+
+		$this->notification->addParsedAction($action);
+
+		$this->assertEquals([$action], $this->notification->getParsedActions());
+		$this->assertEquals([], $this->notification->getActions());
+	}
+
+	/**
+	 * @expectedException \InvalidArgumentException
+	 */
+	public function testAddParsedActionInvalid() {
+		/** @var \OC\Notification\IAction|\PHPUnit_Framework_MockObject_MockObject $action */
+		$action = $this->getMockBuilder('OC\Notification\IAction')
+			->disableOriginalConstructor()
+			->getMock();
+		$action->expects($this->once())
+			->method('isValidParsed')
+			->willReturn(false);
+		$action->expects($this->never())
+			->method('isValid');
+
+		$this->notification->addParsedAction($action);
+	}
+
+	public function dataIsValid() {
+		return [
+			[false, '', false],
+			[true, '', false],
+			[false, 'a', false],
+			[true, 'a', true],
+		];
+	}
+
+	/**
+	 * @dataProvider dataIsValid
+	 *
+	 * @param bool $isValidCommon
+	 * @param string $subject
+	 * @param bool $expected
+	 */
+	public function testIsValid($isValidCommon, $subject, $expected) {
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('\OC\Notification\Notification')
+			->setMethods([
+				'isValidCommon',
+				'getSubject',
+			])
+			->getMock();
+
+		$notification->expects($this->once())
+			->method('isValidCommon')
+			->willReturn($isValidCommon);
+
+		$notification->expects(!$isValidCommon ? $this->never() : $this->once())
+			->method('getSubject')
+			->willReturn($subject);
+
+		$notification->expects($this->never())
+			->method('getParsedSubject')
+			->willReturn($subject);
+
+		$this->assertEquals($expected, $notification->isValid());
+	}
+
+	/**
+	 * @dataProvider dataIsValid
+	 *
+	 * @param bool $isValidCommon
+	 * @param string $subject
+	 * @param bool $expected
+	 */
+	public function testIsParsedValid($isValidCommon, $subject, $expected) {
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('\OC\Notification\Notification')
+			->setMethods([
+				'isValidCommon',
+				'getParsedSubject',
+			])
+			->getMock();
+
+		$notification->expects($this->once())
+			->method('isValidCommon')
+			->willReturn($isValidCommon);
+
+		$notification->expects(!$isValidCommon ? $this->never() : $this->once())
+			->method('getParsedSubject')
+			->willReturn($subject);
+
+		$notification->expects($this->never())
+			->method('getSubject')
+			->willReturn($subject);
+
+		$this->assertEquals($expected, $notification->isValidParsed());
+	}
+
+	public function dataIsValidCommon() {
+		return [
+			['', '', 0, '', 0, false],
+			['app', '', 0, '', 0, false],
+			['app', 'user', 0, '', 0, false],
+			['app', 'user', time(), '', 0, false],
+			['app', 'user', time(), 'type', 0, false],
+			['app', 'user', time(), 'type', 42, true],
+		];
+	}
+
+	/**
+	 * @dataProvider dataIsValidCommon
+	 *
+	 * @param string $app
+	 * @param string $user
+	 * @param int $timestamp
+	 * @param string $objectType
+	 * @param int $objectId
+	 * @param bool $expected
+	 */
+	public function testIsValidCommon($app, $user, $timestamp, $objectType, $objectId, $expected) {
+		/** @var \OC\Notification\INotification|\PHPUnit_Framework_MockObject_MockObject $notification */
+		$notification = $this->getMockBuilder('\OC\Notification\Notification')
+			->setMethods([
+				'getApp',
+				'getUser',
+				'getTimestamp',
+				'getObjectType',
+				'getObjectId',
+			])
+			->getMock();
+
+		$notification->expects($this->any())
+			->method('getApp')
+			->willReturn($app);
+
+		$notification->expects($this->any())
+			->method('getUser')
+			->willReturn($user);
+
+		$notification->expects($this->any())
+			->method('getTimestamp')
+			->willReturn($timestamp);
+
+		$notification->expects($this->any())
+			->method('getObjectType')
+			->willReturn($objectType);
+
+		$notification->expects($this->any())
+			->method('getObjectId')
+			->willReturn($objectId);
+
+		$this->assertEquals($expected, $this->invokePrivate($notification, 'isValidCommon'));
+	}
+}
diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php
index 40ffc14612..da36e7de58 100644
--- a/tests/lib/repair/repairmimetypes.php
+++ b/tests/lib/repair/repairmimetypes.php
@@ -22,8 +22,11 @@ class RepairMimeTypes extends \Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$this->storage = new \OC\Files\Storage\Temporary([]);
 
+		$this->savedMimetypeLoader = \OC::$server->getMimeTypeLoader();
+		$this->mimetypeLoader = \OC::$server->getMimeTypeLoader();
+
+		$this->storage = new \OC\Files\Storage\Temporary([]);
 		$this->repair = new \OC\Repair\RepairMimeTypes();
 	}
 
@@ -33,14 +36,13 @@ class RepairMimeTypes extends \Test\TestCase {
 		\OC_DB::executeAudited($sql, [$this->storage->getId()]);
 		$this->clearMimeTypes();
 
-		DummyFileCache::clearCachedMimeTypes();
-
 		parent::tearDown();
 	}
 
 	private function clearMimeTypes() {
 		$sql = 'DELETE FROM `*PREFIX*mimetypes`';
 		\OC_DB::executeAudited($sql);
+		$this->mimetypeLoader->reset();
 	}
 
 	private function addEntries($entries) {
@@ -86,8 +88,7 @@ class RepairMimeTypes extends \Test\TestCase {
 		$this->repair->run();
 
 		// force mimetype reload
-		DummyFileCache::clearCachedMimeTypes();
-		$this->storage->getCache()->loadMimeTypes();
+		$this->mimetypeLoader->reset();
 
 		$this->checkEntries($fixedMimeTypes);
 	}
@@ -434,14 +435,3 @@ class RepairMimeTypes extends \Test\TestCase {
 	}
 }
 
-/**
- * Dummy class to access protected members
- */
-class DummyFileCache extends \OC\Files\Cache\Cache {
-
-	public static function clearCachedMimeTypes() {
-		self::$mimetypeIds = [];
-		self::$mimetypes = [];
-	}
-}
-
diff --git a/tests/lib/security/certificate.php b/tests/lib/security/certificate.php
index 7fc8bbbdf2..81d159ebd5 100644
--- a/tests/lib/security/certificate.php
+++ b/tests/lib/security/certificate.php
@@ -61,29 +61,26 @@ class CertificateTest extends \Test\TestCase {
 	}
 
 	public function testGetOrganization() {
-		$this->assertSame('ownCloud Inc.', $this->goodCertificate->getOrganization());
+		$this->assertSame('ownCloud Security', $this->goodCertificate->getOrganization());
 		$this->assertSame('Internet Widgits Pty Ltd', $this->invalidCertificate->getOrganization());
 	}
 
 	public function testGetIssueDate() {
-		$expected = new DateTime('2014-08-27 08:45:52 GMT');
+		$expected = new DateTime('2015-08-27 20:03:42 GMT');
 		$this->assertEquals($expected->getTimestamp(), $this->goodCertificate->getIssueDate()->getTimestamp());
-		$expected = new DateTime('2014-08-27 08:48:51 GMT');
+		$expected = new DateTime('2015-08-27 20:19:13 GMT');
 		$this->assertEquals($expected->getTimestamp(), $this->invalidCertificate->getIssueDate()->getTimestamp());
 	}
 
 	public function testGetExpireDate() {
-		$expected = new DateTime('2015-08-27 08:45:52 GMT');
+		$expected = new DateTime('2025-08-24 20:03:42 GMT');
 		$this->assertEquals($expected->getTimestamp(), $this->goodCertificate->getExpireDate()->getTimestamp());
-		$expected = new DateTime('2015-08-27 08:48:51 GMT');
+		$expected = new DateTime('2025-08-24 20:19:13 GMT');
 		$this->assertEquals($expected->getTimestamp(), $this->invalidCertificate->getExpireDate()->getTimestamp());
 		$expected = new DateTime('2014-08-28 09:12:43 GMT');
 		$this->assertEquals($expected->getTimestamp(), $this->expiredCertificate->getExpireDate()->getTimestamp());
 	}
 
-	/**
-	 * Obviously the following test case might fail after 2015-08-27, just create a new certificate with longer validity then
-	 */
 	public function testIsExpired() {
 		$this->assertSame(false, $this->goodCertificate->isExpired());
 		$this->assertSame(false, $this->invalidCertificate->isExpired());
@@ -97,7 +94,7 @@ class CertificateTest extends \Test\TestCase {
 	}
 
 	public function testGetIssuerOrganization() {
-		$this->assertSame('ownCloud Inc.', $this->goodCertificate->getIssuerOrganization());
+		$this->assertSame('ownCloud Security', $this->goodCertificate->getIssuerOrganization());
 		$this->assertSame('Internet Widgits Pty Ltd', $this->invalidCertificate->getIssuerOrganization());
 		$this->assertSame('Internet Widgits Pty Ltd', $this->expiredCertificate->getIssuerOrganization());
 	}
diff --git a/tests/lib/security/certificatemanager.php b/tests/lib/security/certificatemanager.php
index fab1c20844..092f9efdd1 100644
--- a/tests/lib/security/certificatemanager.php
+++ b/tests/lib/security/certificatemanager.php
@@ -26,7 +26,11 @@ class CertificateManagerTest extends \Test\TestCase {
 		\OC\Files\Filesystem::tearDown();
 		\OC_Util::setupFS($this->username);
 
-		$this->certificateManager = new CertificateManager($this->username, new \OC\Files\View());
+		$config = $this->getMock('OCP\IConfig');
+		$config->expects($this->any())->method('getSystemValue')
+			->with('installed', false)->willReturn(true);
+
+		$this->certificateManager = new CertificateManager($this->username, new \OC\Files\View(), $config);
 	}
 
 	protected function tearDown() {
diff --git a/tests/lib/server.php b/tests/lib/server.php
index 9c5c83ceb5..96a476bd4d 100644
--- a/tests/lib/server.php
+++ b/tests/lib/server.php
@@ -56,6 +56,7 @@ class Server extends \Test\TestCase {
 			['ContactsManager', '\OCP\Contacts\IManager'],
 			['Crypto', '\OC\Security\Crypto'],
 			['Crypto', '\OCP\Security\ICrypto'],
+			['CryptoWrapper', '\OC\Session\CryptoWrapper'],
 
 			['DatabaseConnection', '\OC\DB\Connection'],
 			['DatabaseConnection', '\OCP\IDBConnection'],
@@ -89,6 +90,7 @@ class Server extends \Test\TestCase {
 			['JobList', '\OCP\BackgroundJob\IJobList'],
 
 			['L10NFactory', '\OC\L10N\Factory'],
+			['L10NFactory', '\OCP\L10N\IFactory'],
 			['LockingProvider', '\OCP\Lock\ILockingProvider'],
 			['Logger', '\OC\Log'],
 			['Logger', '\OCP\ILogger'],
@@ -102,6 +104,8 @@ class Server extends \Test\TestCase {
 
 			['NavigationManager', '\OC\NavigationManager'],
 			['NavigationManager', '\OCP\INavigationManager'],
+			['NotificationManager', '\OC\Notification\Manager'],
+			['NotificationManager', '\OC\Notification\IManager'],
 			['UserCache', '\OC\Cache\File'],
 			['UserCache', '\OCP\ICache'],
 
diff --git a/tests/lib/session/cryptosessiondatatest.php b/tests/lib/session/cryptosessiondatatest.php
new file mode 100644
index 0000000000..ee6bcbf11c
--- /dev/null
+++ b/tests/lib/session/cryptosessiondatatest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 Test\Session;
+
+use OC\Session\CryptoSessionData;
+
+class CryptoSessionDataTest extends Session {
+	/** @var \PHPUnit_Framework_MockObject_MockObject|\OCP\Security\ICrypto */
+	protected $crypto;
+
+	/** @var \OCP\ISession */
+	protected $wrappedSession;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->wrappedSession = new \OC\Session\Memory($this->getUniqueID());
+		$this->crypto = $this->getMockBuilder('OCP\Security\ICrypto')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->crypto->expects($this->any())
+			->method('encrypt')
+			->willReturnCallback(function ($input) {
+				return '#' . $input . '#';
+			});
+		$this->crypto->expects($this->any())
+			->method('decrypt')
+			->willReturnCallback(function ($input) {
+				return substr($input, 1, -1);
+			});
+
+		$this->instance = new CryptoSessionData($this->wrappedSession, $this->crypto, 'PASS');
+	}
+}
diff --git a/tests/lib/session/cryptowrappingtest.php b/tests/lib/session/cryptowrappingtest.php
new file mode 100644
index 0000000000..e1fadbf933
--- /dev/null
+++ b/tests/lib/session/cryptowrappingtest.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @author Joas Schilling <nickvergessen@owncloud.com>
+ *
+ * @copyright Copyright (c) 2015, 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 Test\Session;
+
+use OC\Session\CryptoSessionData;
+use Test\TestCase;
+
+class CryptoWrappingTest extends TestCase {
+	/** @var \PHPUnit_Framework_MockObject_MockObject|\OCP\Security\ICrypto */
+	protected $crypto;
+
+	/** @var \PHPUnit_Framework_MockObject_MockObject|\OCP\ISession */
+	protected $wrappedSession;
+
+	/** @var \OC\Session\CryptoSessionData */
+	protected $instance;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->wrappedSession = $this->getMockBuilder('OCP\ISession')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->crypto = $this->getMockBuilder('OCP\Security\ICrypto')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->crypto->expects($this->any())
+			->method('encrypt')
+			->willReturnCallback(function ($input) {
+				return $input;
+			});
+		$this->crypto->expects($this->any())
+			->method('decrypt')
+			->willReturnCallback(function ($input) {
+				return substr($input, 1, -1);
+			});
+
+		$this->instance = new CryptoSessionData($this->wrappedSession, $this->crypto, 'PASS');
+	}
+
+	public function testUnwrappingGet() {
+		$unencryptedValue = 'foobar';
+		$encryptedValue = $this->crypto->encrypt($unencryptedValue);
+
+		$this->wrappedSession->expects($this->once())
+			->method('get')
+			->with('encrypted_session_data')
+			->willReturnCallback(function () use ($encryptedValue) {
+				return $encryptedValue;
+			});
+
+		$this->assertSame($unencryptedValue, $this->wrappedSession->get('encrypted_session_data'));
+	}
+}
diff --git a/tests/lib/template.php b/tests/lib/template.php
index db58238eae..6e62d3955f 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -1,31 +1,31 @@
 <?php
-/**
-* ownCloud
-*
-* @author Bernhard Posselt
-* @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library 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 along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
 
+/**
+ * ownCloud
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library 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 along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 class Test_TemplateFunctions extends \Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
 
-		$loader = new \OC\Autoloader();
+		$loader = new \OC\Autoloader([OC::$SERVERROOT . '/lib']);
 		$loader->load('OC_Template');
 	}
 
@@ -60,7 +60,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 	// ---------------------------------------------------------------------------
 	// Test relative_modified_date with dates only
 	// ---------------------------------------------------------------------------
-	public function testRelativeDateToday(){
+	public function testRelativeDateToday() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -74,7 +74,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('today', $result);
 	}
 
-	public function testRelativeDateYesterday(){
+	public function testRelativeDateYesterday() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 24 * 3600;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -88,7 +88,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('yesterday', $result);
 	}
 
-	public function testRelativeDate2DaysAgo(){
+	public function testRelativeDate2DaysAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 48 * 3600;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -102,7 +102,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('2 days ago', $result);
 	}
 
-	public function testRelativeDateLastMonth(){
+	public function testRelativeDateLastMonth() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 31;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -115,7 +115,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('last month', $result);
 	}
 
-	public function testRelativeDateMonthsAgo(){
+	public function testRelativeDateMonthsAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 65;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -128,7 +128,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('4 months ago', $result);
 	}
 
-	public function testRelativeDateLastYear(){
+	public function testRelativeDateLastYear() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 365;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -141,7 +141,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('last year', $result);
 	}
 
-	public function testRelativeDateYearsAgo(){
+	public function testRelativeDateYearsAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 365.25 * 2;
 		$result = (string)relative_modified_date($elementTime, $currentTime, true);
@@ -158,7 +158,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 	// Test relative_modified_date with timestamps only (date + time value)
 	// ---------------------------------------------------------------------------
 
-	public function testRelativeTimeSecondsAgo(){
+	public function testRelativeTimeSecondsAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 5;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -166,7 +166,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('seconds ago', $result);
 	}
 
-	public function testRelativeTimeMinutesAgo(){
+	public function testRelativeTimeMinutesAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 190;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -174,7 +174,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('3 minutes ago', $result);
 	}
 
-	public function testRelativeTimeHoursAgo(){
+	public function testRelativeTimeHoursAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 7500;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -182,7 +182,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('2 hours ago', $result);
 	}
 
-	public function testRelativeTime2DaysAgo(){
+	public function testRelativeTime2DaysAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 48 * 3600;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -196,7 +196,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('2 days ago', $result);
 	}
 
-	public function testRelativeTimeLastMonth(){
+	public function testRelativeTimeLastMonth() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 31;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -209,7 +209,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('last month', $result);
 	}
 
-	public function testRelativeTimeMonthsAgo(){
+	public function testRelativeTimeMonthsAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 65;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -222,7 +222,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('4 months ago', $result);
 	}
 
-	public function testRelativeTimeLastYear(){
+	public function testRelativeTimeLastYear() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 365;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
@@ -235,7 +235,7 @@ class Test_TemplateFunctions extends \Test\TestCase {
 		$this->assertEquals('last year', $result);
 	}
 
-	public function testRelativeTimeYearsAgo(){
+	public function testRelativeTimeYearsAgo() {
 		$currentTime = 1380703592;
 		$elementTime = $currentTime - 86400 * 365.25 * 2;
 		$result = (string)relative_modified_date($elementTime, $currentTime, false);
diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php
index 0fa025d44c..8faf804a20 100644
--- a/tests/lib/tempmanager.php
+++ b/tests/lib/tempmanager.php
@@ -22,12 +22,13 @@ class NullLogger extends Log {
 }
 
 class TempManager extends \Test\TestCase {
-	protected $baseDir;
+
+	protected $baseDir = null;
 
 	protected function setUp() {
 		parent::setUp();
 
-		$this->baseDir = get_temp_dir() . $this->getUniqueID('/oc_tmp_test');
+		$this->baseDir = $this->getManager()->getTempBaseDir() . $this->getUniqueID('/oc_tmp_test');
 		if (!is_dir($this->baseDir)) {
 			mkdir($this->baseDir);
 		}
@@ -35,18 +36,30 @@ class TempManager extends \Test\TestCase {
 
 	protected function tearDown() {
 		\OC_Helper::rmdirr($this->baseDir);
+		$this->baseDir = null;
 		parent::tearDown();
 	}
 
 	/**
 	 * @param  \OCP\ILogger $logger
+	 * @param  \OCP\IConfig $config
 	 * @return \OC\TempManager
 	 */
-	protected function getManager($logger = null) {
+	protected function getManager($logger = null, $config = null) {
 		if (!$logger) {
 			$logger = new NullLogger();
 		}
-		return new \OC\TempManager($this->baseDir, $logger);
+		if (!$config) {
+			$config = $this->getMock('\OCP\IConfig');
+			$config->method('getSystemValue')
+				->with('tempdirectory', null)
+				->willReturn('/tmp');
+		}
+		$manager = new \OC\TempManager($logger, $config);
+		if ($this->baseDir) {
+			$manager->overrideTempBaseDir($this->baseDir);
+		}
+		return $manager;
 	}
 
 	public function testGetFile() {
@@ -185,4 +198,19 @@ class TempManager extends \Test\TestCase {
 		$this->assertStringEndsNotWith('./Traversal\\../FileName', $tmpManager);
 		$this->assertStringEndsWith('.Traversal..FileName', $tmpManager);
 	}
+
+	public function testGetTempBaseDirFromConfig() {
+		$dir = $this->getManager()->getTemporaryFolder();
+
+		$config = $this->getMock('\OCP\IConfig');
+		$config->expects($this->once())
+			->method('getSystemValue')
+			->with('tempdirectory', null)
+			->willReturn($dir);
+
+		$this->baseDir = null; // prevent override
+		$tmpManager = $this->getManager(null, $config);
+
+		$this->assertEquals($dir, $tmpManager->getTempBaseDir());
+	}
 }
diff --git a/tests/lib/updater.php b/tests/lib/updater.php
index 28577071b4..763858acf5 100644
--- a/tests/lib/updater.php
+++ b/tests/lib/updater.php
@@ -67,14 +67,68 @@ class UpdaterTest extends \Test\TestCase {
 	 */
 	public function versionCompatibilityTestData() {
 		return [
-			['1.0.0.0', '2.2.0', true],
-			['1.1.1.1', '2.0.0', true],
-			['5.0.3', '4.0.3', false],
-			['12.0.3', '13.4.5', true],
-			['1', '2', true],
-			['2', '2', true],
-			['6.0.5', '6.0.6', true],
-			['5.0.6', '7.0.4', false],
+			['1', '2', '1', true],
+			['2', '2', '2', true],
+			['6.0.5.0', '6.0.6.0', '5.0', true],
+			['5.0.6.0', '7.0.4.0', '6.0', false],
+			// allow upgrading within the same major release
+			['8.0.0.0', '8.0.0.0', '8.0', true],
+			['8.0.0.0', '8.0.0.4', '8.0', true],
+			['8.0.0.0', '8.0.1.0', '8.0', true],
+			['8.0.0.0', '8.0.2.0', '8.0', true],
+			// does not allow downgrading within the same major release
+			['8.0.1.0', '8.0.0.0', '8.0', false],
+			['8.0.2.0', '8.0.1.0', '8.0', false],
+			['8.0.0.4', '8.0.0.0', '8.0', false],
+			// allows upgrading within the patch version
+			['8.0.0.0', '8.0.0.1', '8.0', true],
+			['8.0.0.0', '8.0.0.2', '8.0', true],
+			// does not allow downgrading within the same major release
+			['8.0.0.1', '8.0.0.0', '8.0', false],
+			['8.0.0.2', '8.0.0.0', '8.0', false],
+			// allow upgrading to the next major release
+			['8.0.0.0', '8.1.0.0', '8.0', true],
+			['8.0.0.0', '8.1.1.0', '8.0', true],
+			['8.0.0.0', '8.1.1.5', '8.0', true],
+			['8.0.0.2', '8.1.1.5', '8.0', true],
+			['8.1.0.0', '8.2.0.0', '8.1', true],
+			['8.1.0.2', '8.2.0.4', '8.1', true],
+			['8.1.0.5', '8.2.0.1', '8.1', true],
+			['8.1.0.0', '8.2.1.0', '8.1', true],
+			['8.1.0.2', '8.2.1.5', '8.1', true],
+			['8.1.0.5', '8.2.1.1', '8.1', true],
+			// does not allow downgrading to the previous major release
+			['8.1.0.0', '8.0.0.0', '7.0', false],
+			['8.1.1.0', '8.0.0.0', '7.0', false],
+			// does not allow skipping major releases
+			['8.0.0.0', '8.2.0.0', '8.1', false],
+			['8.0.0.0', '8.2.1.0', '8.1', false],
+			['8.0.0.0', '9.0.1.0', '8.2', false],
+			['8.0.0.0', '10.0.0.0', '9.3', false],
+			// allows updating to the next major release
+			['8.2.0.0', '9.0.0.0', '8.2', true],
+			['8.2.0.0', '9.0.0.0', '8.2', true],
+			['8.2.0.0', '9.0.1.0', '8.2', true],
+			['8.2.0.0', '9.0.1.1', '8.2', true],
+			['8.2.0.2', '9.0.1.1', '8.2', true],
+			['8.2.2.0', '9.0.1.0', '8.2', true],
+			['8.2.2.2', '9.0.1.1', '8.2', true],
+			['9.0.0.0', '9.1.0.0', '9.0', true],
+			['9.0.0.0', '9.1.0.2', '9.0', true],
+			['9.0.0.2', '9.1.0.1', '9.0', true],
+			['9.1.0.0', '9.2.0.0', '9.1', true],
+			['9.2.0.0', '9.3.0.0', '9.2', true],
+			['9.3.0.0', '10.0.0.0', '9.3', true],
+			// does not allow updating to the next major release (first number)
+			['9.0.0.0', '8.2.0.0', '8.1', false],
+			// other cases
+			['8.0.0.0', '8.1.5.0', '8.0', true],
+			['8.2.0.0', '9.0.0.0', '8.2', true],
+			['8.2.0.0', '9.1.0.0', '9.0', false],
+			['9.0.0.0', '8.1.0.0', '8.0', false],
+			['9.0.0.0', '8.0.0.0', '7.0', false],
+			['9.1.0.0', '8.0.0.0', '7.0', false],
+			['8.2.0.0', '8.1.0.0', '8.0', false],
 		];
 	}
 
@@ -106,9 +160,9 @@ class UpdaterTest extends \Test\TestCase {
 	 * @param string $newVersion
 	 * @param bool $result
 	 */
-	public function testIsUpgradePossible($oldVersion, $newVersion, $result) {
+	public function testIsUpgradePossible($oldVersion, $newVersion, $allowedVersion, $result) {
 		$updater = new Updater($this->httpHelper, $this->config);
-		$this->assertSame($result, $updater->isUpgradePossible($oldVersion, $newVersion));
+		$this->assertSame($result, $updater->isUpgradePossible($oldVersion, $newVersion, $allowedVersion));
 	}
 
 	public function testCheckInCache() {
diff --git a/tests/lib/util.php b/tests/lib/util.php
index e52a9fcc61..b9b8062653 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -91,7 +91,7 @@ class Test_Util extends \Test\TestCase {
 
 	function testCallRegister() {
 		$result = strlen(OC_Util::callRegister());
-		$this->assertEquals(30, $result);
+		$this->assertEquals(221, $result);
 	}
 
 	function testSanitizeHTML() {
diff --git a/tests/settings/controller/CheckSetupControllerTest.php b/tests/settings/controller/CheckSetupControllerTest.php
index 414b1b91e1..2a8a6548eb 100644
--- a/tests/settings/controller/CheckSetupControllerTest.php
+++ b/tests/settings/controller/CheckSetupControllerTest.php
@@ -384,6 +384,11 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsUsedTlsLibOutdatedWithOlderOpenSsl() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->with('appstoreenabled', true)
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
@@ -391,7 +396,25 @@ class CheckSetupControllerTest extends TestCase {
 		$this->assertSame('cURL is using an outdated OpenSSL version (OpenSSL/1.0.1c). Please update your operating system or features such as installing and updating apps via the app store or Federated Cloud Sharing will not work reliably.', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
 	}
 
+	public function testIsUsedTlsLibOutdatedWithOlderOpenSslAndWithoutAppstore() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->with('appstoreenabled', true)
+			->will($this->returnValue(false));
+		$this->checkSetupController
+			->expects($this->once())
+			->method('getCurlVersion')
+			->will($this->returnValue(['ssl_version' => 'OpenSSL/1.0.1c']));
+		$this->assertSame('cURL is using an outdated OpenSSL version (OpenSSL/1.0.1c). Please update your operating system or features such as Federated Cloud Sharing will not work reliably.', $this->invokePrivate($this->checkSetupController, 'isUsedTlsLibOutdated'));
+	}
+
 	public function testIsUsedTlsLibOutdatedWithOlderOpenSsl1() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->with('appstoreenabled', true)
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
@@ -416,6 +439,11 @@ class CheckSetupControllerTest extends TestCase {
 	}
 
 	public function testIsBuggyNss400() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->with('appstoreenabled', true)
+			->will($this->returnValue(true));
 		$this->checkSetupController
 			->expects($this->once())
 			->method('getCurlVersion')
diff --git a/themes/example/defaults.php b/themes/example/defaults.php
index 0dd0d46bd9..6fea8fa8a4 100644
--- a/themes/example/defaults.php
+++ b/themes/example/defaults.php
@@ -20,54 +20,32 @@
 
 class OC_Theme {
 
-	private $themeEntity;
-	private $themeName;
-	private $themeTitle;
-	private $themeBaseUrl;
-	private $themeDocBaseUrl;
-	private $themeSyncClientUrl;
-	private $themeSlogan;
-	private $themeMailHeaderColor;
-
-	/* put your custom text in these variables */
-	function __construct() {
-		$this->themeEntity = 'Custom Cloud Co.';
-		$this->themeName = 'Custom Cloud';
-		$this->themeTitle = 'Custom Cloud';
-		$this->themeBaseUrl = 'https://owncloud.org';
-		$this->themeDocBaseUrl = 'https://doc.owncloud.org';
-		$this->themeSyncClientUrl = 'https://owncloud.org/install';
-		$this->themeSlogan = 'Your custom cloud, personalized for you!';
-		$this->themeMailHeaderColor = '#745bca';
-	}
-	/* nothing after this needs to be adjusted */
-
 	public function getBaseUrl() {
-		return $this->themeBaseUrl;
+		return 'https://owncloud.org';
 	}
 
 	public function getSyncClientUrl() {
-		return $this->themeSyncClientUrl;
+		return 'https://owncloud.org/install';
 	}
 
 	public function getDocBaseUrl() {
-		return $this->themeDocBaseUrl;
+		return 'https://doc.owncloud.org';
 	}
 
 	public function getTitle() {
-		return $this->themeTitle;
+		return 'Custom Cloud';
 	}
 
 	public function getName() {
-		return $this->themeName;
+		return 'Custom Cloud';
 	}
 
 	public function getEntity() {
-		return $this->themeEntity;
+		return 'Custom Cloud Co.';
 	}
 
 	public function getSlogan() {
-		return $this->themeSlogan;
+		return 'Your custom cloud, personalized for you!';
 	}
 
 	public function getShortFooter() {
@@ -89,7 +67,7 @@ class OC_Theme {
 	}
 
 	public function getMailHeaderColor() {
-		return $this->themeMailHeaderColor;
+		return '#745bca';
 	}
 
 }
diff --git a/version.php b/version.php
index a115f4b26b..cfc4db8299 100644
--- a/version.php
+++ b/version.php
@@ -2,6 +2,7 @@
 /**
  * @author Frank Karlitschek <frank@owncloud.org>
  * @author Lukas Reschke <lukas@owncloud.com>
+ * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2015, ownCloud, Inc.
  * @license AGPL-3.0
@@ -22,14 +23,16 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version=array(8, 2, 0, 4);
+$OC_Version = [8, 2, 0, 5];
 
 // The human readable string
-$OC_VersionString='8.2 pre alpha';
+$OC_VersionString = '8.2 pre alpha';
+
+$OC_VersionCanBeUpgradedFrom = [8, 1];
 
 // The ownCloud channel
-$OC_Channel='git';
+$OC_Channel = 'git';
 
 // The build number
-$OC_Build='';
+$OC_Build = '';