Merge remote-tracking branch 'nextcloud/master'

Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>

146 files changed, 9122 insertions, 4627 deletions

diff --git a/core/Application.php b/core/Application.php
index 545b5fe420b..6621964c289 100644
--- a/core/Application.php
+++ b/core/Application.php
@@ -30,10 +30,13 @@
 
 namespace OC\Core;
 
-use OC\AppFramework\Utility\SimpleContainer;
+use OC\Core\Controller\OCJSController;
 use OC\Security\IdentityProof\Manager;
+use OC\Server;
 use OCP\AppFramework\App;
-use OCP\Files\IAppData;
+use OC\Core\Controller\CssController;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\IRequest;
 use OCP\Util;
 
 /**
@@ -57,5 +60,32 @@ class Application extends App {
 				\OC::$server->getCrypto()
 			);
 		});
+		$container->registerService(CssController::class, function () use ($container) {
+			return new CssController(
+				$container->query('appName'),
+				$container->query(IRequest::class),
+				\OC::$server->getAppDataDir('css'),
+				$container->query(ITimeFactory::class)
+			);
+		});
+		$container->registerService(OCJSController::class, function () use ($container) {
+			/** @var Server $server */
+			$server = $container->getServer();
+			return new OCJSController(
+				$container->query('appName'),
+				$server->getRequest(),
+				$server->getL10N('core'),
+				// This is required for the theming to overwrite the `OC_Defaults`, see
+				// https://github.com/nextcloud/server/issues/3148
+				$server->getThemingDefaults(),
+				$server->getAppManager(),
+				$server->getSession(),
+				$server->getUserSession(),
+				$server->getConfig(),
+				$server->getGroupManager(),
+				$server->getIniWrapper(),
+				$server->getURLGenerator()
+			);
+		});
 	}
 }
diff --git a/core/Command/Config/ListConfigs.php b/core/Command/Config/ListConfigs.php
index 2737bc2cea4..94b493c9244 100644
--- a/core/Command/Config/ListConfigs.php
+++ b/core/Command/Config/ListConfigs.php
@@ -89,14 +89,14 @@ class ListConfigs extends Base {
 					'apps' => [],
 				];
 				foreach ($apps as $appName) {
-					$configs['apps'][$appName] = $this->appConfig->getValues($appName, false);
+					$configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues);
 				}
 			break;
 
 			default:
 				$configs = [
 					'apps' => [
-						$app => $this->appConfig->getValues($app, false),
+						$app => $this->getAppConfigs($app, $noSensitiveValues),
 					],
 				];
 		}
@@ -130,6 +130,21 @@ class ListConfigs extends Base {
 	}
 
 	/**
+	 * Get the app configs
+	 *
+	 * @param string $app
+	 * @param bool $noSensitiveValues
+	 * @return array
+	 */
+	protected function getAppConfigs($app, $noSensitiveValues) {
+		if ($noSensitiveValues) {
+			return $this->appConfig->getFilteredValues($app, false);
+		} else {
+			return $this->appConfig->getValues($app, false);
+		}
+	}
+
+	/**
 	 * @param string $argumentName
 	 * @param CompletionContext $context
 	 * @return string[]
diff --git a/core/Command/Integrity/CheckApp.php b/core/Command/Integrity/CheckApp.php
index 0774cca6582..3e4d8b9cba7 100644
--- a/core/Command/Integrity/CheckApp.php
+++ b/core/Command/Integrity/CheckApp.php
@@ -66,6 +66,9 @@ class CheckApp extends Base {
 		$path = strval($input->getOption('path'));
 		$result = $this->checker->verifyAppSignature($appid, $path);
 		$this->writeArrayInOutputFormat($input, $output, $result);
+		if (count($result)>0){
+			return 1;
+		}
 	}
 
 }
diff --git a/core/Command/Integrity/CheckCore.php b/core/Command/Integrity/CheckCore.php
index 5aaf9c2dec8..a3426ce9345 100644
--- a/core/Command/Integrity/CheckCore.php
+++ b/core/Command/Integrity/CheckCore.php
@@ -60,5 +60,8 @@ class CheckCore extends Base {
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$result = $this->checker->verifyCoreSignature();
 		$this->writeArrayInOutputFormat($input, $output, $result);
+		if (count($result)>0){
+			return 1;
+		}
 	}
 }
diff --git a/core/Command/Integrity/SignApp.php b/core/Command/Integrity/SignApp.php
index 3bc79eb0114..26d2791475b 100644
--- a/core/Command/Integrity/SignApp.php
+++ b/core/Command/Integrity/SignApp.php
@@ -101,8 +101,13 @@ class SignApp extends Command {
 		$x509 = new X509();
 		$x509->loadX509($keyBundle);
 		$x509->setPrivateKey($rsa);
-		$this->checker->writeAppSignature($path, $x509, $rsa);
-
-		$output->writeln('Successfully signed "'.$path.'"');
+		try {
+			$this->checker->writeAppSignature($path, $x509, $rsa);
+			$output->writeln('Successfully signed "'.$path.'"');
+		} catch (\Exception $e){
+			$output->writeln('Error: ' . $e->getMessage());
+			return 1;
+		}
+		return 0;
 	}
 }
diff --git a/core/Command/Integrity/SignCore.php b/core/Command/Integrity/SignCore.php
index 440c3da3b23..8f951204a58 100644
--- a/core/Command/Integrity/SignCore.php
+++ b/core/Command/Integrity/SignCore.php
@@ -23,12 +23,10 @@
 namespace OC\Core\Command\Integrity;
 
 use OC\IntegrityCheck\Checker;
-use OC\IntegrityCheck\Helpers\EnvironmentHelper;
 use OC\IntegrityCheck\Helpers\FileAccessHelper;
 use phpseclib\Crypt\RSA;
 use phpseclib\File\X509;
 use Symfony\Component\Console\Command\Command;
-use OCP\IConfig;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -94,8 +92,14 @@ class SignCore extends Command {
 		$x509 = new X509();
 		$x509->loadX509($keyBundle);
 		$x509->setPrivateKey($rsa);
-		$this->checker->writeCoreSignature($x509, $rsa, $path);
 
-		$output->writeln('Successfully signed "core"');
+		try {
+			$this->checker->writeCoreSignature($x509, $rsa, $path);
+			$output->writeln('Successfully signed "core"');
+		} catch (\Exception $e){
+			$output->writeln('Error: ' . $e->getMessage());
+			return 1;
+		}
+		return 0;
 	}
 }
diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php
new file mode 100644
index 00000000000..1206c95a5b8
--- /dev/null
+++ b/core/Controller/CssController.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016, John Molakvoæ (skjnldsv@protonmail.com)
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Core\Controller;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\NotFoundResponse;
+use OCP\AppFramework\Http\FileDisplayResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\Files\IAppData;
+use OCP\Files\NotFoundException;
+use OCP\IRequest;
+
+class CssController extends Controller {
+
+	/** @var IAppData */
+	protected $appData;
+
+	/** @var ITimeFactory */
+	protected $timeFactory;
+
+	/**
+	 * @param string $appName
+	 * @param IRequest $request
+	 * @param IAppData $appData
+	 * @param ITimeFactory $timeFactory
+	 */
+	public function __construct($appName, IRequest $request, IAppData $appData, ITimeFactory $timeFactory) {
+		parent::__construct($appName, $request);
+
+		$this->appData = $appData;
+		$this->timeFactory = $timeFactory;
+	}
+
+	/**
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 *
+	 * @param string $fileName css filename with extension
+	 * @param string $appName css folder name
+	 * @return FileDisplayResponse|NotFoundResponse
+	 */
+	public function getCss($fileName, $appName) {
+		try {
+			$folder = $this->appData->getFolder($appName);
+			$cssFile = $folder->getFile($fileName);
+		} catch(NotFoundException $e) {
+			return new NotFoundResponse();
+		}
+
+		$response = new FileDisplayResponse($cssFile, Http::STATUS_OK, ['Content-Type' => 'text/css']);
+		$response->cacheFor(86400);
+		$expires = new \DateTime();
+		$expires->setTimestamp($this->timeFactory->getTime());
+		$expires->add(new \DateInterval('PT24H'));
+		$response->addHeader('Expires', $expires->format(\DateTime::RFC1123));
+		$response->addHeader('Pragma', 'cache');
+		return $response;
+	}
+}
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php
index 92ea3014ba2..c0e7be280b8 100644
--- a/core/Controller/LoginController.php
+++ b/core/Controller/LoginController.php
@@ -160,7 +160,6 @@ class LoginController extends Controller {
 		}
 
 		$parameters['alt_login'] = OC_App::getAlternativeLogIns();
-		$parameters['rememberLoginAllowed'] = OC_Util::rememberLoginAllowed();
 		$parameters['rememberLoginState'] = !empty($remember_login) ? $remember_login : 0;
 
 		if (!is_null($user) && $user !== '') {
@@ -171,6 +170,8 @@ class LoginController extends Controller {
 			$parameters['user_autofocus'] = true;
 		}
 
+		\OC_Util::addStyle('guest');
+
 		return new TemplateResponse(
 			$this->appName, 'login', $parameters, 'guest'
 		);
@@ -206,8 +207,8 @@ class LoginController extends Controller {
 	 * @return RedirectResponse
 	 */
 	public function tryLogin($user, $password, $redirect_url, $remember_login = false, $timezone = '', $timezone_offset = '') {
-		$currentDelay = $this->throttler->getDelay($this->request->getRemoteAddress());
-		$this->throttler->sleepDelay($this->request->getRemoteAddress());
+		$currentDelay = $this->throttler->getDelay($this->request->getRemoteAddress(), 'login');
+		$this->throttler->sleepDelay($this->request->getRemoteAddress(), 'login');
 
 		// If the user is already logged in and the CSRF check does not pass then
 		// simply redirect the user to the correct page as required. This is the
@@ -235,7 +236,7 @@ class LoginController extends Controller {
 		if ($loginResult === false) {
 			$this->throttler->registerAttempt('login', $this->request->getRemoteAddress(), ['user' => $originalUser]);
 			if($currentDelay === 0) {
-				$this->throttler->sleepDelay($this->request->getRemoteAddress());
+				$this->throttler->sleepDelay($this->request->getRemoteAddress(), 'login');
 			}
 			$this->session->set('loginMessages', [
 				['invalidpassword'], []
@@ -300,19 +301,15 @@ class LoginController extends Controller {
 	 * @return DataResponse
 	 */
 	public function confirmPassword($password) {
-		$currentDelay = $this->throttler->getDelay($this->request->getRemoteAddress());
-		$this->throttler->sleepDelay($this->request->getRemoteAddress());
-
-		$user = $this->userSession->getUser();
-		if (!$user instanceof IUser) {
-			return new DataResponse([], Http::STATUS_UNAUTHORIZED);
-		}
+		$currentDelay = $this->throttler->getDelay($this->request->getRemoteAddress(), 'sudo');
+		$this->throttler->sleepDelay($this->request->getRemoteAddress(), 'sudo');
 
-		$loginResult = $this->userManager->checkPassword($user->getUID(), $password);
+		$loginName = $this->userSession->getLoginName();
+		$loginResult = $this->userManager->checkPassword($loginName, $password);
 		if ($loginResult === false) {
-			$this->throttler->registerAttempt('sudo', $this->request->getRemoteAddress(), ['user' => $user->getUID()]);
+			$this->throttler->registerAttempt('sudo', $this->request->getRemoteAddress(), ['user' => $loginName]);
 			if ($currentDelay === 0) {
-				$this->throttler->sleepDelay($this->request->getRemoteAddress());
+				$this->throttler->sleepDelay($this->request->getRemoteAddress(), 'sudo');
 			}
 
 			return new DataResponse([], Http::STATUS_FORBIDDEN);
diff --git a/core/Controller/LostController.php b/core/Controller/LostController.php
index 01c107e8326..8a8a50343ed 100644
--- a/core/Controller/LostController.php
+++ b/core/Controller/LostController.php
@@ -30,6 +30,7 @@
 
 namespace OC\Core\Controller;
 
+use OCA\Encryption\Exceptions\PrivateKeyMissingException;
 use \OCP\AppFramework\Controller;
 use \OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -154,7 +155,7 @@ class LostController extends Controller {
 	 * @param string $userId
 	 * @throws \Exception
 	 */
-	private function checkPasswordResetToken($token, $userId) {
+	protected function checkPasswordResetToken($token, $userId) {
 		$user = $this->userManager->get($userId);
 		if($user === null) {
 			throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
@@ -201,6 +202,7 @@ class LostController extends Controller {
 
 	/**
 	 * @PublicPage
+	 * @BruteForceProtection passwordResetEmail
 	 *
 	 * @param string $user
 	 * @return array
@@ -233,6 +235,8 @@ class LostController extends Controller {
 			$this->checkPasswordResetToken($token, $userId);
 			$user = $this->userManager->get($userId);
 
+			\OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'pre_passwordReset', array('uid' => $userId, 'password' => $password));
+
 			if (!$user->setPassword($password)) {
 				throw new \Exception();
 			}
diff --git a/core/Controller/OCSController.php b/core/Controller/OCSController.php
index c59b0d7ad3f..1deb5e958bd 100644
--- a/core/Controller/OCSController.php
+++ b/core/Controller/OCSController.php
@@ -106,20 +106,6 @@ class OCSController extends \OCP\AppFramework\OCSController {
 	}
 
 	/**
-	 * @NoAdminRequired
-	 * @return DataResponse
-	 */
-	public function getCurrentUser() {
-		$userObject = $this->userSession->getUser();
-		$data  = [
-			'id' => $userObject->getUID(),
-			'display-name' => $userObject->getDisplayName(),
-			'email' => $userObject->getEMailAddress(),
-		];
-		return new DataResponse($data);
-	}
-
-	/**
 	 * @PublicPage
 	 *
 	 * @param string $login
@@ -128,7 +114,7 @@ class OCSController extends \OCP\AppFramework\OCSController {
 	 */
 	public function personCheck($login = '', $password = '') {
 		if ($login !== '' && $password !== '') {
-			$this->throttler->sleepDelay($this->request->getRemoteAddress());
+			$this->throttler->sleepDelay($this->request->getRemoteAddress(), 'login');
 			if ($this->userManager->checkPassword($login, $password)) {
 				return new DataResponse([
 					'person' => [
diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php
index bb7c8c4969d..87508423cd3 100644
--- a/core/Controller/SetupController.php
+++ b/core/Controller/SetupController.php
@@ -92,6 +92,7 @@ class SetupController {
 
 		\OC_Util::addVendorScript('strengthify/jquery.strengthify');
 		\OC_Util::addVendorStyle('strengthify/strengthify');
+		\OC_Util::addStyle('guest');
 		\OC_Util::addScript('setup');
 		\OC_Template::printGuestPage('', 'installation', $parameters);
 	}
diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php
index b2614138123..fd4811d3ff6 100644
--- a/core/Controller/TwoFactorChallengeController.php
+++ b/core/Controller/TwoFactorChallengeController.php
@@ -29,6 +29,7 @@ use OC_Util;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Authentication\TwoFactorAuth\TwoFactorException;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IURLGenerator;
@@ -115,19 +116,23 @@ class TwoFactorChallengeController extends Controller {
 			$backupProvider = null;
 		}
 
+		$errorMessage = '';
+		$error = false;
 		if ($this->session->exists('two_factor_auth_error')) {
 			$this->session->remove('two_factor_auth_error');
 			$error = true;
-		} else {
-			$error = false;
+			$errorMessage = $this->session->get("two_factor_auth_error_message");
+			$this->session->remove('two_factor_auth_error_message');
 		}
 		$tmpl = $provider->getTemplate($user);
 		$tmpl->assign('redirect_url', $redirect_url);
 		$data = [
 			'error' => $error,
+			'error_message' => $errorMessage,
 			'provider' => $provider,
 			'backupProvider' => $backupProvider,
 			'logout_attribute' => $this->getLogoutAttribute(),
+			'redirect_url' => $redirect_url,
 			'template' => $tmpl->fetchPage(),
 		];
 		return new TemplateResponse($this->appName, 'twofactorshowchallenge', $data, 'guest');
@@ -150,11 +155,20 @@ class TwoFactorChallengeController extends Controller {
 			return new RedirectResponse($this->urlGenerator->linkToRoute('core.TwoFactorChallenge.selectChallenge'));
 		}
 
-		if ($this->twoFactorManager->verifyChallenge($challengeProviderId, $user, $challenge)) {
-			if (!is_null($redirect_url)) {
-				return new RedirectResponse($this->urlGenerator->getAbsoluteURL(urldecode($redirect_url)));
+		try {
+			if ($this->twoFactorManager->verifyChallenge($challengeProviderId, $user, $challenge)) {
+				if (!is_null($redirect_url)) {
+					return new RedirectResponse($this->urlGenerator->getAbsoluteURL(urldecode($redirect_url)));
+				}
+				return new RedirectResponse(OC_Util::getDefaultPageUrl());
 			}
-			return new RedirectResponse(OC_Util::getDefaultPageUrl());
+		} catch (TwoFactorException $e) {
+			/*
+			 * The 2FA App threw an TwoFactorException. Now we display more
+			 * information to the user. The exception text is stored in the
+			 * session to be used in showChallenge()
+			 */
+			$this->session->set('two_factor_auth_error_message', $e->getMessage());
 		}
 
 		$this->session->set('two_factor_auth_error', true);
diff --git a/core/css/apps.css b/core/css/apps.css
deleted file mode 100644
index e709f9d901f..00000000000
--- a/core/css/apps.css
+++ /dev/null
@@ -1,700 +0,0 @@
-/* APP STYLING -------------------------------------------------------------- */
-
-
-#app {
-	height: 100%;
-	width: 100%;
-}
-#app * {
-	box-sizing: border-box;
-}
-
-
-
-
-
-/* APP-NAVIGATION ------------------------------------------------------------*/
-
-
-/* Navigation: folder like structure */
-#app-navigation {
-	width: 250px;
-	height: 100%;
-	float: left;
-	box-sizing: border-box;
-	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;
-	height: 100%;
-	width: inherit;
-	overflow: auto;
-	box-sizing: border-box;
-}
-#app-navigation li {
-	position: relative;
-	width: 100%;
-	box-sizing: border-box;
-}
-
-#app-navigation.without-app-settings {
-	padding-bottom: 0;
-}
-
-#app-navigation .active.with-menu > a,
-#app-navigation .with-counter > a {
-	padding-right: 50px;
-}
-
-#app-navigation .active.with-menu.with-counter > a {
-	padding-right: 90px;
-}
-
-#app-navigation .with-icon a,
-#app-navigation .app-navigation-entry-loading a {
-	padding-left: 44px;
-	background-size: 16px 16px;
-	background-position: 14px center;
-	background-repeat: no-repeat;
-}
-
-#app-navigation li > a {
-	display: block;
-	width: 100%;
-	line-height: 44px;
-	min-height: 44px;
-	padding: 0 12px;
-	overflow: hidden;
-	box-sizing: border-box;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	color: #000;
-	opacity: .57;
-}
-#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 {
-	display: none; /* hide collapse button initially */
-}
-#app-navigation .collapsible > .collapse {
-	position: absolute;
-	height: 44px;
-	width: 44px;
-	margin: 0;
-	padding: 0;
-	background: none; background-image: url('../img/actions/triangle-s.svg?v=1');
-	background-size: 16px; background-repeat: no-repeat; background-position: center;
-	border: none;
-	border-radius: 0;
-	outline: none !important;
-	box-shadow: none;
-}
-#app-navigation .collapsible:hover > a,
-#app-navigation .collapsible:focus > a {
-	background-image: none;
-}
-#app-navigation .collapsible:hover > .collapse,
-#app-navigation .collapsible:focus > .collapse {
-	display: block;
-}
-
-#app-navigation .collapsible .collapse {
-	-webkit-transform: rotate(-90deg);
-	-ms-transform:rotate(-90deg);
-	transform: rotate(-90deg);
-}
-#app-navigation .collapsible.open .collapse {
-	-webkit-transform: rotate(0);
-	-ms-transform:rotate(0);
-	transform: rotate(0);
-}
-
-/* Second level nesting for lists */
-#app-navigation > ul ul {
-	display: none;
-}
-#app-navigation > ul ul li > a {
-	padding-left: 32px;
-}
-#app-navigation > .with-icon ul li > a,
-#app-navigation > .with-icon ul li.app-navigation-entry-loading > a {
-	padding-left: 68px;
-	background-position: 44px center;
-}
-
-#app-navigation .collapsible.open {
-	background-image: linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-	background-image: -webkit-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-	background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
-}
-
-#app-navigation > ul .collapsible.open:hover,
-#app-navigation > ul .collapsible.open:focus {
-	box-shadow: inset 0 0 3px #ddd;
-}
-
-#app-navigation > ul .collapsible.open ul {
-	display: block;
-}
-
-
-/* Deleted entries with undo button */
-#app-navigation .app-navigation-entry-deleted {
-	display: inline-block;
-	height: 44px;
-	width: 100%;
-}
-
-	#app-navigation .app-navigation-entry-deleted-description {
-		padding-left: 12px;
-		position: relative;
-		white-space: nowrap;
-		text-overflow: ellipsis;
-		overflow: hidden;
-		display: inline-block;
-		width: calc(100% - 49px);
-		line-height: 44px;
-		float: left;
-	}
-
-	#app-navigation .app-navigation-entry-deleted-button {
-		margin: 0;
-		height: 44px;
-		width: 44px;
-		line-height: 44px;
-		border: 0;
-		display: inline-block;
-		background-color: transparent;
-		opacity: .5;
-	}
-
-	#app-navigation .app-navigation-entry-deleted-button:hover,
-	#app-navigation .app-navigation-entry-deleted-button:focus {
-		opacity: 1;
-	}
-
-/* counter and actions, legacy code */
-#app-navigation .utils {
-	position: absolute;
-	padding: 7px 7px 0 0;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	font-size: 12px;
-}
-	#app-navigation .utils button,
-	#app-navigation .utils .counter {
-		width: 44px;
-		height: 44px;
-		padding-top: 12px;
-	}
-
-
-/* drag and drop */
-#app-navigation .drag-and-drop {
-	-webkit-transition: padding-bottom 500ms ease 0s;
-	transition: padding-bottom 500ms ease 0s;
-	padding-bottom: 40px;
-}
-#app-navigation .error {
-	color: #dd1144;
-}
-
-#app-navigation .app-navigation-separator {
-	border-bottom: 1px solid #ddd;
-}
-
-/**
- * App navigation utils, buttons and counters for drop down menu
- */
-#app-navigation .app-navigation-entry-utils {
-	position: absolute;
-	top: 0;
-	right: 0;
-	z-index: 105;
-}
-
-	#app-navigation .app-navigation-entry-utils ul {
-		display: block !important;
-	}
-
-
-	#app-navigation .app-navigation-entry-utils li {
-		float: left;
-		width: 44px !important;
-		height: 44px;
-		line-height: 44px;
-	}
-
-	#app-navigation .active > .app-navigation-entry-utils li {
-		display: inline-block;
-	}
-
-	#app-navigation .app-navigation-entry-utils button {
-		height: 38px;
-		width: 38px;
-		line-height: 38px;
-		float: left;
-	}
-
-	#app-navigation .app-navigation-entry-utils-menu-button {
-		display: none;
-	}
-	#app-navigation .app-navigation-entry-utils-menu-button button {
-		border: 0;
-		opacity: .5;
-		background-color: transparent;
-		background-repeat: no-repeat;
-		background-position: center;
-		background-image: url('../img/actions/more.svg?v=1');
-	}
-
-	#app-navigation .app-navigation-entry-utils-menu-button:hover button,
-	#app-navigation .app-navigation-entry-utils-menu-button:focus button {
-		background-color: transparent;
-		opacity: 1;
-	}
-
-	#app-navigation .app-navigation-entry-utils-counter {
-		overflow: hidden;
-		text-overflow: hidden;
-		text-align: right;
-		font-size: 9pt;
-		width: 38px;
-		line-height: 44px;
-		padding: 0 10px;
-	}
-
-	#app-navigation .app-navigation-entry-utils ul,
-	#app-navigation .app-navigation-entry-menu ul {
-		list-style-type: none;
-	}
-
-/* menu bubble / popover */
-.bubble,
-#app-navigation .app-navigation-entry-menu {
-	position: absolute;
-	background-color: #fff;
-	color: #333;
-	border-radius: 3px;
-	border-top-right-radius: 0;
-	z-index: 110;
-	margin: 5px;
-	margin-top: -5px;
-	right: 0;
-	-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));
-}
-
-.ie .bubble,
-.ie #app-navigation .app-navigation-entry-menu,
-.ie .bubble:after,
-.ie #app-navigation .app-navigation-entry-menu:after,
-.edge .bubble,
-.edge #app-navigation .app-navigation-entry-menu,
-.edge .bubble:after,
-.edge #app-navigation .app-navigation-entry-menu:after {
-	border: 1px solid #eee;
-}
-/* miraculous border arrow stuff */
-.bubble:after,
-#app-navigation .app-navigation-entry-menu:after {
-	bottom: 100%;
-	right: 6px; /* change this to adjust the arrow position */
-	border: solid transparent;
-	content: " ";
-	height: 0;
-	width: 0;
-	position: absolute;
-	pointer-events: none;
-}
-.bubble:after,
-#app-navigation .app-navigation-entry-menu:after {
-	border-color: rgba(238, 238, 238, 0);
-	border-bottom-color: #fff;
-	border-width: 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,
-.bubble .action.active {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)" !important;
-	filter: alpha(opacity=100) !important;
-	opacity: 1 !important;
-}
-
-#app-navigation .app-navigation-entry-menu {
-	display: none;
-}
-
-#app-navigation .app-navigation-entry-menu.open {
-	display: block;
-}
-
-	/* list of options for an entry */
-	#app-navigation .app-navigation-entry-menu ul {
-		display: block !important;
-	}
-
-	#app-navigation .app-navigation-entry-menu li {
-		float: left;
-		width: 38px !important;
-	}
-
-		#app-navigation .app-navigation-entry-menu li button {
-			float: right;
-			width: 36px !important;
-			height: 36px;
-			line-height: 36px;
-			border: 0;
-			opacity: .5;
-			background-color: transparent;
-		}
-
-		#app-navigation .app-navigation-entry-menu li button:hover,
-		#app-navigation .app-navigation-entry-menu li button:focus {
-			opacity: 1;
-			background-color: transparent;
-		}
-
-/* editing an entry */
-#app-navigation .app-navigation-entry-edit {
-	padding-left: 5px;
-	padding-right: 5px;
-	display: inline-block;
-	height: 39px;
-	width: 100%;
-}
-
-	#app-navigation .app-navigation-entry-edit input {
-		border-bottom-right-radius: 0;
-		border-top-right-radius: 0;
-		width: calc(100% - 36px);
-		padding: 5px;
-		margin-right: 0;
-		height: 38px;
-		float: left;
-		border: 1px solid rgba(190,190,190,.9);
-	}
-
-	#app-navigation .app-navigation-entry-edit button,
-	#app-navigation .app-navigation-entry-edit input[type="submit"] {
-		width: 36px;
-		height: 38px;
-		float: left;
-	}
-
-	#app-navigation .app-navigation-entry-edit .icon-checkmark {
-		border-bottom-left-radius: 0;
-		border-top-left-radius: 0;
-		border-left: 0;
-		margin-right: 0;
-	}
-
-
-/* APP-CONTENT ---------------------------------------------------------------*/
-
-
-/* Part where the content will be loaded into */
-#app-content {
-	position: relative;
-	height: 100%;
-	overflow-y: auto;
-}
-
-#app-content-wrapper {
-	min-width: 100%;
-	min-height: 100%;
-}
-
-/* APP-SIDEBAR ----------------------------------------------------------------*/
-
-/*
-	Sidebar: a sidebar to be used within #app-content
-	 have it as first element within app-content in order to shrink other
-	 sibling containers properly. Compare Files app for example.
-*/
-#app-sidebar {
-	position: fixed;
-	top: 45px;
-	right: 0;
-	left: auto;
-	bottom: 0;
-	width: 27%;
-	min-width: 300px;
-	display: block;
-	background: #fff;
-	border-left: 1px solid #eee;
-	-webkit-transition: margin-right 300ms;
-	transition: margin-right 300ms;
-	overflow-x: hidden;
-	overflow-y: auto;
-	visibility: visible;
-	z-index: 500;
-}
-
-#app-content.with-app-sidebar {
-	margin-right: 27%;
-}
-
-#app-sidebar.disappear {
-	visibility: hidden;
-}
-
-/* APP-SETTINGS ---------------------------------------------------------------*/
-
-/* settings area */
-#app-settings {
-	position: fixed;
-	width: 250px; /* change to 100% when layout positions are absolute */
-	bottom: 0;
-	z-index: 140;
-}
-#app-settings.open #app-settings-content,
-#app-settings.opened #app-settings-content {
-	display: block;
-}
-#app-settings-content {
-	display: none;
-	padding: 10px;
-	background-color: #fff;
-	/* restrict height of settings and make scrollable */
-	max-height: 300px;
-	overflow-y: auto;
-}
-#app-settings-content,
-#app-settings-header {
-	border-right: 1px solid #eee;
-	width: 250px;
-	box-sizing: border-box;
-}
-
-/* display input fields at full width */
-#app-settings-content input[type='text'] {
-	width: 93%;
-}
-
-.settings-button {
-	display: block;
-	height: 44px;
-	width: 100%;
-	padding: 0;
-	margin: 0;
-	background-color: #fff;
-	background-image: url('../img/actions/settings.svg?v=1');
-	background-position: 14px center;
-	background-repeat: no-repeat;
-	box-shadow: none;
-	border: 0;
-	border-radius: 0;
-	text-align: left;
-	padding-left: 42px;
-	font-weight: normal;
-}
-.settings-button:hover,
-.settings-button:focus {
-	background-color: #fff;
-}
-.settings-button.opened:hover,
-.settings-button.opened:focus {
-	background-color: #fff;
-}
-
-/* buttons */
-button.loading {
-	background-image: url('../img/loading.gif');
-	background-position: right 10px center; background-repeat: no-repeat;
-	background-size: 16px;
-	padding-right: 30px;
-}
-
-/* general styles for the content area */
-.section {
-	display: block;
-	padding: 30px;
-	color: #555;
-	margin-bottom: 24px;
-}
-.section.hidden {
-	display: none !important;
-}
-.sub-section {
-	position: relative;
-	margin-top: 10px;
-	margin-left: 27px;
-	margin-bottom: 10px;
-}
-/* no top border for first settings item */
-#app-content > .section:first-child {
-	border-top: none;
-}
-
-/* heading styles */
-h2 {
-	font-size: 20px;
-	font-weight: 300;
-	margin-bottom: 12px;
-	line-height: 140%;
-}
-h3 {
-	font-size: 15px;
-	font-weight: 300;
-	margin: 12px 0;
-}
-
-/* slight position correction of checkboxes and radio buttons */
-.section input[type="checkbox"],
-.section input[type="radio"] {
-	vertical-align: -2px;
-	margin-right: 4px;
-}
-.appear {
-	opacity: 1;
-	-webkit-transition: opacity 500ms ease 0s;
-	-moz-transition: opacity 500ms ease 0s;
-	-ms-transition: opacity 500ms ease 0s;
-	-o-transition: opacity 500ms ease 0s;
-	transition: opacity 500ms ease 0s;
-}
-.appear.transparent {
-	opacity: 0;
-}
-
-
-/* do not use italic typeface style, instead lighter color */
-em {
-	font-style: normal;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-	opacity: .5;
-}
-
-/* generic dropdown style */
-.dropdown {
-	background:#eee;
-	border-bottom-left-radius: 5px;
-	border-bottom-right-radius: 5px;
-	box-shadow:0 1px 1px #777;
-	display:block;
-	margin-right: 0;
-	position:absolute;
-	right:0;
-	width:420px;
-	z-index:500;
-	padding:16px;
-}
-
-/* generic tab styles */
-.tabHeaders {
-	display: inline-block;
-	margin: 15px;
-}
-.tabHeaders .tabHeader {
-	float: left;
-	padding: 5px;
-	cursor: pointer;
-}
-.tabHeaders .tabHeader, .tabHeaders .tabHeader a {
-	color: #888;
-	margin-bottom: 1px;
-}
-.tabHeaders .tabHeader.selected {
-	font-weight: 600;
-}
-.tabHeaders .tabHeader.selected,
-.tabHeaders .tabHeader:hover {
-	border-bottom: 1px solid #333;
-}
-.tabHeaders .tabHeader.selected,
-.tabHeaders .tabHeader.selected a,
-.tabHeaders .tabHeader:hover,
-.tabHeaders .tabHeader:hover a {
-	margin-bottom: 0px;
-	color: #000;
-}
-.tabsContainer {
-	clear: left;
-}
-.tabsContainer .tab {
-	padding: 0 15px 15px;
-}
-
-/* popover menu styles (use together with "bubble" class) */
-.popovermenu .menuitem,
-.popovermenu .menuitem>span {
-	cursor: pointer;
-	vertical-align: middle;
-}
-
-.popovermenu .menuitem {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-	filter: alpha(opacity=50);
-	opacity: .5;
-}
-
-.popovermenu .menuitem:hover,
-.popovermenu .menuitem:focus,
-.popovermenu .menuitem.active {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	filter: alpha(opacity=100);
-	opacity: 1;
-}
-
-.popovermenu .menuitem img {
-	padding: initial;
-}
-
-.popovermenu a.menuitem,
-.popovermenu label.menuitem,
-.popovermenu .menuitem {
-	padding: 10px !important;
-	width: auto;
-}
-
-.popovermenu.hidden {
-	display: none;
-}
-
-.popovermenu .menuitem {
-	display: flex !important;
-	line-height: 30px;
-	color: #000;
-	align-items: center;
-}
-
-.popovermenu .menuitem .icon,
-.popovermenu .menuitem .no-icon {
-	display: inline-block;
-	width: 16px;
-	height: 16px;
-	margin-right: 10px;
-	vertical-align: middle;
-}
-
-.popovermenu .menuitem {
-	opacity: 0.5;
-}
-
-.popovermenu li:hover .menuitem {
-	opacity: 1;
-}
diff --git a/core/css/apps.scss b/core/css/apps.scss
new file mode 100644
index 00000000000..f1ddc95e092
--- /dev/null
+++ b/core/css/apps.scss
@@ -0,0 +1,688 @@
+/**
+ * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2016, Julius Haertl <jus@bitgrid.net>
+ * @copyright Copyright (c) 2016, Morris Jobke <hey@morrisjobke.de>
+ * @copyright Copyright (c) 2016, pgys <info@pexlab.space>
+ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
+ * @copyright Copyright (c) 2016, Stefan Weil <sw@weilnetz.de>
+ * @copyright Copyright (c) 2016, Roeland Jago Douma <rullzer@owncloud.com>
+ * @copyright Copyright (c) 2016, jowi <sjw@gmx.ch>
+ * @copyright Copyright (c) 2015, Hendrik Leppelsack <hendrik@leppelsack.de>
+ * @copyright Copyright (c) 2015, Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @copyright Copyright (c) 2015, Thomas Müller <thomas.mueller@tmit.eu>
+ * @copyright Copyright (c) 2015, Vincent Petry <pvince81@owncloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ */
+
+/* HEADING STYLING ---------------------------------------------------------- */
+
+h2 {
+	font-size: 20px;
+	font-weight: 300;
+	margin-bottom: 12px;
+	line-height: 140%;
+}
+h3 {
+	font-size: 15px;
+	font-weight: 300;
+	margin: 12px 0;
+}
+/* do not use italic typeface style, instead lighter color */
+em {
+	font-style: normal;
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)';
+	opacity: .5;
+}
+
+/* APP STYLING -------------------------------------------------------------- */
+
+#app {
+	height: 100%;
+	width: 100%;
+	* {
+		box-sizing: border-box;
+	}
+}
+
+/* APP-NAVIGATION ------------------------------------------------------------*/
+
+/* Navigation: folder like structure */
+
+#app-navigation {
+	width: 250px;
+	height: 100%;
+	float: left;
+	box-sizing: border-box;
+	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;
+	display: flex;
+	flex-direction: column;
+	> ul {
+		position: relative;
+		height: 100%;
+		width: inherit;
+		overflow: auto;
+		box-sizing: border-box;
+		> li {
+			&:focus,
+			&:hover,
+			&.active,
+			a.selected {
+				&,
+				> a {
+					opacity: 1;
+					box-shadow: inset 2px 0 #0082c9;
+				}
+			}
+		}
+	}
+	li {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+	}
+	&.without-app-settings {
+		padding-bottom: 0;
+	}
+	.active.with-menu > a,
+	.with-counter > a {
+		padding-right: 50px;
+	}
+	.active.with-menu.with-counter > a {
+		padding-right: 90px;
+	}
+	.with-icon a,
+	.app-navigation-entry-loading a {
+		padding-left: 44px;
+		background-size: 16px 16px;
+		background-position: 14px center;
+		background-repeat: no-repeat;
+	}
+	li > a {
+		display: block;
+		width: 100%;
+		line-height: 44px;
+		min-height: 44px;
+		padding: 0 12px;
+		overflow: hidden;
+		box-sizing: border-box;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		color: #000;
+		opacity: .57;
+	}
+	li > a:first-child img {
+	    margin-bottom: -3px;
+	    margin-right: 11px;
+	    width: 16px;
+	    margin-left: 2px;
+	}
+	.collapse {
+		display: none;
+		/* hide collapse button initially */
+	}
+	.collapsible {
+		> .collapse {
+			position: absolute;
+			height: 44px;
+			width: 44px;
+			margin: 0;
+			padding: 0;
+			background: none;
+			background-image: url('../img/actions/triangle-s.svg?v=1');
+			background-size: 16px;
+			background-repeat: no-repeat;
+			background-position: center;
+			border: none;
+			border-radius: 0;
+			outline: none !important;
+			box-shadow: none;
+		}
+		&:hover > a,
+		&:focus > a {
+			background-image: none;
+		}
+		&:hover,
+		&:focus {
+			> .collapse {
+				display: block;
+			}
+		}
+		.collapse {
+			-webkit-transform: rotate(-90deg);
+			-ms-transform: rotate(-90deg);
+			transform: rotate(-90deg);
+		}
+		&.open {
+			.collapse {
+				-webkit-transform: rotate(0);
+				-ms-transform: rotate(0);
+				transform: rotate(0);
+			}
+			background-image: linear-gradient(top, rgb(238, 238, 238) 0%, rgb(245, 245, 245) 100%);
+			background-image: -webkit-linear-gradient(top, rgb(238, 238, 238) 0%, rgb(245, 245, 245) 100%);
+			background-image: -ms-linear-gradient(top, rgb(238, 238, 238) 0%, rgb(245, 245, 245) 100%);
+		}
+	}
+	> {
+		/* Second level nesting for lists */
+		ul ul {
+			display: none;
+			li > a {
+				padding-left: 32px;
+			}
+		}
+		.with-icon ul li {
+			> a,
+			&.app-navigation-entry-loading > a {
+				padding-left: 68px;
+				background-position: 44px center;
+			}
+		}
+	}
+	> ul .collapsible.open {
+		&:hover,
+		&:focus {
+			box-shadow: inset 0 0 3px #ddd;
+		}
+		ul {
+			display: block;
+		}
+	}
+	/* Deleted entries with undo button */
+	.app-navigation-entry-deleted {
+		display: inline-block;
+		height: 44px;
+		width: 100%;
+	}
+	.app-navigation-entry-deleted-description {
+		padding-left: 12px;
+		position: relative;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		display: inline-block;
+		width: calc(100% - 49px);
+		line-height: 44px;
+		float: left;
+	}
+	.app-navigation-entry-deleted-button {
+		margin: 0;
+		height: 44px;
+		width: 44px;
+		line-height: 44px;
+		border: 0;
+		display: inline-block;
+		background-color: transparent;
+		opacity: .5;
+		&:hover, &:focus {
+			opacity: 1;
+		}
+	}
+	/* counter and actions, legacy code */
+	.utils {
+		position: absolute;
+		padding: 7px 7px 0 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		font-size: 12px;
+		button,
+		.counter {
+			width: 44px;
+			height: 44px;
+			padding-top: 12px;
+		}
+	}
+	/* drag and drop */
+	.drag-and-drop {
+		-webkit-transition: padding-bottom 500ms ease 0s;
+		transition: padding-bottom 500ms ease 0s;
+		padding-bottom: 40px;
+	}
+	.error {
+		color: #dd1144;
+	}
+	.app-navigation-separator {
+		border-bottom: 1px solid #ddd;
+	}
+
+	/**
+	 * App navigation utils, buttons and counters for drop down menu
+	 */
+	.app-navigation-entry-utils {
+		position: absolute;
+		top: 0;
+		right: 0;
+		z-index: 105;
+		ul {
+			display: flex !important;
+			align-items: center;
+			justify-content: flex-end;
+		}
+		li {
+			width: 44px !important;
+			height: 44px;
+		}
+	}
+	.active > .app-navigation-entry-utils li {
+		display: inline-block;
+	}
+	.app-navigation-entry-utils button {
+		height: 100%;
+		width: 100%;
+		margin: 0;
+		box-shadow: none;
+	}
+	.app-navigation-entry-utils-menu-button {
+		button {
+			border: 0;
+			opacity: .5;
+			background-color: transparent;
+			background-repeat: no-repeat;
+			background-position: center;
+			background-image: url('../img/actions/more.svg?v=1');
+		}
+		&:hover button,
+		&:focus button {
+			background-color: transparent;
+			opacity: 1;
+		}
+	}
+	.app-navigation-entry-utils-counter {
+		overflow: hidden;
+		text-overflow: hidden;
+		text-align: right;
+		font-size: 9pt;
+		width: 38px;
+		line-height: 44px;
+		padding: 0 10px;
+	}
+	.app-navigation-entry-utils ul, .app-navigation-entry-menu ul {
+		list-style-type: none;
+	}
+
+	/* editing an entry */
+	.app-navigation-entry-edit {
+		padding-left: 5px;
+		padding-right: 5px;
+		display: inline-block;
+		height: 39px;
+		width: 100%;
+		input {
+			border-bottom-right-radius: 0;
+			border-top-right-radius: 0;
+			width: calc(100% - 36px);
+			padding: 5px;
+			margin-right: 0;
+			height: 38px;
+			float: left;
+			border: 1px solid rgba(190, 190, 190, 0.9);
+		}
+		button,
+		input[type='submit'] {
+			width: 36px;
+			height: 38px;
+			float: left;
+		}
+		.icon-checkmark {
+			border-bottom-left-radius: 0;
+			border-top-left-radius: 0;
+			border-left: 0;
+			margin-right: 0;
+		}
+	}
+}
+
+/* APP-CONTENT ---------------------------------------------------------------*/
+/* Part where the content will be loaded into */
+#app-content {
+	position: relative;
+	height: 100%;
+	overflow-y: auto;
+	/* no top border for first settings item */
+	> .section:first-child {
+		border-top: none;
+	}
+	&.with-app-sidebar {
+		margin-right: 27%;
+	}
+}
+
+#app-content-wrapper {
+	min-width: 100%;
+	min-height: 100%;
+}
+
+/* APP-SIDEBAR ----------------------------------------------------------------*/
+
+/*
+	Sidebar: a sidebar to be used within #app-content
+	 have it as first element within app-content in order to shrink other
+	 sibling containers properly. Compare Files app for example.
+*/
+#app-sidebar {
+	position: fixed;
+	top: 45px;
+	right: 0;
+	left: auto;
+	bottom: 0;
+	width: 27%;
+	min-width: 300px;
+	display: block;
+	background: #fff;
+	border-left: 1px solid #eee;
+	-webkit-transition: margin-right 300ms;
+	transition: margin-right 300ms;
+	overflow-x: hidden;
+	overflow-y: auto;
+	visibility: visible;
+	z-index: 500;
+	&.disappear {
+		visibility: hidden;
+	}
+}
+
+/* APP-SETTINGS ---------------------------------------------------------------*/
+
+/* settings area */
+#app-settings {
+	position: fixed;
+	width: 250px;
+	/* change to 100% when layout positions are absolute */
+	bottom: 0;
+	z-index: 140;
+	&.open #app-settings-content,
+	&.opened #app-settings-content {
+		display: block;
+	}
+}
+
+#app-settings-content {
+	display: none;
+	padding: 10px;
+	background-color: #fff;
+	/* restrict height of settings and make scrollable */
+	max-height: 300px;
+	overflow-y: auto;
+	border-right: 1px solid #eee;
+	width: 250px;
+	box-sizing: border-box;
+
+	/* display input fields at full width */
+	input[type='text'] {
+		width: 93%;
+	}
+}
+
+#app-settings-header {
+	border-right: 1px solid #eee;
+	width: 250px;
+	box-sizing: border-box;
+}
+
+.settings-button {
+	display: block;
+	height: 44px;
+	width: 100%;
+	padding: 0;
+	margin: 0;
+	background-color: #fff;
+	background-image: url('../img/actions/settings.svg?v=1');
+	background-position: 14px center;
+	background-repeat: no-repeat;
+	box-shadow: none;
+	border: 0;
+	border-radius: 0;
+	text-align: left;
+	padding-left: 42px;
+	font-weight: normal;
+	&:hover,
+	&:focus {
+		background-color: #fff;
+	}
+	&.opened {
+		&:hover, &:focus {
+			background-color: #fff;
+		}
+	}
+}
+
+/* GENERAL SECTION ---------------------------------------------------------- */
+.section {
+	display: block;
+	padding: 30px;
+	color: #555;
+	margin-bottom: 24px;
+	&.hidden {
+		display: none !important;
+	}
+	/* slight position correction of checkboxes and radio buttons */
+	input {
+		&[type='checkbox'],
+		&[type='radio'] {
+			vertical-align: -2px;
+			margin-right: 4px;
+		}
+	}
+}
+.sub-section {
+	position: relative;
+	margin-top: 10px;
+	margin-left: 27px;
+	margin-bottom: 10px;
+}
+
+.appear {
+	opacity: 1;
+	-webkit-transition: opacity 500ms ease 0s;
+	-moz-transition: opacity 500ms ease 0s;
+	-ms-transition: opacity 500ms ease 0s;
+	-o-transition: opacity 500ms ease 0s;
+	transition: opacity 500ms ease 0s;
+	&.transparent {
+		opacity: 0;
+	}
+}
+
+/* DROPDOWN ----------------------------------------------------------------- */
+.dropdown {
+	background: #eee;
+	border-bottom-left-radius: 5px;
+	border-bottom-right-radius: 5px;
+	box-shadow: 0 1px 1px #777;
+	display: block;
+	margin-right: 0;
+	position: absolute;
+	right: 0;
+	width: 420px;
+	z-index: 500;
+	padding: 16px;
+}
+
+/* TABS --------------------------------------------------------------------- */
+.tabHeaders {
+	display: inline-block;
+	margin: 15px;
+	.tabHeader {
+		float: left;
+		padding: 5px;
+		cursor: pointer;
+		color: #888;
+		margin-bottom: 1px;
+		a {
+			color: #888;
+			margin-bottom: 1px;
+		}
+		&.selected {
+			font-weight: 600;
+			border-bottom: 1px solid #333;
+		}
+		&:hover {
+			border-bottom: 1px solid #333;
+		}
+		&.selected, &:hover {
+			margin-bottom: 0px;
+			color: #000;
+			a {
+				margin-bottom: 0px;
+				color: #000;
+			}
+		}
+	}
+}
+.tabsContainer {
+	clear: left;
+	.tab {
+		padding: 0 15px 15px;
+	}
+}
+
+/* POPOVER MENU ------------------------------------------------------------- */
+.ie,
+.edge {
+	.bubble, .bubble:after,
+	.popovermenu, .popovermenu:after,
+	#app-navigation .app-navigation-entry-menu,
+	#app-navigation .app-navigation-entry-menu:after {
+		border: 1px solid #eee;
+	}
+}
+
+.bubble,
+.app-navigation-entry-menu,
+.popovermenu {
+	position: absolute;
+	background-color: #fff;
+	color: #333;
+	border-radius: 3px;
+	z-index: 110;
+	margin: 5px;
+	margin-top: -5px;
+	right: 0;
+	-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));
+	display: none;
+
+	&:after {
+		bottom: 100%;
+	 /* Min-width of popover is 36px and arrow width is 20px
+		wich leaves us 8px right and 8px left */
+		right: 8px;
+		/* change this to adjust the arrow position */
+		border: solid transparent;
+		content: ' ';
+		height: 0;
+		width: 0;
+		position: absolute;
+		pointer-events: none;
+		border-color: rgba(238, 238, 238, 0);
+		border-bottom-color: #fff;
+		border-width: 10px;
+	}
+	/* Center the popover */
+	&.menu-center {
+		transform: translateX(50%);
+		right: 50%;
+		margin-right: 0;
+		&:after {
+			right: 50%;
+			transform: translateX(50%);
+		}
+	}
+	/* Align the popover to the left */
+	&.menu-left {
+		right: auto;
+		left: 0;
+		margin-right: 0;
+		&:after {
+			left: 6px;
+			right: auto;
+		}
+	}
+
+	&.open {
+		display: block;
+	}
+
+	ul {
+		/* Overwrite #app-navigation > ul ul */
+		display: flex !important;
+		flex-direction: column;
+	}
+	li {
+		display: flex;
+		> button,
+		> a,
+		> .menuitem {
+			cursor: pointer;
+			line-height: 36px;
+			border: 0;
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)' !important;
+			filter: alpha(opacity = 50) !important;
+			opacity: .5 !important;
+			background-color: transparent;
+			display: flex;
+			align-items: center;
+			width: auto;
+			height: auto;
+			margin: 0;
+			font-weight: inherit;
+			box-shadow: none;
+			color: #333 !important; /* Overwrite app-navigation li */
+			/* prevent .action class to break the design */
+			&.action {
+				padding: inherit !important;
+			}
+			&:hover, &:focus {
+				-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)' !important;
+				filter: alpha(opacity = 100) !important;
+				opacity: 1 !important;
+				background-color: transparent;
+			}
+			> span {
+				cursor: pointer;
+				white-space: nowrap;
+			}
+			span {
+				-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)' !important;
+				filter: alpha(opacity = 70) !important;
+				opacity: .7 !important;
+			}
+			> p {
+				width: 150px;
+				line-height: 1.6em;
+				padding: 8px 0;
+			}
+			/* Add padding if contains icon+text */
+			&:not(:empty) {
+				padding: 0 !important;
+				padding-right: 10px !important;
+			}
+			> img {
+				width: 16px;
+				padding: 0 10px;
+			}
+		}
+		[class^='icon-'],
+		[class*=' icon-']{
+			/* Keep padding to define the width to
+			 assure correct position of a possible text */
+			padding: 18px 0 18px 36px;
+			min-width: 0; /* Overwrite icons*/
+			min-height: 0;
+			background-position: 10px center;
+			opacity: 0.7; /* Default button icon override */
+		}
+	}
+}
diff --git a/core/css/guest.css b/core/css/guest.css
new file mode 100644
index 00000000000..3223e764ac0
--- /dev/null
+++ b/core/css/guest.css
@@ -0,0 +1,660 @@
+/* Copyright (c) 2011, 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. */
+
+/* Default and reset */
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; }
+html, body { height:100%; }
+article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; }
+body { line-height:1.5; }
+table { border-collapse:separate; border-spacing:0; white-space:nowrap; }
+caption, th, td { text-align:left; font-weight:normal; }
+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; }
+
+body {
+	background-color: #ffffff;
+	font-weight: 400;
+	font-size: .8em;
+	line-height: 1.6em;
+	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+	color: #000;
+	text-align: center;
+	background-color: #0082c9;
+	background-image: url('../img/background.jpg?v=1');
+	background-position: 50% 50%;
+	background-repeat: no-repeat;
+	background-size: cover;
+	background-attachment: fixed; /* fix background gradient */
+	height: 100%; /* fix sticky footer */
+}
+
+/* Various fonts settings */
+p.info a,
+#showAdvanced {
+	color: #fff;
+}
+#remember_login:hover+label,
+#remember_login:focus+label,
+#forgot-password:hover,
+#forgot-password:focus,
+p.info a:hover,
+p.info a:focus  {
+	opacity: .6;
+}
+em {
+	font-style: normal;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+	opacity: .5;
+}
+
+/* heading styles */
+h2 {
+	font-size: 20px;
+	font-weight: 300;
+	margin-bottom: 12px;
+	line-height: 140%;
+}
+h3 {
+	font-size: 15px;
+	font-weight: 300;
+	margin: 12px 0;
+}
+
+/* Global content */
+#header {
+	padding-top: 100px;
+}
+#header .logo {
+	background-image: url(../img/logo-icon.svg?v=1);
+	background-repeat: no-repeat;
+	background-size: 175px;
+	background-position: center;
+	width: 252px;
+	height: 120px;
+	margin: 0 auto;
+}
+.wrapper {
+	min-height: 100%;
+	margin: 0 auto -70px;
+	width: 300px;
+}
+.v-align {
+	width: inherit;
+}
+
+/* Default FORM */
+form {
+	position: relative;
+	width: 280px;
+	margin: 16px auto;
+	padding: 0;
+}
+form fieldset {
+	margin-bottom: 20px;
+	text-align: left;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+form #sqliteInformation {
+	margin-top: -20px;
+	margin-bottom: 20px;
+}
+form #adminaccount {
+	margin-bottom: 15px;
+}
+form fieldset legend, #datadirContent label {
+	width: 100%;
+}
+#datadirContent label {
+	display: block;
+	margin: 0;
+}
+form #datadirField legend {
+	margin-bottom: 15px;
+}
+
+/* View more button */
+#showAdvanced {
+	padding: 13px; /* increase clickable area of Advanced dropdown */
+}
+#showAdvanced img {
+	vertical-align: middle; /* adjust position of Advanced dropdown arrow */
+}
+
+/* Buttons and input */
+input, textarea, select, button {
+	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+}
+input {
+	font-size: 20px;
+	margin: 5px;
+	padding: 11px 10px 9px;
+	outline: none;
+	border-radius: 3px;
+}
+input[type="submit"],
+input[type="button"],
+button, .button,
+select {
+	width: auto;
+	min-width: 25px;
+	padding: 5px;
+	background-color: rgba(240,240,240,.9);
+	font-weight: 600;
+	color: #555;
+	border: 1px solid rgba(240,240,240,.9);
+	cursor: pointer;
+}
+input[type="text"],
+input[type="password"],
+input[type='email'] {
+	width: 249px;
+	background: #fff;
+	color: #555;
+	cursor: text;
+	font-family: inherit;
+	-webkit-appearance: textfield;
+	-moz-appearance: textfield;
+	box-sizing: content-box;
+	border: none;
+	font-weight: 300;
+}
+input.login {
+	width: 269px;
+	background-position: right 16px center;
+}
+input[type="submit"],
+input.updateButton,
+input.update-continue {
+	padding: 10px 20px; /* larger log in and installation buttons */
+}
+input.primary,
+button.primary {
+	border: 1px solid #0082c9;
+	background-color: #00a2e9;
+	color: #fff;
+}
+
+/* Radio and Checkbox */
+input[type="checkbox"].checkbox {
+	position: absolute;
+	left:-10000px;
+	top: auto;
+	width: 1px;
+	height: 1px;
+	overflow: hidden;
+}
+input[type="checkbox"].checkbox + label:before {
+	content: "";
+	display: inline-block;
+
+	height: 20px;
+	width: 20px;
+	vertical-align: middle;
+
+	background: url('../img/actions/checkbox.svg') left top no-repeat;
+}
+input[type="checkbox"].checkbox:disabled +label:before { opacity: .6; }
+input[type="checkbox"].checkbox.u-left +label:before { float: left; }
+input[type="checkbox"].checkbox.u-hidden + label:before { display: none; }
+input[type="checkbox"].checkbox:checked + label:before {
+	background-image: url('../img/actions/checkbox-checked.svg');
+}
+input[type="checkbox"].checkbox:indeterminate + label:before {
+	background-image: url('../img/actions/checkbox-mixed.svg');
+}
+input[type="checkbox"].checkbox:disabled + label:before {
+	background-image: url('../img/actions/checkbox-disabled.svg');
+}
+input[type="checkbox"].checkbox:checked:disabled + label:before {
+	background-image: url('../img/actions/checkbox-checked-disabled.svg');
+}
+input[type="checkbox"].checkbox:indeterminate:disabled + label:before {
+	background-image: url('../img/actions/checkbox-mixed-disabled.svg');
+}
+input[type="checkbox"].checkbox--white + label:before {
+	background-image: url('../img/actions/checkbox-white.svg');
+}
+input[type="checkbox"].checkbox--white:checked + label:before {
+	background-image: url('../img/actions/checkbox-checked-white.svg');
+}
+input[type="checkbox"].checkbox--white:indeterminate + label:before {
+	background-image: url('../img/actions/checkbox-mixed-white.svg');
+}
+input[type="checkbox"].checkbox--white:disabled + label:before {
+	background-image: url('../img/actions/checkbox-disabled-white.svg');
+}
+input[type="checkbox"].checkbox--white:checked:disabled + label:before {
+	background-image: url('../img/actions/checkbox-checked-disabled.svg');
+}
+input[type="checkbox"].checkbox--white:indeterminate:disabled + label:before {
+	background-image: url('../img/actions/checkbox-mixed-disabled.svg');
+}
+input[type="checkbox"].checkbox:hover+label:before, input[type="checkbox"]:focus+label:before {
+	color:#111 !important;
+}
+input[type="checkbox"]+label {
+	position: relative;
+	margin: 0;
+	padding: 14px;
+	vertical-align: middle;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+
+input[type="radio"].radio {
+	position: absolute;
+	left:-10000px;
+	top: auto;
+	width: 1px;
+	height: 1px;
+	overflow: hidden;
+}
+input[type="radio"].radio + label:before {
+	content: "";
+	display: inline-block;
+
+	height: 20px;
+	width: 20px;
+	vertical-align: middle;
+
+	background: url('../img/actions/radio.svg') left top no-repeat;
+}
+input[type="radio"].radio:checked + label:before {
+	background-image: url('../img/actions/radio-checked.svg');
+}
+input[type="radio"].radio:disabled + label:before {
+	background-image: url('../img/actions/radio-disabled.svg');
+}
+input[type="radio"].radio:checked:disabled + label:before {
+	background-image: url('../img/actions/radio-checked-disabled.svg');
+}
+input[type="radio"].radio--white + label:before {
+	background-image: url('../img/actions/radio-white.svg');
+}
+input[type="radio"].radio--white:checked + label:before {
+	background-image: url('../img/actions/radio-checked-white.svg');
+}
+input[type="radio"].radio--white:disabled + label:before {
+	background-image: url('../img/actions/radio-disabled.svg');
+}
+input[type="radio"].radio--white:checked:disabled + label:before {
+	background-image: url('../img/actions/radio-checked-disabled.svg');
+}
+
+/* keep the labels for screen readers but hide them since we use placeholders */
+label.infield {
+	display: none;
+}
+
+/* Password strength meter */
+.strengthify-wrapper {
+	display: inline-block;
+	position: relative;
+	left: 15px;
+	top: -23px;
+	width: 250px;
+}
+.tooltip-inner {
+	font-weight: bold;
+	color: #ccc;
+	padding: 3px 6px;
+	text-align: center;
+}
+
+/* Show password toggle */
+#show, #dbpassword {
+	position: absolute;
+	right: 1em;
+	top: .8em;
+	float: right;
+}
+#show, #dbpassword, #personal-show {
+	display: none;
+}
+#show + label, #dbpassword + label {
+	right: 21px;
+	top: 15px !important;
+	margin: -14px !important;
+	padding: 14px !important;
+}
+#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	opacity: .8;
+}
+#show + label, #dbpassword + label, #personal-show + label {
+	position: absolute !important;
+	height: 20px;
+	width: 24px;
+	background-image: url('../img/actions/toggle.svg?v=1');
+	background-repeat: no-repeat;
+	background-position: center;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
+	opacity: .3;
+}
+#show + label:before, #dbpassword + label:before, #personal-show + label:before {
+	display: none;
+}
+#pass2, input[name="personal-password-clone"] {
+	padding: .6em 2.5em .4em .4em;
+	width: 8em;
+}
+#personal-show + label {
+	height: 14px;
+	margin-top: -25px;
+	left: 295px;
+	display: block;
+}
+#passwordbutton {
+	margin-left: .5em;
+}
+
+/* Dark subtle label text */
+p.info,
+form fieldset legend,
+#datadirContent label,
+form fieldset .warning-info,
+form input[type="checkbox"]+label {
+	text-align: center;
+	color: #fff;
+}
+/* overrides another !important statement that sets this to unreadable black */
+form .warning input[type="checkbox"]:hover+label,
+form .warning input[type="checkbox"]:focus+label,
+form .warning input[type="checkbox"]+label {
+	color: #fff !important;
+}
+
+/* Additional login options */
+#remember_login {
+	margin: 18px 5px 0 16px !important;
+}
+.remember-login-container {
+	display: inline-block;
+	margin: 10px 0;
+	text-align: center;
+	width: 100%;
+}
+#forgot-password {
+	padding: 11px;
+	float: right;
+	color: #fff;
+}
+
+/* Alternative Logins */
+#alternative-logins legend { margin-bottom:10px; }
+#alternative-logins li { height:40px; display:inline-block; white-space:nowrap; }
+
+/* fixes for update page TODO should be fixed some time in a proper way */
+/* this is just for an error while updating the ownCloud instance */
+.updateProgress .error {
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+/* Database selector on install page */
+form #selectDbType {
+	text-align:center;
+	white-space: nowrap; 
+	margin: 0;
+}
+form #selectDbType .info {
+	white-space: normal;
+}
+form #selectDbType label {
+	position: static;
+	margin: 0 -3px 5px;
+	font-size: 12px;
+	background:#f8f8f8;
+	color:#888;
+	cursor:pointer;
+	border: 1px solid #ddd;
+}
+form #selectDbType label span {
+	cursor: pointer;
+	padding: 10px 20px;
+}
+form #selectDbType label.ui-state-hover,
+form #selectDbType label.ui-state-active {
+	color:#000;
+	background-color:#e8e8e8; }
+
+/* Nicely grouping input field sets */
+.grouptop,
+.groupmiddle,
+.groupbottom {
+	position: relative;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+.grouptop input {
+	margin-bottom: 0 !important;
+	border-bottom: 0 !important;
+	border-bottom-left-radius: 0 !important;
+	border-bottom-right-radius: 0 !important;
+}
+.groupmiddle input {
+	margin-top: 0 !important;
+	margin-bottom: 0 !important;
+	border-top: 0 !important;
+	border-bottom: 0 !important;
+	border-radius: 0 !important;
+	box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important;
+}
+.groupbottom input {
+	margin-top: 0 !important;
+	border-top: 0 !important;
+	border-top-right-radius: 0 !important;
+	border-top-left-radius: 0 !important;
+	box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important;
+}
+.groupbottom input[type=submit] {
+	box-shadow: none !important;
+}
+
+/* Errors */
+/* Warnings and errors are the same */
+.warning,
+.update,
+.error {
+	display: block;
+	padding: 10px;
+	background-color: rgba(0,0,0,.3);
+	color: #fff;
+	text-align: left;
+	border-radius: 3px;
+	cursor: default;
+}
+.warning, {
+	padding: 5px;
+	background: #fdd;
+	margin: 0 7px 5px 4px;
+}
+.warning legend,
+.warning a,
+.error a {
+	color: #fff !important;
+	font-weight: 600 !important;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	opacity: 1;
+}
+.error a.button {
+	color: #555 !important;
+	display: inline-block;
+	text-align: center;
+}
+.error pre {
+	white-space: pre-wrap;
+	text-align: left;
+}
+.error-wide {
+	width: 700px;
+	margin-left: -200px !important;
+	margin-top: 35px;
+}
+.error-wide .button {
+	color: black !important;
+}
+.warning-input {
+	border-color: #ce3702 !important;
+}
+a.warning {
+	cursor: pointer;
+}
+fieldset.warning legend,
+fieldset.update legend {
+	top: 18px;
+	position: relative;
+}
+fieldset.warning legend + p,
+fieldset.update legend + p {
+	margin-top: 12px;
+}
+
+/* Various paragraph styles */
+.infogroup {
+	margin-bottom: 15px;
+}
+p.info {
+	margin: 0 auto;
+	padding-top: 20px;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+
+/* Update */
+.update {
+	width: inherit;
+	text-align: center;
+}
+.update .appList {
+	list-style: disc;
+	text-align: left;
+	margin-left: 25px;
+	margin-right: 25px;
+}
+.update img.float-spinner {
+	float: left;
+}
+.update h2 {
+	margin: 0 0 20px;
+}
+.update a {
+	color: #fff;
+	border-bottom: 1px solid #aaa;
+}
+.update a.update-show-detailed {
+	border-bottom: inherit;
+}
+#update-progress-detailed {
+	text-align: left;
+}
+.update-show-detailed {
+	padding: 13px;
+	display: block;
+	opacity: .75;
+}
+#update-progress-icon {
+	height: 32px;
+	margin: 10px;
+	background-size: 32px;
+}
+
+/* Icons */
+.icon-info-white {
+	background-image: url(../img/actions/info-white.svg?v=1);
+}
+
+/* Loading */
+.float-spinner {
+	margin-top: -32px;
+	padding-top: 32px;
+}
+[class^='icon-'], [class*=' icon-'] {
+	background-repeat: no-repeat;
+	background-position: center;
+	min-width: 16px;
+	min-height: 16px;
+}
+.loading, .loading-small, .icon-loading, .icon-loading-dark, .icon-loading-small, .icon-loading-small-dark {
+	position: relative;
+}
+.loading:after, .loading-small:after, .icon-loading:after, .icon-loading-dark:after, .icon-loading-small:after, .icon-loading-small-dark:after {
+	z-index: 2;
+	content: '';
+	height: 32px;
+	width: 32px;
+	margin: -17px 0 0 -17px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	border-radius: 100%;
+	-webkit-animation: rotate .8s infinite linear;
+	animation: rotate .8s infinite linear;
+	-webkit-transform-origin: center;
+	-ms-transform-origin: center;
+	transform-origin: center;
+}
+.loading:after, .loading-small:after, .icon-loading:after, .icon-loading-dark:after, .icon-loading-small:after, .icon-loading-small-dark:after {
+	border: 2px solid rgba(150, 150, 150, 0.5);
+	border-top-color: #646464;
+}
+.icon-loading-dark:after, .icon-loading-small-dark:after {
+	border: 2px solid rgba(187, 187, 187, 0.5);
+	border-top-color: #bbb;
+}
+.icon-loading-small:after, .icon-loading-small-dark:after {
+	height: 16px;
+	width: 16px;
+	margin: -9px 0 0 -9px;
+}
+/* Css replaced elements don't have ::after nor ::before */
+img.icon-loading, object.icon-loading, video.icon-loading, button.icon-loading, textarea.icon-loading, input.icon-loading, select.icon-loading {
+	background-image: url("../img/loading.gif");
+}
+img.icon-loading-dark, object.icon-loading-dark, video.icon-loading-dark, button.icon-loading-dark, textarea.icon-loading-dark, input.icon-loading-dark, select.icon-loading-dark {
+	background-image: url("../img/loading-dark.gif");
+}
+img.icon-loading-small, object.icon-loading-small, video.icon-loading-small, button.icon-loading-small, textarea.icon-loading-small, input.icon-loading-small, select.icon-loading-small {
+	background-image: url("../img/loading-small.gif");
+}
+img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-small-dark, button.icon-loading-small-dark, textarea.icon-loading-small-dark, input.icon-loading-small-dark, select.icon-loading-small-dark {
+	background-image: url("../img/loading-small-dark.gif");
+}
+@-webkit-keyframes rotate {
+	from {
+	-webkit-transform: rotate(0deg);
+	transform: rotate(0deg);
+	}
+	to {
+	-webkit-transform: rotate(360deg);
+	transform: rotate(360deg);
+	}
+}
+@keyframes rotate {
+	from {
+	-webkit-transform: rotate(0deg);
+	transform: rotate(0deg);
+	}
+	to {
+	-webkit-transform: rotate(360deg);
+	transform: rotate(360deg);
+	}
+}
+
+/* FOOTER */
+footer,
+.push {
+	height: 70px;
+}
\ No newline at end of file
diff --git a/core/css/header.css b/core/css/header.css
deleted file mode 100644
index f81a71070f0..00000000000
--- a/core/css/header.css
+++ /dev/null
@@ -1,385 +0,0 @@
-/* prevent ugly selection effect on accidental selection */
-#header,
-#navigation,
-#expanddiv {
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-}
-
-/* removed until content-focusing issue is fixed */
-#skip-to-content a {
-	position: absolute;
-	left: -10000px;
-	top: auto;
-	width: 1px;
-	height: 1px;
-	overflow: hidden;
-}
-#skip-to-content a:focus {
-	left: 76px;
-	top: -9px;
-	color: #fff;
-	width: auto;
-	height: auto;
-}
-
-
-
-/* HEADERS ------------------------------------------------------------------ */
-
-#body-user #header,
-#body-settings #header,
-#body-public #header {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	z-index: 2000;
-	height: 45px;
-	line-height: 2.5em;
-	background-color: #0082c9;
-	box-sizing: border-box;
-}
-
-
-
-/* LOGO and APP NAME -------------------------------------------------------- */
-
-#nextcloud {
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: 5px;
-	padding-bottom: 0;
-	height: 45px; /* header height */
-	box-sizing: border-box;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	opacity: 1;
-}
-#nextcloud:focus {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=75)";
-	opacity: .75;
-}
-#nextcloud:hover,
-#nextcloud:active {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	opacity: 1;
-}
-
-#header .logo {
-	background-image: url('../img/logo-icon.svg?v=1');
-	background-repeat: no-repeat;
-	background-size: 175px;
-	background-position: center;
-	width: 252px;
-	height: 120px;
-	margin: 0 auto;
-}
-
-#header .logo-icon {
-	/* display logo so appname can be shown next to it */
-	display: inline-block;
-	background-image: url('../img/logo-icon.svg?v=1');
-	background-repeat: no-repeat;
-	background-position: center center;
-	width: 62px;
-	height: 34px;
-}
-
-#header .header-appname-container {
-	display: inline-block;
-	position: absolute;
-	left: 70px;
-	height: 27px;
-	padding-top: 18px;
-	padding-right: 10px;
-}
-
-/* hover effect for app switcher label */
-.header-appname-container .header-appname,
-.menutoggle .icon-caret {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=75)";
-	opacity: .75;
-}
-.menutoggle:hover .header-appname,
-.menutoggle:hover .icon-caret,
-.menutoggle:focus .header-appname,
-.menutoggle:focus .icon-caret,
-.menutoggle.active .header-appname,
-.menutoggle.active .icon-caret {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	opacity: 1;
-}
-
-/* show appname next to logo */
-.header-appname {
-	display: inline-block;
-	position: relative;
-	color: #fff;
-	font-size: 16px;
-	font-weight: 300;
-	margin: 0;
-	margin-top: -24px;
-	padding: 7px 0 7px 5px;
-	vertical-align: middle;
-}
-/* show caret indicator next to logo to make clear it is tappable */
-#header .icon-caret {
-	display: inline-block;
-	width: 12px;
-	height: 12px;
-	margin: 0;
-	margin-top: -21px;
-	padding: 0;
-	vertical-align: middle;
-}
-/* do not show menu toggle on public share links as there is no menu */
-#body-public #header .icon-caret {
-	display: none;
-}
-
-
-
-/* NAVIGATION --------------------------------------------------------------- */
-
-#navigation {
-	position: fixed;
-	top: 45px;
-	left: 10px;
-	width: 265px;
-	max-height: 85%;
-	margin-top: 0;
-	padding-bottom: 10px;
-	background-color: rgba(255, 255, 255, .97);
-	box-shadow: 0 1px 10px rgba(50, 50, 50, .7);
-	border-radius: 3px;
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-	display: none;
-	/*overflow-y: auto;
-	overflow-x: hidden;*/
-	z-index: 2000;
-}
-/* arrow look */
-#navigation:after, #expanddiv:after {
-	bottom: 100%;
-	border: solid transparent;
-	content: " ";
-	height: 0;
-	width: 0;
-	position: absolute;
-	pointer-events: none;
-	border-color: rgba(0, 0, 0, 0);
-	border-bottom-color: rgba(255, 255, 255, .97);
-	border-width: 10px;
-	margin-left: -10px;
-}
-/* position of dropdown arrow */
-#navigation:after {
-	left: 47%;
-}
-#expanddiv:after {
-	right: 15px;
-}
-
-#navigation, #navigation * {
-	box-sizing:border-box;
-}
-#navigation li {
-	display: inline-block;
-}
-#navigation a {
-	position: relative;
-	width: 80px;
-	height: 80px;
-	display: inline-block;
-	text-align: center;
-	padding: 20px 0;
-}
-#navigation a span {
-	display: inline-block;
-	font-size: 13px;
-	padding-bottom: 0;
-	padding-left: 0;
-	width: 80px;
-	text-align: center;
-	color: #000;
-	white-space:nowrap;
-	overflow:hidden;
-	text-overflow:ellipsis;
-}
-	/* icon opacity and hover effect */
-	#navigation a svg,
-	#navigation a span {
-		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-		opacity: .5;
-	}
-	#navigation a:hover svg,
-	#navigation a:focus svg,
-	#navigation a:hover span,
-	#navigation a:focus span,
-	#navigation a.active svg,
-	#navigation a.active span,
-	#apps-management a:hover svg,
-	#apps-management a:focus svg,
-	#apps-management a.active svg,
-	#apps-management a:hover span,
-	#apps-management a:focus span,
-	#apps-management a.active span {
-		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-		opacity: 1;
-	}
-
-#navigation .app-icon {
-	margin: 0 auto;
-	padding: 0;
-	max-height: 32px;
-	max-width: 32px;
-}
-
-/* Apps management */
-#apps-management {
-	min-height: initial;
-	height: initial;
-	margin: 0;
-}
-#apps-management a svg,
-#apps-management a span {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
-	opacity: .3;
-}
-
-
-/* loading feedback for apps */
-#navigation .app-loading .icon-loading-dark {
-	display: inline !important;
-	position: absolute;
-	top: 20px;
-	left: 24px;
-	width: 32px;
-	height: 32px;
-}
-#navigation .app-loading .app-icon {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-	opacity: 0;
-}
-
-#apps {
-	max-height: calc(100vh - 100px);
-	overflow:auto;
-}
-
-
-/* USER MENU -----------------------------------------------------------------*/
-
-/* info part on the right, used e.g. for info on who shared something */
-.header-right {
-	position: absolute;
-	right: 0;
-	padding: 7px 5px;
-	color: #fff;
-	height: 100%;
-	max-width: 80%;
-	white-space: nowrap;
-	box-sizing: border-box;
-}
-
-/* Profile picture in header */
-#header .avatardiv {
-	float: left;
-	display: inline-block;
-	margin-right: 8px;
-	cursor: pointer;
-	height: 32px;
-	width: 32px;
-}
-#header .avatardiv img {
-	opacity: 1;
-	cursor: pointer;
-}
-
-#settings {
-	float: right;
-	color: #ddd;
-	cursor: pointer;
-}
-#settings .icon-loading-small-dark {
-	display: inline-block;
-	margin-bottom: -3px;
-	margin-right: 6px;
-	background-size: 16px 16px;
-}
-#expand {
-	display: block;
-	padding: 7px 30px 6px 10px;
-	cursor: pointer;
-}
-#expand * {
-	cursor: pointer;
-}
-#expand:hover,
-#expand:focus,
-#expand:active {
-	color: #fff;
-}
-#expand img {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-	opacity: .7;
-	margin-bottom: -2px;
-}
-#expand:hover img,
-#expand:focus img,
-#expand:active img {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	opacity: 1;
-}
-#expand .icon-caret {
-	margin-top: 0;
-}
-#expanddiv {
-	position: absolute;
-	right: 10px;
-	top: 45px;
-	z-index: 2000;
-	display: none;
-	background: rgb(255, 255, 255);
-	border: 1px solid rgb(204, 204, 204);
-	box-shadow: 0 1px 10px rgba(50, 50, 50, .7);
-	border-radius: 3px;
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-	box-sizing: border-box;
-}
-#expanddiv:after {
-	border-color: rgba(0, 0, 0, 0);
-	border-bottom-color: rgba(255, 255, 255, 1);
-}
-	#expanddiv a {
-		display: block;
-		height: 40px;
-		color: #000;
-		padding: 4px 12px 0;
-		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-		opacity: .5;
-		box-sizing: border-box;
-	}
-	#expanddiv a img {
-		margin-bottom: -3px;
-		margin-right: 6px;
-	}
-	#expanddiv a:hover,
-	#expanddiv a:focus,
-	#expanddiv a:active,
-	#expanddiv a.active {
-		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-		opacity: 1;
-	}
-
-/* do not show display name when profile picture is present */
-#header .avatardiv.avatardiv-shown + #expandDisplayName {
-	display: none;
-}
-#header #expand {
-	display: block;
-}
diff --git a/core/css/header.scss b/core/css/header.scss
new file mode 100644
index 00000000000..2b73937a3c4
--- /dev/null
+++ b/core/css/header.scss
@@ -0,0 +1,407 @@
+/**
+ * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2016, Julius Haertl <jus@bitgrid.net>
+ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
+ * @copyright Copyright (c) 2016, Jos Poortvliet <jos@opensuse.org>
+ * @copyright Copyright (c) 2016, Erik Pellikka <erik@pellikka.org>
+ * @copyright Copyright (c) 2016, jowi <sjw@gmx.ch>
+ * @copyright Copyright (c) 2015, Hendrik Leppelsack <hendrik@leppelsack.de>
+ * @copyright Copyright (c) 2015, Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @copyright Copyright (c) 2015, Volker E <volker.e@temporaer.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ */
+
+/* prevent ugly selection effect on accidental selection */
+#header,
+#navigation,
+#expanddiv {
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+
+	/* Dropdown menu arrow */
+	&.menu:after,
+	.menu:after {
+		border: 10px solid transparent;
+		border-color: transparent;
+		border-bottom-color: #fff;
+		bottom: 100%;
+		content: ' ';
+		height: 0;
+		width: 0;
+		position: absolute;
+		pointer-events: none;
+		margin-left: -10px;
+	}
+}
+
+/* removed until content-focusing issue is fixed */
+#skip-to-content a {
+	position: absolute;
+	left: -10000px;
+	top: auto;
+	width: 1px;
+	height: 1px;
+	overflow: hidden;
+	&:focus {
+		left: 76px;
+		top: -9px;
+		color: #fff;
+		width: auto;
+		height: auto;
+	}
+}
+
+/* HEADERS ------------------------------------------------------------------ */
+#body-user #header,
+#body-settings #header,
+#body-public #header {
+	display: inline-flex;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 2000;
+	height: 45px;
+	background-color: #0082c9;
+	box-sizing: border-box;
+	justify-content: space-between;
+}
+
+/* LOGO and APP NAME -------------------------------------------------------- */
+#nextcloud {
+	padding: 5px;
+	padding-bottom: 0;
+	height: 45px;
+	/* header height */
+	box-sizing: border-box;
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+	opacity: 1;
+	&:focus {
+		-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
+		opacity: .75;
+	}
+	&:hover, &:active {
+		-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+		opacity: 1;
+	}
+}
+
+#header {
+	.logo {
+		background-image: url('../img/logo-icon.svg?v=1');
+		background-repeat: no-repeat;
+		background-size: 175px;
+		background-position: center;
+		width: 252px;
+		height: 120px;
+		margin: 0 auto;
+	}
+	.logo-icon {
+		/* display logo so appname can be shown next to it */
+		display: inline-block;
+		background-image: url('../img/logo-icon.svg?v=1');
+		background-repeat: no-repeat;
+		background-position: center center;
+		width: 62px;
+		height: 34px;
+	}
+	.header-appname-container {
+		display: inline-block;
+		padding-top: 22px;
+		padding-right: 10px;
+		flex-shrink: 0;
+	}
+	/* show caret indicator next to logo to make clear it is tappable */
+	.icon-caret {
+		display: inline-block;
+		width: 12px;
+		height: 12px;
+		margin: 0;
+		margin-top: -21px;
+		padding: 0;
+		vertical-align: middle;
+	}
+
+	#header-left,
+	#header-right {
+		display: inline-flex;
+		align-items: center;
+	}
+
+	#header-left {
+		flex: 0 0;
+		flex-grow: 1;
+	}
+
+	#header-right {
+		justify-content: flex-end;
+	}
+}
+
+/* hover effect for app switcher label */
+
+.header-appname-container .header-appname {
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
+	opacity: .75;
+}
+
+.menutoggle {
+	.icon-caret {
+		-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=75)';
+		opacity: .75;
+	}
+	&:hover {
+		.header-appname, .icon-caret {
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+			opacity: 1;
+		}
+	}
+	&:focus {
+		.header-appname, .icon-caret {
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+			opacity: 1;
+		}
+	}
+	&.active {
+		.header-appname, .icon-caret {
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+			opacity: 1;
+		}
+	}
+}
+
+/* show appname next to logo */
+.header-appname {
+	display: inline-block;
+	position: relative;
+	color: #fff;
+	font-size: 16px;
+	font-weight: 300;
+	margin: 0;
+	margin-top: -27px;
+	padding: 7px 0 7px 5px;
+	vertical-align: middle;
+}
+
+
+
+/* do not show menu toggle on public share links as there is no menu */
+#body-public #header .icon-caret {
+	display: none;
+}
+
+/* NAVIGATION --------------------------------------------------------------- */
+#navigation {
+	position: fixed;
+	top: 45px;
+	left: 10px;
+	width: 265px;
+	max-height: 85%;
+	margin-top: 0;
+	padding-bottom: 10px;
+	background-color: rgba(255, 255, 255, 0.97);
+	box-shadow: 0 1px 10px rgba(150, 150, 150, 0.75);
+	border-radius: 3px;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+	display: none;
+	box-sizing: border-box;
+	z-index: 2000;
+	&:after {
+		left: 47%;
+	}
+	* {
+		box-sizing: border-box;
+	}
+	li {
+		display: inline-block;
+	}
+	a {
+		position: relative;
+		width: 80px;
+		height: 80px;
+		display: inline-block;
+		text-align: center;
+		padding: 20px 0;
+		span {
+			display: inline-block;
+			font-size: 13px;
+			padding-bottom: 0;
+			padding-left: 0;
+			width: 80px;
+			text-align: center;
+			color: #000;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+		}
+		svg,
+		span {
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)';
+			opacity: .5;
+		}
+		&:hover svg,
+		&:focus svg,
+		&:hover span,
+		&:focus span {
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+			opacity: 1;
+		}
+		&.active {
+			svg, span {
+				-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+				opacity: 1;
+			}
+		}
+	}
+	.app-icon {
+		margin: 0 auto;
+		padding: 0;
+		max-height: 32px;
+		max-width: 32px;
+	}
+	/* loading feedback for apps */
+	.app-loading {
+		.icon-loading-dark {
+			display: inline !important;
+			position: absolute;
+			top: 20px;
+			left: 24px;
+			width: 32px;
+			height: 32px;
+		}
+		.app-icon {
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)';
+			opacity: 0;
+		}
+	}
+}
+
+/* Apps management */
+#apps-management {
+	min-height: initial;
+	height: initial;
+	margin: 0;
+	a {
+		svg,
+		span {
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)';
+			opacity: .3;
+		}
+		/* icon opacity and hover effect */
+		&:hover svg,
+		&:focus svg,
+		&.active svg,
+		&:hover span,
+		&:focus span,
+		&.active span {
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+			opacity: 1;
+		}
+	}
+}
+
+#apps {
+	max-height: calc(100vh - 100px);
+	overflow: auto;
+}
+
+/* USER MENU -----------------------------------------------------------------*/
+
+#settings {
+	display: inline-block;
+	color: #ddd;
+	cursor: pointer;
+	.icon-loading-small-dark {
+		display: inline-block;
+		margin-bottom: -3px;
+		margin-right: 6px;
+		background-size: 16px 16px;
+	}
+	flex: 0 0 auto;
+}
+
+/* User menu on the right */
+#expand {
+	display: flex;
+	align-items: center;
+	padding: 7px 30px 6px 10px;
+	cursor: pointer;
+	* {
+		cursor: pointer;
+	}
+	img {
+		-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)';
+		opacity: .7;
+		margin-bottom: -2px;
+	}
+	&:hover,
+	&:focus,
+	&:active {
+		color: #fff;
+		img {
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+			opacity: 1;
+		}
+	}
+	.icon-caret {
+		margin-top: 0;
+	}
+
+	/* Profile picture in header */
+	.avatardiv {
+		margin-right: 8px;
+		cursor: pointer;
+		height: 32px;
+		width: 32px;
+		img {
+			opacity: 1;
+			cursor: pointer;
+		}
+		/* do not show display name when profile picture is present */
+		&.avatardiv-shown + #expandDisplayName {
+			display: none;
+		}
+	}
+}
+
+#expanddiv {
+	position: absolute;
+	right: 13px;
+	top: 45px;
+	z-index: 2000;
+	display: none;
+	background: rgb(255, 255, 255);
+	box-shadow: 0 1px 10px rgba(150, 150, 150, 0.75);
+	border-radius: 3px;
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+	box-sizing: border-box;
+	&:after {
+		/* position of dropdown arrow */
+		right: 15px;
+	}
+	a {
+		display: block;
+		height: 40px;
+		color: #000;
+		padding: 10px 12px 0;
+		-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)';
+		opacity: .5;
+		box-sizing: border-box;
+		img {
+			margin-bottom: -3px;
+			margin-right: 6px;
+		}
+		&:hover,
+		&:focus,
+		&:active,
+		&.active {
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+			opacity: 1;
+		}
+	}
+}
diff --git a/core/css/icons.css b/core/css/icons.scss
index a2869dfac1c..28f6bd9bbb8 100644
--- a/core/css/icons.css
+++ b/core/css/icons.scss
@@ -1,61 +1,55 @@
-[class^="icon-"], [class*=" icon-"] {
+/**
+ * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com>
+ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
+ * @copyright Copyright (c) 2016, Roeland Jago Douma <roeland@famdouma.nl>
+ * @copyright Copyright (c) 2016, Vincent Chan <plus.vincchan@gmail.com>
+ * @copyright Copyright (c) 2015, Thomas Müller <thomas.mueller@tmit.eu>
+ * @copyright Copyright (c) 2015, Hendrik Leppelsack <hendrik@leppelsack.de>
+ * @copyright Copyright (c) 2015, Jan-Christoph Borchardt <hey@jancborchardt.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ */
+
+/* GLOBAL ------------------------------------------------------------------- */
+[class^='icon-'], [class*=' icon-'] {
 	background-repeat: no-repeat;
 	background-position: center;
 	min-width: 16px;
 	min-height: 16px;
 }
 
-
-
-
-/* general assets */
-
 .icon-breadcrumb {
 	background-image: url('../img/breadcrumb.svg?v=1');
 }
 
-.loading,
-.loading-small,
-.icon-loading,
-.icon-loading-dark,
-.icon-loading-small,
-.icon-loading-small-dark {
+/* LOADING ------------------------------------------------------------------ */
+.loading, .loading-small, .icon-loading, .icon-loading-dark, .icon-loading-small, .icon-loading-small-dark {
 	position: relative;
-}
-.loading:after,
-.loading-small:after,
-.icon-loading:after,
-.icon-loading-dark:after,
-.icon-loading-small:after,
-.icon-loading-small-dark:after {
-	z-index: 2;
-	content: "";
-	height: 30px;
-	width: 30px;
-	margin: -16px 0 0 -16px;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	border-radius: 100%;
-	-webkit-animation: rotate .8s infinite linear;
-	animation: rotate .8s infinite linear;
-	-webkit-transform-origin: center;
-	-ms-transform-origin: center;
-	transform-origin: center;
-}
-.loading:after,
-.loading-small:after,
-.icon-loading:after,
-.icon-loading-dark:after,
-.icon-loading-small:after,
-.icon-loading-small-dark:after {
-	border: 2px solid rgba(150, 150, 150, .5);
-	border-top-color: rgb(100, 100, 100);
+	&:after {
+		z-index: 2;
+		content: '';
+		height: 30px;
+		width: 30px;
+		margin: -16px 0 0 -16px;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		border-radius: 100%;
+		-webkit-animation: rotate .8s infinite linear;
+		animation: rotate .8s infinite linear;
+		-webkit-transform-origin: center;
+		-ms-transform-origin: center;
+		transform-origin: center;
+		border: 2px solid rgba(150, 150, 150, 0.5);
+		border-top-color: rgb(100, 100, 100);
+	}
 }
 
 .icon-loading-dark:after,
 .icon-loading-small-dark:after {
-	border: 2px solid rgba(187, 187, 187, .5);
+	border: 2px solid rgba(187, 187, 187, 0.5);
 	border-top-color: #bbb;
 }
 
@@ -67,36 +61,26 @@
 }
 
 /* Css replaced elements don't have ::after nor ::before */
-img.icon-loading, object.icon-loading, video.icon-loading, button.icon-loading, textarea.icon-loading, input.icon-loading, select.icon-loading {
-	background-image: url("../img/loading.gif");
-}
-img.icon-loading-dark, object.icon-loading-dark, video.icon-loading-dark, button.icon-loading-dark, textarea.icon-loading-dark, input.icon-loading-dark, select.icon-loading-dark {
-	background-image: url("../img/loading-dark.gif");
-}
-img.icon-loading-small, object.icon-loading-small, video.icon-loading-small, button.icon-loading-small, textarea.icon-loading-small, input.icon-loading-small, select.icon-loading-small {
-	background-image: url("../img/loading-small.gif");
-}
-img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-small-dark, button.icon-loading-small-dark, textarea.icon-loading-small-dark, input.icon-loading-small-dark, select.icon-loading-small-dark {
-	background-image: url("../img/loading-small-dark.gif");
-}
-
-@-webkit-keyframes rotate {
-	from {
-		-webkit-transform: rotate(0deg);
-		transform: rotate(0deg);
+img, object, video, button, textarea, input, select {
+	.icon-loading {
+		background-image: url('../img/loading.gif');
 	}
-	to {
-		-webkit-transform: rotate(360deg);
-		transform: rotate(360deg);
+	.icon-loading-dark {
+		background-image: url('../img/loading-dark.gif');
+	}
+	.icon-loading-small {
+		background-image: url('../img/loading-small.gif');
+	}
+	.icon-loading-small-dark {
+		background-image: url('../img/loading-small-dark.gif');
 	}
 }
+
 @keyframes rotate {
 	from {
-		-webkit-transform: rotate(0deg);
 		transform: rotate(0deg);
 	}
 	to {
-		-webkit-transform: rotate(360deg);
 		transform: rotate(360deg);
 	}
 }
@@ -105,11 +89,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 	background-size: 32px !important;
 }
 
-
-
-
-/* action icons */
-
+/* ICONS -------------------------------------------------------------------- */
 .icon-add {
 	background-image: url('../img/actions/add.svg?v=1');
 }
@@ -117,12 +97,15 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-audio {
 	background-image: url('../img/actions/audio.svg?v=1');
 }
+
 .icon-audio-white {
 	background-image: url('../img/actions/audio-white.svg?v=2');
 }
+
 .icon-audio-off {
 	background-image: url('../img/actions/audio-off.svg?v=1');
 }
+
 .icon-audio-off-white {
 	background-image: url('../img/actions/audio-off-white.svg?v=1');
 }
@@ -130,6 +113,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-caret {
 	background-image: url('../img/actions/caret.svg?v=1');
 }
+
 .icon-caret-dark {
 	background-image: url('../img/actions/caret-dark.svg?v=1');
 }
@@ -137,9 +121,11 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-checkmark {
 	background-image: url('../img/actions/checkmark.svg?v=1');
 }
+
 .icon-checkmark-white {
 	background-image: url('../img/actions/checkmark-white.svg?v=1');
 }
+
 .icon-checkmark-color {
 	background-image: url('../img/actions/checkmark-color.svg?v=1');
 }
@@ -152,6 +138,10 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 	background-image: url('../img/actions/close.svg?v=1');
 }
 
+.icon-close-white {
+	background-image: url('../img/actions/close-white.svg?v=1');
+}
+
 .icon-comment {
 	background-image: url('../img/actions/comment.svg?v=1');
 }
@@ -159,21 +149,33 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-confirm {
 	background-image: url('../img/actions/confirm.svg?v=2');
 }
+
 .icon-confirm-white {
 	background-image: url('../img/actions/confirm-white.svg?v=2');
 }
 
-.icon-delete,
-.icon-delete.no-permission:hover,
-.icon-delete.no-permission:focus {
+.icon-delete {
 	background-image: url('../img/actions/delete.svg?v=1');
+	&.no-permission {
+		&:hover, &:focus {
+			background-image: url('../img/actions/delete.svg?v=1');
+		}
+	}
+	&:hover, &:focus {
+		background-image: url('../img/actions/delete-hover.svg?v=1');
+	}
 }
-.icon-delete:hover,
-.icon-delete:focus {
-	background-image: url('../img/actions/delete-hover.svg?v=1');
-}
+
 .icon-delete-white {
 	background-image: url('../img/actions/delete-white.svg?v=1');
+	&.no-permission {
+		&:hover, &:focus {
+			background-image: url('../img/actions/delete-white.svg?v=1');
+		}
+	}
+	&:hover, &:focus {
+		background-image: url('../img/actions/delete-hover.svg?v=1');
+	}
 }
 
 .icon-details {
@@ -183,6 +185,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-download {
 	background-image: url('../img/actions/download.svg?v=1');
 }
+
 .icon-download-white {
 	background-image: url('../img/actions/download-white.svg?v=1');
 }
@@ -194,9 +197,11 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-error {
 	background-image: url('../img/actions/error.svg?v=1');
 }
+
 .icon-error-white {
 	background-image: url('../img/actions/error-white.svg?v=1');
 }
+
 .icon-error-color {
 	background-image: url('../img/actions/error-color.svg?v=1');
 }
@@ -208,6 +213,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-fullscreen {
 	background-image: url('../img/actions/fullscreen.svg?v=1');
 }
+
 .icon-fullscreen-white {
 	background-image: url('../img/actions/fullscreen-white.svg?v=2');
 }
@@ -219,6 +225,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-info {
 	background-image: url('../img/actions/info.svg?v=1');
 }
+
 .icon-info-white {
 	background-image: url('../img/actions/info-white.svg?v=1');
 }
@@ -238,6 +245,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-more {
 	background-image: url('../img/actions/more.svg?v=1');
 }
+
 .icon-more-white {
 	background-image: url('../img/actions/more-white.svg?v=1');
 }
@@ -249,6 +257,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-pause {
 	background-image: url('../img/actions/pause.svg?v=1');
 }
+
 .icon-pause-big {
 	background-image: url('../img/actions/pause-big.svg?v=1');
 }
@@ -256,15 +265,19 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-play {
 	background-image: url('../img/actions/play.svg?v=1');
 }
+
 .icon-play-add {
 	background-image: url('../img/actions/play-add.svg?v=1');
 }
+
 .icon-play-big {
 	background-image: url('../img/actions/play-big.svg?v=1');
 }
+
 .icon-play-next {
 	background-image: url('../img/actions/play-next.svg?v=1');
 }
+
 .icon-play-previous {
 	background-image: url('../img/actions/play-previous.svg?v=1');
 }
@@ -280,6 +293,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-search {
 	background-image: url('../img/actions/search.svg?v=1');
 }
+
 .icon-search-white {
 	background-image: url('../img/actions/search-white.svg?v=1');
 }
@@ -291,6 +305,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-share {
 	background-image: url('../img/actions/share.svg?v=1');
 }
+
 .icon-shared {
 	background-image: url('../img/actions/shared.svg?v=1');
 }
@@ -298,26 +313,32 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-sound {
 	background-image: url('../img/actions/sound.svg?v=1');
 }
+
 .icon-sound-off {
 	background-image: url('../img/actions/sound-off.svg?v=1');
 }
 
-.icon-favorite  {
+.icon-favorite {
 	background-image: url('../img/actions/star-dark.svg?v=1');
 }
 
-.icon-star,
-.icon-starred:hover,
-.icon-starred:focus {
+.icon-star {
 	background-image: url('../img/actions/star.svg?v=1');
 }
 
-.icon-starred,
-.icon-star:hover,
-.icon-star:focus {
+.icon-starred {
+	&:hover, &:focus {
+		background-image: url('../img/actions/star.svg?v=1');
+	}
 	background-image: url('../img/actions/starred.svg?v=1');
 }
 
+.icon-star {
+	&:hover, &:focus {
+		background-image: url('../img/actions/starred.svg?v=1');
+	}
+}
+
 .icon-tag {
 	background-image: url('../img/actions/tag.svg?v=1');
 }
@@ -329,9 +350,11 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-triangle-e {
 	background-image: url('../img/actions/triangle-e.svg?v=1');
 }
+
 .icon-triangle-n {
 	background-image: url('../img/actions/triangle-n.svg?v=1');
 }
+
 .icon-triangle-s {
 	background-image: url('../img/actions/triangle-s.svg?v=1');
 }
@@ -339,6 +362,7 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-upload {
 	background-image: url('../img/actions/upload.svg?v=1');
 }
+
 .icon-upload-white {
 	background-image: url('../img/actions/upload-white.svg?v=1');
 }
@@ -350,12 +374,15 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-video {
 	background-image: url('../img/actions/video.svg?v=1');
 }
+
 .icon-video-white {
 	background-image: url('../img/actions/video-white.svg?v=2');
 }
+
 .icon-video-off {
 	background-image: url('../img/actions/video-off.svg?v=1');
 }
+
 .icon-video-off-white {
 	background-image: url('../img/actions/video-off-white.svg?v=1');
 }
@@ -363,27 +390,28 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-view-close {
 	background-image: url('../img/actions/view-close.svg?v=1');
 }
+
 .icon-view-download {
 	background-image: url('../img/actions/view-download.svg?v=1');
 }
+
 .icon-view-next {
 	background-image: url('../img/actions/view-next.svg?v=1');
 }
+
 .icon-view-pause {
 	background-image: url('../img/actions/view-pause.svg?v=1');
 }
+
 .icon-view-play {
 	background-image: url('../img/actions/view-play.svg?v=1');
 }
+
 .icon-view-previous {
 	background-image: url('../img/actions/view-previous.svg?v=1');
 }
 
-
-
-
-/* places icons */
-
+/* PLACES ------------------------------------------------------------------- */
 .icon-calendar-dark {
 	background-image: url('../img/places/calendar-dark.svg?v=1');
 }
@@ -395,20 +423,21 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
 .icon-files {
 	background-image: url('../img/places/files.svg?v=1');
 }
+
 .icon-files-dark {
 	background-image: url('../img/places/files-dark.svg?v=1');
 }
-.icon-file,
-.icon-filetype-text {
+
+.icon-file, .icon-filetype-text {
 	background-image: url('../img/filetypes/text.svg?v=1');
 }
-.icon-folder,
-.icon-filetype-folder {
+
+.icon-folder, .icon-filetype-folder {
 	background-image: url('../img/filetypes/folder.svg?v=1');
 }
 
 .icon-filetype-folder-drag-accept {
-    background-image: url('../img/filetypes/folder-drag-accept.svg?v=1')!important;
+	background-image: url('../img/filetypes/folder-drag-accept.svg?v=1') !important;
 }
 
 .icon-home {
diff --git a/core/css/inputs.css b/core/css/inputs.css
deleted file mode 100644
index 4ca6c823cc9..00000000000
--- a/core/css/inputs.css
+++ /dev/null
@@ -1,472 +0,0 @@
-/* INPUTS */
-
-/* specifically override browser styles */
-input, textarea, select, button {
-	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
-}
-
-.select2-container-multi .select2-choices .select2-search-field input,
-.select2-search input,
-.ui-widget {
-	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif !important;
-}
-
-input[type="text"],
-input[type="password"],
-input[type="search"],
-input[type="number"],
-input[type="email"],
-input[type="tel"],
-input[type="url"],
-input[type="time"],
-input[type="date"],
-textarea,
-select,
-button, .button,
-input[type="submit"],
-input[type="button"],
-#quota,
-.pager li a {
-	width: 130px;
-	margin: 3px 3px 3px 0;
-	padding: 7px 6px 5px;
-	font-size: 13px;
-	background-color: #fff;
-	color: #333;
-	border: 1px solid #ddd;
-	outline: none;
-	border-radius: 3px;
-}
-input[type="hidden"] {
-	height: 0;
-	width: 0;
-}
-input[type="text"],
-input[type="password"],
-input[type="search"],
-input[type="number"],
-input[type="email"],
-input[type="tel"],
-input[type="url"],
-input[type="time"],
-textarea {
-	background: #fff;
-	color: #555;
-	cursor: text;
-	font-family: inherit; /* use default ownCloud font instead of default textarea monospace */
-}
-input[type="text"],
-input[type="password"],
-input[type="search"],
-input[type="number"],
-input[type="email"],
-input[type="tel"],
-input[type="url"],
-input[type="time"] {
-	-webkit-appearance:textfield;
-	-moz-appearance:textfield;
-	box-sizing:content-box;
-}
-input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,
-input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active,
-input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active,
-input[type="search"]:hover, input[type="search"]:focus, input[type="search"]:active,
-input[type="email"]:hover, input[type="email"]:focus, input[type="email"]:active,
-input[type="tel"]:hover, input[type="tel"]:focus, input[type="tel"]:active,
-input[type="url"]:hover, input[type="url"]:focus, input[type="url"]:active,
-input[type="time"]:hover, input[type="time"]:focus, input[type="time"]:active,
-textarea:hover, textarea:focus, textarea:active {
-	color: #333;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	opacity: 1;
-}
-
-input[type="checkbox"].checkbox {
-	position: absolute;
-	left:-10000px;
-	top: auto;
-	width: 1px;
-	height: 1px;
-	overflow: hidden;
-}
-
-input[type="checkbox"].checkbox + label:before {
-	content: "";
-	display: inline-block;
-
-	height: 20px;
-	width: 20px;
-	vertical-align: middle;
-
-	background: url('../img/actions/checkbox.svg') left top no-repeat;
-}
-
-input[type="checkbox"].checkbox:disabled +label:before { opacity: .6; }
-
-input[type="checkbox"].checkbox.u-left +label:before { float: left; }
-input[type="checkbox"].checkbox.u-hidden + label:before { display: none; }
-
-input[type="checkbox"].checkbox:checked + label:before {
-	background-image: url('../img/actions/checkbox-checked.svg');
-}
-
-input[type="checkbox"].checkbox:indeterminate + label:before {
-	background-image: url('../img/actions/checkbox-mixed.svg');
-}
-
-input[type="checkbox"].checkbox:disabled + label:before {
-	background-image: url('../img/actions/checkbox-disabled.svg');
-}
-
-input[type="checkbox"].checkbox:checked:disabled + label:before {
-	background-image: url('../img/actions/checkbox-checked-disabled.svg');
-}
-
-input[type="checkbox"].checkbox:indeterminate:disabled + label:before {
-	background-image: url('../img/actions/checkbox-mixed-disabled.svg');
-}
-
-input[type="checkbox"].checkbox--white + label:before {
-	background-image: url('../img/actions/checkbox-white.svg');
-}
-
-input[type="checkbox"].checkbox--white:checked + label:before {
-	background-image: url('../img/actions/checkbox-checked-white.svg');
-}
-
-input[type="checkbox"].checkbox--white:indeterminate + label:before {
-	background-image: url('../img/actions/checkbox-mixed-white.svg');
-}
-
-input[type="checkbox"].checkbox--white:disabled + label:before {
-	background-image: url('../img/actions/checkbox-disabled-white.svg');
-}
-
-input[type="checkbox"].checkbox--white:checked:disabled + label:before {
-	background-image: url('../img/actions/checkbox-checked-disabled.svg');
-}
-
-input[type="checkbox"].checkbox--white:indeterminate:disabled + label:before {
-	background-image: url('../img/actions/checkbox-mixed-disabled.svg');
-}
-
-input[type="checkbox"].checkbox:hover+label:before, input[type="checkbox"]:focus+label:before {
-	color:#111 !important;
-}
-
-input[type="radio"].radio {
-	position: absolute;
-	left:-10000px;
-	top: auto;
-	width: 1px;
-	height: 1px;
-	overflow: hidden;
-}
-
-input[type="radio"].radio + label:before {
-	content: "";
-	display: inline-block;
-
-	height: 20px;
-	width: 20px;
-	vertical-align: middle;
-
-	background: url('../img/actions/radio.svg') left top no-repeat;
-}
-
-input[type="radio"].radio:checked + label:before {
-	background-image: url('../img/actions/radio-checked.svg');
-}
-
-input[type="radio"].radio:disabled + label:before {
-	background-image: url('../img/actions/radio-disabled.svg');
-}
-
-input[type="radio"].radio:checked:disabled + label:before {
-	background-image: url('../img/actions/radio-checked-disabled.svg');
-}
-
-input[type="radio"].radio--white + label:before {
-	background-image: url('../img/actions/radio-white.svg');
-}
-
-input[type="radio"].radio--white:checked + label:before {
-	background-image: url('../img/actions/radio-checked-white.svg');
-}
-
-input[type="radio"].radio--white:disabled + label:before {
-	background-image: url('../img/actions/radio-disabled.svg');
-}
-
-input[type="radio"].radio--white:checked:disabled + label:before {
-	background-image: url('../img/actions/radio-checked-disabled.svg');
-}
-
-input[type="time"] {
-	width: initial;
-	height: 31px;
-	box-sizing: border-box;
-}
-
-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;
-}
-
-
-/* select2 adjustments */
-#select2-drop {
-	margin-top: -2px;
-}
-#select2-drop.select2-drop-active {
-	border-color: #ddd;
-}
-#select2-drop .avatar {
-	display: inline-block;
-	margin-right: 8px;
-	vertical-align: middle;
-}
-#select2-drop .avatar img,
-.select2-chosen .avatar img,
-#select2-drop .avatar,
-.select2-chosen .avatar {
-	cursor: pointer;
-}
-#select2-drop .select2-search input {
-	width: calc(100% - 14px);
-	min-height: auto;
-	background: url('../img/actions/search.svg') no-repeat right center !important;
-	background-origin: content-box !important;
-}
-#select2-drop .select2-results {
-	max-height: 250px;
-	margin: 0;
-	padding: 0;
-}
-#select2-drop .select2-results .select2-result-label {
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-#select2-drop .select2-results .select2-result-label span {
-	cursor: pointer;
-}
-#select2-drop .select2-results .select2-result,
-#select2-drop .select2-results .select2-no-results,
-#select2-drop .select2-results .select2-searching {
-	position: relative;
-	display: list-item;
-	padding: 12px;
-	background-color: #fff;
-	cursor: pointer;
-	color: #222;
-}
-#select2-drop .select2-results .select2-result.select2-selected {
-	background-color: #f8f8f8;
-}
-#select2-drop .select2-results .select2-result.select2-highlighted {
-	background-color: #f8f8f8;
-	color: #000;
-}
-
-.select2-container-multi .select2-choices,
-.select2-container-multi.select2-container-active .select2-choices,
-.select2-container .select2-choice {
-	box-shadow: none;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	background: #fff;
-	color: #555;
-	box-sizing: content-box;
-	border-radius: 3px;
-	border: 1px solid #ddd;
-	margin: 0;
-	padding: 2px 0;
-	min-height: auto;
-}
-.select2-container-multi .select2-choices .select2-search-choice,
-.select2-container-multi.select2-container-active .select2-choices .select2-search-choice,
-.select2-container .select2-choice .select2-search-choice {
-	line-height: 20px;
-	padding-left: 5px;
-	background-image: none;
-	background-color: #f8f8f8;
-	border-color: #f8f8f8;
-}
-.select2-container-multi .select2-choices .select2-search-choice.select2-search-choice-focus, .select2-container-multi .select2-choices .select2-search-choice:hover,
-.select2-container-multi.select2-container-active .select2-choices .select2-search-choice.select2-search-choice-focus,
-.select2-container-multi.select2-container-active .select2-choices .select2-search-choice:hover,
-.select2-container .select2-choice .select2-search-choice.select2-search-choice-focus,
-.select2-container .select2-choice .select2-search-choice:hover {
-	background-color: #f0f0f0;
-	border-color: #f0f0f0;
-}
-.select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close,
-.select2-container-multi.select2-container-active .select2-choices .select2-search-choice .select2-search-choice-close,
-.select2-container .select2-choice .select2-search-choice .select2-search-choice-close {
-	display: none;
-}
-.select2-container-multi .select2-choices .select2-search-field input,
-.select2-container-multi.select2-container-active .select2-choices .select2-search-field input,
-.select2-container .select2-choice .select2-search-field input {
-	line-height: 20px;
-}
-
-.select2-container {
-	margin: 3px 3px 3px 0;
-}
-.select2-container.select2-container-multi .select2-choices {
-	display: flex;
-	flex-wrap: wrap;
-}
-.select2-container.select2-container-multi .select2-choices li {
-	float: none;
-}
-.select2-container .select2-choice {
-	padding-left: 38px;
-}
-.select2-container .select2-choice .select2-arrow {
-	background: none;
-	border-radius: 0;
-	border: none;
-}
-.select2-container .select2-choice .select2-arrow b {
-	background: url('../img/actions/triangle-s.svg') no-repeat center !important;
-	opacity: .5;
-}
-.select2-container .select2-choice:hover .select2-arrow b,
-.select2-container .select2-choice:focus .select2-arrow b,
-.select2-container .select2-choice:active .select2-arrow b {
-	opacity: .7;
-}
-
-
-/* jQuery UI fixes */
-.ui-menu {
-	padding: 0;
-}
-.ui-menu .ui-menu-item a.ui-state-focus, .ui-menu .ui-menu-item a.ui-state-active {
-    font-weight: inherit;
-    margin: 0;
-}
-.ui-widget-content {
-	background: #fff;
-	border-top: none;
-}
-.ui-corner-all {
-	border-radius: 0;
-	border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
-}
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
-    border: none;
-    background: #f8f8f8;
-}
-
-
-
-/* correctly align images inside of buttons */
-input img, button img, .button img {
-	vertical-align: text-bottom;
-}
-
-input[type="submit"].enabled {
-	background-color: #66f866;
-	border: 1px solid #5e5;
-}
-
-.input-button-inline {
-	position: absolute !important;
-	right: 0;
-	background-color: transparent !important;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
-	opacity: .3;
-}
-
-
-/* BUTTONS */
-input[type="submit"], input[type="button"],
-button, .button,
-#quota, select, .pager li a {
-	width: auto;
-	min-width: 25px;
-	padding: 5px;
-	background-color: rgba(240,240,240,.9);
-	font-weight: 600;
-	color: #555;
-	border: 1px solid rgba(240,240,240,.9);
-	cursor: pointer;
-}
-select, .button.multiselect {
-	font-weight: 400;
-}
-input[type="submit"]:hover, input[type="submit"]:focus,
-input[type="button"]:hover, input[type="button"]:focus,
-button:hover, button:focus,
-.button:hover, .button:focus,
-.button a:focus,
-select:hover, select:focus, select:active {
-	background-color: rgba(255, 255, 255, .95);
-	color: #111;
-}
-input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; }
-#header .button {
-	border: none;
-	box-shadow: none;
-}
-
-/* disabled input fields and buttons */
-input:disabled, input:disabled:hover, input:disabled:focus,
-button:disabled, button:disabled:hover, button:disabled:focus,
-.button:disabled, .button:disabled:hover, .button:disabled:focus,
-a.disabled, a.disabled:hover, a.disabled:focus,
-textarea:disabled {
-	background-color: rgba(230,230,230,.9);
-	color: #999;
-	cursor: default;
-}
-input:disabled+label, input:disabled:hover+label, input:disabled:focus+label {
-	color: #999 !important;
-	cursor: default;
-}
-
-/* Primary action button, use sparingly */
-.primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary {
-	border: 1px solid #0082c9;
-	background-color: #00a2e9;
-	color: #fff;
-}
-.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,
-.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {
-	background-color: #0092d9;
-	color: #fff;
-}
-.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active,
-.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,
-.primary:disabled:hover, input[type="submit"].primary:disabled:hover, input[type="button"].primary:disabled:hover, button.primary:disabled:hover, .button.primary:disabled:hover,
-.primary:disabled:focus, input[type="submit"].primary:disabled:focus, input[type="button"].primary:disabled:focus, button.primary:disabled:focus, .button.primary:disabled:focus {
-	background-color: #00a2e9;
-	color: #bbb;
-}
-
-@keyframes shake {
-	0% { transform: translate(-5px, 0); }
-	20% { transform: translate(5px, 0); }
-	40% { transform: translate(-5px, 0); }
-	60% { transform: translate(5px, 0); }
-	80% { transform: translate(-5px, 0); }
-	100% { transform: translate(5px, 0); }
-}
-.shake {
-	animation-name: shake;
-	animation-duration: .3s;
-	animation-timing-function: ease-out;
-}
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
new file mode 100644
index 00000000000..f7b9cdb723c
--- /dev/null
+++ b/core/css/inputs.scss
@@ -0,0 +1,512 @@
+/**
+ * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2016, Morris Jobke <hey@morrisjobke.de>
+ * @copyright Copyright (c) 2016, Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com>
+ * @copyright Copyright (c) 2016, Julius Haertl <jus@bitgrid.net>
+ * @copyright Copyright (c) 2016, jowi <sjw@gmx.ch>
+ * @copyright Copyright (c) 2015, Joas Schilling <nickvergessen@owncloud.com>
+ * @copyright Copyright (c) 2015, Hendrik Leppelsack <hendrik@leppelsack.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ */
+
+ /* Specifically override browser styles */
+input, textarea, select, button {
+	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+}
+.select2-container-multi .select2-choices .select2-search-field input, .select2-search input, .ui-widget {
+	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif !important;
+}
+
+/* Simple selector to allow easy overriding */
+select,
+button,
+input,
+textarea {
+	width: 130px;
+	min-height: 32px;
+	box-sizing: border-box;
+}
+
+/* Default global values */
+select,
+button, .button,
+input:not([type='range']),
+textarea,
+#quota,	.pager li a {
+	margin: 3px 3px 3px 0;
+	padding: 7px 6px;
+	font-size: 13px;
+	background-color: #fff;
+	color: #333;
+	border: 1px solid #ddd;
+	outline: none;
+	border-radius: 3px;
+	&:not(:disabled):not(.primary) {
+		/* no border on quota */
+		&:not(#quota):hover,
+		&:focus,
+		&.active {
+		/* active class used for multiselect */
+			border-color: #0082c9;
+			outline: none;
+		}
+		&:active {
+			outline: none;
+			background-color: #fff;
+		}
+	}
+	&:disabled {
+		background-color: #eee;
+		color: #999;
+		cursor: default;
+		opacity: 0.5;
+	}
+	/* Primary action button, use sparingly */
+	&.primary {
+		border: 1px solid #0082c9;
+		background-color: #00a2e9;
+		color: #fff;
+		cursor: pointer;
+		&:not(:disabled) {
+			&:hover,
+			&:focus {
+				background-color: #0092d9;
+			}
+			&:active {
+				background-color: #00a2e9;
+			}
+		}
+		&:disabled {
+			background-color: #00a2e9;
+			color: #bbb;
+		}
+	}
+}
+
+/* Specific override */
+input {
+	&:not([type='radio']):not([type='checkbox']):not([type='range']):not([type='submit']):not([type='button']):not([type='reset']):not([type='color']):not([type='file']):not([type='image']) {
+		-webkit-appearance: textfield;
+		-moz-appearance: textfield;
+	}
+	&[type='radio'],
+	&[type='checkbox'],
+	&[type='file'],
+	&[type='image'] {
+		height: auto;
+		width: auto;
+	}
+	/* Color input doesn't respect the initial height
+ so we need to set a custom one */
+	&[type='color'] {
+		margin: 3px;
+		padding: 0 2px;
+		min-height: 30px;
+		width: 40px;
+		cursor: pointer;
+	}
+	&[type='hidden'] {
+		height: 0;
+		width: 0;
+	}
+	&[type='time'] {
+		width: initial;
+	}
+}
+
+/* 'Click' inputs */
+select,
+button, .button,
+input[type='button'],
+input[type='submit'],
+input[type='reset'] {
+	padding: 6px 12px;
+	width: auto;
+	min-height: 34px;
+	cursor: pointer;
+	box-sizing: border-box;
+	background-color: #fafafa;
+}
+
+/* Buttons */
+button, .button,
+input[type='button'],
+input[type='submit'],
+input[type='reset'] {
+	font-weight: bold;
+	/* Get rid of the ugly firefox dotted line */
+	&::-moz-focus-inner {
+		border: 0;
+	}
+}
+button, .button {
+	> span {
+		/* icon position inside buttons */
+		&[class^='icon-'],
+		&[class*=' icon-'] {
+			display: inline-block;
+			vertical-align: text-bottom;
+			opacity: 0.5;
+		}
+	}
+}
+
+textarea {
+	color: #555;
+	cursor: text;
+	font-family: inherit;
+	height: auto;
+	&:not(:disabled) {
+		&:active,
+		&:hover,
+		&:focus {
+			border-color: #ddd !important;
+			background-color: #fff !important;
+		}
+	}
+}
+
+/* Override the ugly select arrow */
+select {
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	appearance: none;
+	background: url('../img/actions/triangle-s.svg') no-repeat right 4px center;
+	background-color: inherit;
+	outline: 0;
+	padding-right: 24px !important;
+}
+
+/* Various Fixes */
+button img,
+.button img {
+	cursor: pointer;
+}
+#quota {
+	color: #555;
+}
+select,
+.button.multiselect {
+	font-weight: 400;
+}
+
+/* Radio & Checkboxes */
+input {
+	&[type='checkbox'],
+	&[type='radio'] {
+		&.radio,
+		&.checkbox {
+			position: absolute;
+			left: -10000px;
+			top: auto;
+			width: 1px;
+			height: 1px;
+			overflow: hidden;
+			+ label {
+				user-select: none;
+			}
+			&:disabled + label,
+			&:disabled + label:before {
+				cursor: default;
+			}
+			+ label:before {
+				content: '';
+				display: inline-block;
+				height: 12px;
+				width: 12px;
+				vertical-align: middle;
+				border-radius: 50%;
+				margin: 3px;
+				margin-top: 1px;
+				border: 1px solid #888;
+			}
+			&:not(:disabled):not(:checked) + label:hover:before,
+			&:focus + label:before {
+				border-color: #0082c9;
+			}
+			&:checked + label:before,
+			&.checkbox:indeterminate + label:before {
+			/* ^ :indeterminate have a strange behavior on radio,
+			so we respecified the checkbox class again to be safe */
+				box-shadow: inset 0px 0px 0px 2px #fff;
+				background-color: #0082c9;
+				border-color: #0082c9
+			}
+			&:disabled + label:before {
+				background-color: #ccc !important; /* override other status */
+			}
+			&:checked:disabled + label:before {
+				box-shadow: inset 0px 0px 0px 2px #fff;
+				border-color: #aaa;
+				background-color: #bbb;
+			}
+		}
+		&.checkbox {
+			+ label:before {
+				border-radius: 1px;
+				height: 10px;
+				width: 10px;
+				box-shadow: none !important;
+				background-position: center;
+			}
+			&:checked + label:before {
+				background-image: url('../img/actions/checkbox-mark.svg');
+			}
+			&:indeterminate + label:before {
+				background-image: url('../img/actions/checkbox-mixed.svg');
+			}
+			&:indeterminate:disabled + label:before {
+				border-color: #888;
+			}
+		}
+		&.radio--white,
+		&.checkbox--white {
+			+ label:before {
+				border-color: #aaa;
+			}
+			&:not(:disabled):not(:checked) + label:hover:before,
+			&:focus + label:before {
+				border-color: #fff;
+			}
+			&:checked + label:before,
+			&.checkbox:indeterminate + label:before {
+			/* ^ :indeterminate have a strange behavior on radio,
+			so we respecified the checkbox class again to be safe */
+				box-shadow: inset 0px 0px 0px 2px #000;
+				background-color: #eee;
+				border-color: #eee
+			}
+			&:disabled + label:before {
+				background-color: #666 !important; /* override other status */
+				border-color: #999 !important; /* override other status */
+			}
+			&:checked:disabled + label:before {
+				box-shadow: inset 0px 0px 0px 2px #000;
+				border-color: #666;
+				background-color: #222;
+			}
+		}
+		&.checkbox--white {
+			&:checked + label:before {
+				background-image: url('../img/actions/checkbox-mark-white.svg');
+			}
+			&:indeterminate + label:before {
+				background-image: url('../img/actions/checkbox-mixed-white.svg');
+			}
+			&:checked:disabled + label:after {
+				border-color: #aaa;
+			}
+			&:indeterminate:disabled + label:after {
+				background-color: #aaa;
+			}
+		}
+	}
+}
+
+/* Select2 overriding. Merged to core with vendor stylesheet */
+.select2-drop {
+	margin-top: -2px;
+	&.select2-drop-active {
+		border-color: #ddd;
+	}
+	.avatar {
+		display: inline-block;
+		margin-right: 8px;
+		vertical-align: middle;
+		img {
+			cursor: pointer;
+		}
+	}
+	.select2-search input {
+		min-height: auto;
+		background: url('../img/actions/search.svg') no-repeat right center !important;
+		background-origin: content-box !important;
+	}
+	.select2-results {
+		max-height: 250px;
+		margin: 0;
+		padding: 0;
+		.select2-result-label {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			span {
+				cursor: pointer;
+			}
+		}
+		.select2-result,
+		.select2-no-results,
+		.select2-searching {
+			position: relative;
+			display: list-item;
+			padding: 12px;
+			background-color: #fff;
+			cursor: pointer;
+			color: #222;
+		}
+		.select2-result {
+			&.select2-selected {
+				background-color: #f8f8f8;
+			}
+			&.select2-highlighted {
+				background-color: #f8f8f8;
+				color: #000;
+			}
+		}
+	}
+}
+.select2-chosen,
+#select2-drop {
+	.avatar,
+	.avatar img {
+		cursor: pointer;
+	}
+}
+.select2-container-multi {
+	.select2-choices,
+	&.select2-container-active .select2-choices {
+		box-shadow: none;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		background: #fff;
+		color: #555;
+		box-sizing: content-box;
+		border-radius: 3px;
+		border: 1px solid #ddd;
+		margin: 0;
+		padding: 2px 0;
+		min-height: auto;
+		.select2-search-choice {
+			line-height: 20px;
+			padding-left: 5px;
+			&.select2-search-choice-focus,
+			&:hover,
+			&:active,
+			& {
+				background-image: none;
+				background-color: #fff;
+				color: #333;
+				border: 1px solid #ddd;
+			}
+			.select2-search-choice-close {
+				display: none;
+			}
+		}
+		.select2-search-field input {
+			line-height: 20px;
+		}
+	}
+}
+.select2-container {
+	margin: 3px 3px 3px 0;
+	&.select2-container-multi .select2-choices {
+		display: flex;
+		flex-wrap: wrap;
+		li {
+			float: none;
+		}
+	}
+	.select2-choice {
+		box-shadow: none;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		background: #fff;
+		color: #555;
+		box-sizing: content-box;
+		border-radius: 3px;
+		border: 1px solid #ddd;
+		margin: 0;
+		padding: 2px 0;
+		padding-left: 6px;
+		min-height: auto;
+		.select2-search-choice {
+			line-height: 20px;
+			padding-left: 5px;
+			background-image: none;
+			background-color: #f8f8f8;
+			border-color: #f8f8f8;
+			.select2-search-choice-close {
+				display: none;
+			}
+			&.select2-search-choice-focus,
+			&:hover {
+				background-color: #f0f0f0;
+				border-color: #f0f0f0;
+			}
+		}
+		.select2-arrow {
+			background: none;
+			border-radius: 0;
+			border: none;
+			b {
+				background: url('../img/actions/triangle-s.svg') no-repeat center !important;
+				opacity: .5;
+			}
+		}
+		&:hover .select2-arrow b,
+		&:focus .select2-arrow b,
+		&:active .select2-arrow b {
+			opacity: .7;
+		}
+		.select2-search-field input {
+			line-height: 20px;
+		}
+	}
+}
+
+/* Select menus - TODO: move to jquery-ui-fixes.css
+----------------------------------*/
+.ui-menu {
+	padding: 0;
+	.ui-menu-item a {
+		&.ui-state-focus, &.ui-state-active {
+			font-weight: inherit;
+			margin: 0;
+		}
+	}
+}
+
+.ui-widget-content {
+	background: #fff;
+	border-top: none;
+}
+
+.ui-corner-all {
+	border-radius: 0;
+	border-bottom-left-radius: 3px;
+	border-bottom-right-radius: 3px;
+}
+
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus {
+	border: none;
+	background: #f8f8f8;
+}
+
+/* Animation */
+@keyframes shake {
+	10%,
+	90% {
+		transform: translate(-1px);
+	}
+	20%,
+	80% {
+		transform: translate(2px);
+	}
+	30%,
+	50%,
+	70% {
+		transform: translate(-4px);
+	}
+	40%,
+	60% {
+		transform: translate(4px);
+	}
+}
+.shake {
+	animation-name: shake;
+	animation-duration: .7s;
+	animation-timing-function: ease-out;
+}
diff --git a/core/css/multiselect.css b/core/css/multiselect.css
deleted file mode 100644
index 8bcbd0e563d..00000000000
--- a/core/css/multiselect.css
+++ /dev/null
@@ -1,113 +0,0 @@
-/* Copyright (c) 2011, 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. */
-
-ul.multiselectoptions {
-	background-color: #fff;
-	border: 1px solid #ddd;
-	border-top: none;
-	box-shadow: 0 1px 1px #ddd;
-	padding-top: 8px;
-	position: absolute;
-	max-height:  20em;
-	overflow-y:  auto;
-	z-index: 49;
-}
-
-ul.multiselectoptions.down {
-	border-bottom-left-radius: 8px;
-	border-bottom-right-radius: 8px;
-	width: 100%; /* do not cut off group names */
-	-webkit-box-shadow: 0px 0px 20px rgba(29,45,68,.4);
-	-moz-box-shadow: 0px 0px 20px rgba(29,45,68,.4);
-	box-shadow: 0px 0px 20px rgba(29,45,68,.4);
-}
-
-ul.multiselectoptions.up {
-	border-top-left-radius: 8px;
-	border-top-right-radius: 8px;
-}
-
-ul.multiselectoptions>li {
-	overflow: hidden;
-	white-space: nowrap;
-	margin-left: 7px;
-}
-ul.multiselectoptions > li input[type='checkbox']+label {
-	font-weight: normal;
-	display: inline-block;
-	width: 100%;
-	padding: 5px 27px;
-	margin-left: -27px; /* to have area around checkbox clickable as well */
-	text-overflow: ellipsis;
-	overflow: hidden;
-}
-ul.multiselectoptions > li input[type='checkbox']:checked+label {
-	font-weight: bold;
-}
-
-div.multiselect, select.multiselect {
-	display: inline-block;
-	max-width: 200px;
-	min-width: 150px !important;
-	padding-right: 10px;
-	min-height: 20px;
-	position: relative;
-	vertical-align: bottom;
-}
-
-/* To make a select look like a multiselect until it's initialized */
-select.multiselect {
-	height: 30px;
-	min-width: 113px;
-}
-
-div.multiselect.active {
-	background-color: #fff;
-	position: relative;
-	z-index: 50;
-}
-
-div.multiselect.up {
-	border-top: 0 none;
-	border-top-left-radius: 0;
-	border-top-right-radius: 0;
-}
-
-div.multiselect.down {
-	border-bottom: none;
-	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 0;
-}
-
-div.multiselect>span:first-child {
-	float: left;
-	margin-right: 32px;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	width: 90%;
-	white-space: nowrap;
-}
-
-div.multiselect>span:last-child {
-	position: absolute;
-	right: 8px;
-	top: 8px;
-}
-
-ul.multiselectoptions input.new {
-	padding-bottom: 3px;
-	padding-top: 3px;
-	margin: 0;
-}
-
-ul.multiselectoptions > li.creator {
-	padding: 10px;
-	margin: 0;
-	font-weight: bold;
-}
-ul.multiselectoptions > li.creator > input {
-	width: 95% !important; /* do not constrain size of text input */
-	padding: 5px;
-	margin: -5px;
-}
diff --git a/core/css/multiselect.scss b/core/css/multiselect.scss
new file mode 100644
index 00000000000..4b5d9cb6cf3
--- /dev/null
+++ b/core/css/multiselect.scss
@@ -0,0 +1,128 @@
+/**
+ * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2016, Julius Haertl <jus@bitgrid.net>
+ * @copyright Copyright (c) 2016, Sergio Bertolín <sbertolin@solidgear.es>
+ * @copyright Copyright (c) 2015, Hendrik Leppelsack <hendrik@leppelsack.de>
+ * @copyright Copyright (c) 2014, Vincent Petry <pvince81@owncloud.com>
+ * @copyright Copyright (c) 2013, Vincent Petry <pvince81@owncloud.com>
+ * @copyright Copyright (c) 2013, raghunayyar <me@iraghu.com>
+ * @copyright Copyright (c) 2013, Victor Dubiniuk <victor.dubiniuk@gmail.com>
+ * @copyright Copyright (c) 2013, kondou <kondou@ts.unde.re>
+ * @copyright Copyright (c) 2012, Thomas Tanghus <thomas@tanghus.net>
+ * @copyright Copyright (c) 2012, Lukas Reschke <lukas@statuscode.ch>
+ * @copyright Copyright (c) 2012, Jan-Christoph Borchardt <hey@jancborchardt.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ */
+
+ul.multiselectoptions {
+	background-color: #fff;
+	border: 1px solid #ddd;
+	border-top: none;
+	box-shadow: 0 1px 1px #ddd;
+	padding-top: 8px;
+	position: absolute;
+	max-height: 20em;
+	overflow-y: auto;
+	z-index: 49;
+	&.down {
+		border-bottom-left-radius: 8px;
+		border-bottom-right-radius: 8px;
+		width: 100%;
+		/* do not cut off group names */
+		-webkit-box-shadow: 0px 0px 20px rgba(29, 45, 68, 0.4);
+		-moz-box-shadow: 0px 0px 20px rgba(29, 45, 68, 0.4);
+		box-shadow: 0px 0px 20px rgba(29, 45, 68, 0.4);
+	}
+	&.up {
+		border-top-left-radius: 8px;
+		border-top-right-radius: 8px;
+	}
+	> li {
+		overflow: hidden;
+		white-space: nowrap;
+		margin-left: 7px;
+		input[type='checkbox'] {
+			+ label {
+				font-weight: normal;
+				display: inline-block;
+				width: 100%;
+				padding: 5px 27px;
+				margin-left: -27px;
+				/* to have area around checkbox clickable as well */
+				text-overflow: ellipsis;
+				overflow: hidden;
+			}
+			&:checked + label {
+				font-weight: bold;
+			}
+		}
+	}
+	input.new {
+		padding-bottom: 3px;
+		padding-top: 3px;
+		margin: 0;
+	}
+	> li.creator {
+		padding: 10px;
+		margin: 0;
+		font-weight: bold;
+		> input {
+			width: 95% !important;
+			/* do not constrain size of text input */
+			padding: 5px;
+			margin: -5px;
+		}
+	}
+}
+
+div.multiselect,
+select.multiselect {
+	display: inline-block;
+	max-width: 200px;
+	min-width: 150px !important;
+	padding-right: 10px;
+	min-height: 20px;
+	position: relative;
+	vertical-align: bottom;
+}
+
+select.multiselect {
+	height: 30px;
+	min-width: 113px;
+}
+
+/* To make a select look like a multiselect until it's initialized */
+div.multiselect {
+	&.active {
+		background-color: #fff;
+		position: relative;
+		z-index: 50;
+	}
+	&.up {
+		border-top: 0 none;
+		border-top-left-radius: 0;
+		border-top-right-radius: 0;
+	}
+	&.down {
+		border-bottom: none;
+		border-bottom-left-radius: 0;
+		border-bottom-right-radius: 0;
+	}
+	> span {
+		&:first-child {
+			float: left;
+			margin-right: 32px;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			width: 90%;
+			white-space: nowrap;
+		}
+		&:last-child {
+			position: absolute;
+			right: 8px;
+			top: 8px;
+		}
+	}
+}
diff --git a/core/css/share.css b/core/css/share.css
deleted file mode 100644
index eba22cf743e..00000000000
--- a/core/css/share.css
+++ /dev/null
@@ -1,199 +0,0 @@
-/* Copyright (c) 2011, 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. */
-
-#dropdown {
-	background: #eee;
-	border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
-	box-shadow: 0 2px 3px rgba(50, 50, 50, .4);
-	display: block;
-	margin-right: 0;
-	position: absolute;
-	right: 0;
-	width: 420px;
-	z-index: 500;
-	padding: 16px;
-}
-
-@media only screen and (min-width: 768px) and (max-width: 990px) {
-	#dropdown {
-		/* this limits the dropdown to float below the sidebar for mid narrow screens */
-		left: 20px;
-	}
-}
-
-.shareTabView .unshare.icon-loading-small {
-	margin-top: 1px;
-}
-
-.shareTabView .shareWithLoading,
-.shareTabView .linkShare .icon-loading-small {
-	display: inline-block !important;
-	padding-left: 10px;
-}
-.shareTabView .shareWithLoading {
-	position: relative;
-	right: 70px;
-	top: 2px;
-}
-.shareTabView .icon-loading-small.hidden {
-	display: none !important;
-}
-
-.shareTabView .avatar {
-	margin-right: 8px;
-	display: inline-block;
-	overflow: hidden;
-	vertical-align: middle;
-	width: 32px;
-	height: 32px;
-}
-
-.share-autocomplete-item {
-	display: flex;
-}
-.share-autocomplete-item .autocomplete-item-text {
-	margin-left: 10px;
-	margin-right: 10px;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	overflow: hidden;
-	line-height: 32px;
-	vertical-align: middle;
-}
-
-#shareWithList {
-	list-style-type:none;
-	padding:8px;
-}
-
-#shareWithList li {
-	padding-top: 10px;
-	padding-bottom: 10px;
-	font-weight: bold;
-	line-height: 21px;
-	white-space: normal;
-	width: 100%;
-}
-
-#shareWithList .sharingOptionsGroup {
-	flex-shrink: 0;
-	position: relative;
-}
-
-#shareWithList .sharingOptionsGroup .popovermenu {
-	right: -6px;
-	top: 40px;
-	padding: 3px 6px;
-}
-
-#shareWithList .shareOption {
-	white-space: nowrap;
-	display: inline-block;
-}
-
-#shareWithList .unshare img, #shareWithList .showCruds img {
-	vertical-align:text-bottom; /* properly align icons */
-}
-
-#shareWithList label input[type=checkbox]{
-	margin-left: 0;
-	position: relative;
-}
-#shareWithList .username{
-	padding-right: 8px;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	display: inline-block;
-	overflow: hidden;
-	vertical-align: middle;
-	flex-grow: 5;
-}
-#shareWithList li label{
-	margin-right: 8px;
-}
-.shareTabView label {
-	font-weight:400;
-	white-space: nowrap;
-}
-
-.shareTabView input[type="checkbox"] {
-	margin:0 3px 0 8px;
-	vertical-align: middle;
-}
-
-a.showCruds {
-	display:inline;
-	opacity:.5;
-}
-
-a.unshare {
-	display:inline-block;
-	opacity:.5;
-	padding: 10px;
-}
-
-#link {
-	border-top:1px solid #ddd;
-	padding-top:8px;
-}
-
-.shareTabView input[type="submit"] {
-	margin-left: 7px;
-}
-
-.shareTabView form {
-	font-size: 100%;
-	margin-left: 0;
-	margin-right: 0;
-}
-
-.shareTabView .error {
-	color: #e9322d;
-	border-color: #e9322d;
-	box-shadow: 0 0 6px #f8b9b7;
-}
-
-#link #showPassword img {
-	padding-left:5px;
-	width:12px;
-}
-
-.reshare,#link label,
-#expiration label {
-	display: inline-block;
-	padding: 6px 4px;
-}
-
-a.showCruds:hover,a.unshare:hover {
-	opacity:1;
-}
-
-#defaultExpireMessage, /* fix expire message going out of box */
-.reshare { /* fix shared by text going out of box */
-	white-space:normal;
-}
-
-#defaultExpireMessage { /* show message on new line */
-	display: block;
-	padding-left: 4px;
-	/* TODO: style the dropdown in a proper way - border-box, etc. */
-	width: 90%;
-}
-
-.ui-autocomplete { /* limit dropdown height to 4 1/2 entries */
-	max-height: 200px;
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
-.notCreatable {
-	padding-left: 12px;
-	padding-top: 12px;
-	color: #999;
-}
-
-.shareTabView .mailView .icon-mail {
-	opacity: 0.5;
-}
diff --git a/core/css/share.scss b/core/css/share.scss
new file mode 100644
index 00000000000..8852ad2748e
--- /dev/null
+++ b/core/css/share.scss
@@ -0,0 +1,181 @@
+/**
+ * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2016, Morris Jobke <hey@morrisjobke.de>
+ * @copyright Copyright (c) 2016, Julia Bode <julia.bode@lulisaur.us>
+ * @copyright Copyright (c) 2016, Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @copyright Copyright (c) 2015, Hendrik Leppelsack <hendrik@leppelsack.de>
+ * @copyright Copyright (c) 2015, Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @copyright Copyright (c) 2015, Vincent Petry <pvince81@owncloud.com>
+ * @copyright Copyright (c) 2015, Arthur Schiwon <blizzz@owncloud.com>
+ * @copyright Copyright (c) 2015, Roeland Jago Douma <roeland@famdouma.nl>
+ * @copyright Copyright (c) 2015, Morris Jobke <hey@morrisjobke.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ */
+
+/* SHARE TAB STYLING -------------------------------------------------------- */
+.shareTabView {
+	.unshare.icon-loading-small {
+		margin-top: 1px;
+	}
+	.shareWithLoading, .linkShare .icon-loading-small {
+		display: inline-block !important;
+		padding-left: 10px;
+	}
+	.shareWithLoading {
+		position: relative;
+		right: 70px;
+		top: 2px;
+	}
+	.icon-loading-small.hidden {
+		display: none !important;
+	}
+	.avatar {
+		margin-right: 8px;
+		display: inline-block;
+		overflow: hidden;
+		vertical-align: middle;
+		width: 32px;
+		height: 32px;
+	}
+	label {
+		font-weight: 400;
+		white-space: nowrap;
+	}
+	input[type='checkbox'] {
+		margin: 0 3px 0 8px;
+		vertical-align: middle;
+	}
+	input[type='submit'] {
+		margin-left: 7px;
+	}
+	form {
+		font-size: 100%;
+		margin-left: 0;
+		margin-right: 0;
+	}
+	.error {
+		color: #e9322d;
+		border-color: #e9322d;
+		box-shadow: 0 0 6px #f8b9b7;
+	}
+	.mailView .icon-mail {
+		opacity: 0.5;
+	}
+}
+
+.share-autocomplete-item {
+	display: flex;
+	.autocomplete-item-text {
+		margin-left: 10px;
+		margin-right: 10px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		line-height: 32px;
+		vertical-align: middle;
+	}
+}
+
+#shareWithList {
+	list-style-type: none;
+	padding: 8px;
+	> li {
+		padding-top: 10px;
+		padding-bottom: 10px;
+		font-weight: bold;
+		line-height: 21px;
+		white-space: normal;
+		width: 100%;
+	}
+	.sharingOptionsGroup {
+		flex-shrink: 0;
+		position: relative;
+		.popovermenu {
+			right: -11px;
+			top: 35px;
+			padding: 3px 6px;
+		}
+	}
+	.shareOption {
+		white-space: nowrap;
+		display: inline-block;
+	}
+	.unshare img,
+	.showCruds img {
+		vertical-align: text-bottom;
+		/* properly align icons */
+	}
+	label input[type=checkbox] {
+		margin-left: 0;
+		position: relative;
+	}
+	.username {
+		padding-right: 8px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		display: inline-block;
+		overflow: hidden;
+		vertical-align: middle;
+		flex-grow: 5;
+	}
+}
+
+a {
+	&.showCruds {
+		display: inline;
+		opacity: .5;
+	}
+	&.unshare {
+		display: inline-block;
+		opacity: .5;
+		padding: 10px;
+	}
+	&.showCruds:hover,
+	&.unshare:hover {
+		opacity: 1;
+	}
+}
+
+#link {
+	border-top: 1px solid #ddd;
+	padding-top: 8px;
+	#showPassword img {
+		padding-left: 5px;
+		width: 12px;
+	}
+}
+
+.reshare,
+#link label,
+#expiration label {
+	display: inline-block;
+	padding: 6px 4px;
+}
+
+#defaultExpireMessage, .reshare {
+	/* fix shared by text going out of box */
+	white-space: normal;
+}
+
+#defaultExpireMessage {
+	/* show message on new line */
+	display: block;
+	padding-left: 4px;
+	/* TODO: style the dropdown in a proper way - border-box, etc. */
+	width: 90%;
+}
+
+.ui-autocomplete {
+	/* limit dropdown height to 4 1/2 entries */
+	max-height: 200px;
+	overflow-y: auto;
+	overflow-x: hidden;
+}
+
+.notCreatable {
+	padding-left: 12px;
+	padding-top: 12px;
+	color: #999;
+}
diff --git a/core/css/styles.css b/core/css/styles.css
deleted file mode 100644
index 5ea4ca53707..00000000000
--- a/core/css/styles.css
+++ /dev/null
@@ -1,999 +0,0 @@
-/* Copyright (c) 2011, 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. */
-
-html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section { margin:0; padding:0; border:0; outline:0; font-weight:inherit; font-size:100%; font-family:inherit; vertical-align:baseline; cursor:default; }
-html, body { height:100%; }
-article, aside, dialog, figure, footer, header, hgroup, nav, section { display:block; }
-body { line-height:1.5; }
-table { border-collapse:separate; border-spacing:0; white-space:nowrap; }
-caption, th, td { text-align:left; font-weight:normal; }
-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; }
-
-body {
-	background-color: #ffffff;
-	font-weight: 400;
-	font-size: .8em;
-	line-height: 1.6em;
-	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
-	color: #000;
-	height: auto;
-}
-
-#body-login {
-	text-align: center;
-	background-color: #0082c9;
-	background-image: url('../img/background.jpg?v=1');
-	background-position: 50% 50%;
-	background-repeat: no-repeat;
-	background-size: cover;
-}
-
-.two-factor-header {
-	text-align: center;
-}
-
-.two-factor-provider {
-	text-align: center;
-	width: 258px !important;
-	display: inline-block;
-	margin-bottom: 0 !important;
-	background-color: rgba(0,0,0,0.3) !important;
-	border: none !important;
-}
-
-.two-factor-link {
-	display: inline-block;
-	padding: 12px;
-	color: rgba(255, 255, 255, .75);
-}
-
-.float-spinner {
-	height: 32px;
-	display: none;
-}
-#body-login .float-spinner {
-	margin-top: -32px;
-	padding-top: 32px;
-}
-
-#nojavascript {
-	position: fixed;
-	top: 0;
-	bottom: 0;
-	height: 100%;
-	width: 100%;
-	z-index: 9000;
-	text-align: center;
-	background-color: rgba(0,0,0,0.5);
-	color: #fff;
-	line-height: 125%;
-	font-size: 24px;
-}
-#nojavascript div {
-	display: block;
-	position: relative;
-	width: 50%;
-	top: 35%;
-	margin: 0px auto;
-}
-#nojavascript a {
-	color: #fff;
-	border-bottom: 2px dotted #fff;
-}
-#nojavascript a:hover,
-#nojavascript a:focus {
-	color: #ddd;
-}
-
-/* SCROLLING */
-::-webkit-scrollbar {
-	width: 5px;
-}
-::-webkit-scrollbar-track-piece {
-	background-color: transparent;
-}
-::-webkit-scrollbar-thumb {
-	background: #ddd;
-	border-radius: 3px;
-}
-
-/* Searchbox */
-.searchbox input[type="search"] {
-	position: relative;
-	font-size: 1.2em;
-	padding: 3px;
-	padding-left: 25px;
-	background: transparent url('../img/actions/search-white.svg?v=1') no-repeat 6px center;
-	color: #fff;
-	border: 0;
-	border-radius: 3px;
-	margin-top: 9px;
-	float: right;
-	width: 0;
-	cursor: pointer;
-	-webkit-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,
-.searchbox input[type="search"]:valid {
-	color: #fff;
-	width: 155px;
-	max-width: 50%;
-	cursor: text;
-	background-color: #0082c9;
-	border: 1px solid rgba(255, 255, 255, .5);
-}
-
-/* CONTENT ------------------------------------------------------------------ */
-#controls {
-	box-sizing: border-box;
-	position: fixed;
-	top: 45px;
-	right: 0;
-	left: 0;
-	height: 44px;
-	width: 100%;
-	padding: 0;
-	margin: 0;
-	background-color: rgba(255, 255, 255, .95);
-	z-index: 50;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-/* position controls for apps with app-navigation */
-#app-navigation+#app-content #controls {
-	left: 250px;
-}
-.viewer-mode #app-navigation+#app-content #controls {
-	left: 0;
-}
-
-#controls .button,
-#controls button,
-#controls input[type='submit'],
-#controls input[type='text'],
-#controls input[type='password'],
-#controls select {
-	box-sizing: border-box;
-	display: inline-block;
-	height: 36px;
-	padding: 7px 10px
-}
-
-#controls .button.hidden {
-	display: none;
-}
-
-#content {
-	position: relative;
-	height: 100%;
-	width: 100%;
-}
-#content .hascontrols {
-	margin-top: 45px;
-}
-#content-wrapper {
-	position: absolute;
-	height: 100%;
-	width: 100%;
-	overflow-x: hidden; /* prevent horizontal scrollbar */
-	padding-top: 45px;
-	box-sizing:border-box;
-}
-/* allow horizontal scrollbar for personal and admin settings */
-#body-settings:not(.snapjs-left) .app-settings {
-	overflow-x: auto;
-}
-
-#emptycontent,
-.emptycontent {
-	color: #888;
-	text-align: center;
-	margin-top: 30vh;
-	width: 100%;
-}
-#emptycontent.emptycontent-search,
-.emptycontent.emptycontent-search {
-	position: static;
-}
-#emptycontent h2,
-.emptycontent h2 {
-	margin-bottom: 10px;
-	line-height: 150%;
-}
-#emptycontent [class^="icon-"],
-.emptycontent [class^="icon-"],
-#emptycontent [class*=" icon-"],
-.emptycontent [class*=" icon-"] {
-	background-size: 64px;
-	height: 64px;
-	width: 64px;
-	margin: 0 auto 15px;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
-	opacity: .4;
-}
-
-
-/* LOG IN & INSTALLATION ------------------------------------------------------------ */
-
-/* Some whitespace to the top */
-#body-login #header {
-	padding-top: 100px;
-}
-#body-login {
-	background-attachment: fixed; /* fix background gradient */
-	height: 100%; /* fix sticky footer */
-}
-
-/* Dark subtle label text */
-#body-login p.info,
-#body-login form fieldset legend,
-#body-login #datadirContent label,
-#body-login form fieldset .warning-info,
-#body-login form input[type="checkbox"]+label {
-	text-align: center;
-	color: #fff;
-}
-/* overrides another !important statement that sets this to unreadable black */
-#body-login form .warning input[type="checkbox"]:hover+label,
-#body-login form .warning input[type="checkbox"]:focus+label,
-#body-login form .warning input[type="checkbox"]+label {
-	color: #fff !important;
-}
-
-#body-login .update h2 {
-	margin: 0 0 20px;
-}
-
-#body-login .update a {
-	color: #fff;
-	border-bottom: 1px solid #aaa;
-}
-
-#body-login .infogroup {
-	margin-bottom: 15px;
-}
-
-#body-login p#message img {
-	vertical-align: middle;
-	padding: 5px;
-}
-
-#body-login div.buttons {
-	text-align: center;
-}
-#body-login p.info {
-	margin: 0 auto;
-	padding-top: 20px;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-#body-login p.info a {
-	font-weight: 600;
-	padding: 13px;
-	margin: -13px;
-}
-
-#body-login form {
-	position: relative;
-	width: 280px;
-	margin: 16px auto;
-	padding: 0;
-}
-#body-login form fieldset {
-	margin-bottom: 20px;
-	text-align: left;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-#body-login form #sqliteInformation {
-	margin-top: -20px;
-	margin-bottom: 20px;
-}
-#body-login form #adminaccount {
-	margin-bottom: 15px;
-}
-#body-login form fieldset legend, #datadirContent label {
-	width: 100%;
-}
-#body-login #datadirContent label {
-	display: block;
-	margin: 0;
-}
-#body-login form #datadirField legend {
-	margin-bottom: 15px;
-}
-#body-login #showAdvanced {
-	padding: 13px; /* increase clickable area of Advanced dropdown */
-}
-#body-login #showAdvanced img {
-	vertical-align: bottom; /* adjust position of Advanced dropdown arrow */
-	margin-left: -4px;
-}
-#body-login .icon-info-white {
-	padding: 10px;
-}
-
-/* strengthify wrapper */
-#body-login .strengthify-wrapper {
-	display: inline-block;
-	position: relative;
-	left: 15px;
-	top: -23px;
-	width: 250px;
-}
-
-/* tipsy for the strengthify wrapper looks better with following font settings */
-#body-login .tipsy-inner {
-	font-weight: bold;
-	color: #ccc;
-}
-
-/* General new input field look */
-#body-login input[type="text"],
-#body-login input[type="password"],
-#body-login input[type="email"] {
-	border: none;
-	font-weight: 300;
-}
-
-/* Nicely grouping input field sets */
-.grouptop,
-.groupmiddle,
-.groupbottom {
-	position: relative;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-#body-login .grouptop input,
-.grouptop input {
-	margin-bottom: 0 !important;
-	border-bottom: 0 !important;
-	border-bottom-left-radius: 0 !important;
-	border-bottom-right-radius: 0 !important;
-}
-#body-login .groupmiddle input,
-.groupmiddle input {
-	margin-top: 0 !important;
-	margin-bottom: 0 !important;
-	border-top: 0 !important;
-	border-bottom: 0 !important;
-	border-radius: 0 !important;
-	box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important;
-}
-#body-login .groupbottom input,
-.groupbottom input {
-	margin-top: 0 !important;
-	border-top: 0 !important;
-	border-top-right-radius: 0 !important;
-	border-top-left-radius: 0 !important;
-	box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important;
-}
-#body-login .groupbottom input[type=submit] {
-	box-shadow: none !important;
-}
-
-/* keep the labels for screen readers but hide them since we use placeholders */
-label.infield {
-	display: none;
-}
-
-#body-login form input[type="checkbox"]+label {
-	position: relative;
-	margin: 0;
-	padding: 14px;
-	vertical-align: middle;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-
-#body-login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
-#body-login .success { background:#d7fed7; border:1px solid #0f0; width: 35%; margin: 30px auto; padding:1em; text-align: center;}
-
-#body-login #showAdvanced > img {
-	padding: 4px;
-	box-sizing: border-box;
-}
-
-#body-login p.info a, #body-login #showAdvanced {
-	color: #fff;
-}
-
-#body-login #remember_login:hover+label,
-#body-login #remember_login:focus+label,
-#body-login #forgot-password:hover,
-#body-login #forgot-password:focus,
-#body-login p.info a:hover,
-#body-login p.info a:focus  {
-	opacity: .6;
-}
-
-/* Show password toggle */
-#show, #dbpassword {
-	position: absolute;
-	right: 1em;
-	top: .8em;
-	float: right;
-}
-#show, #dbpassword, #personal-show {
-	display: none;
-}
-#show + label, #dbpassword + label {
-	right: 21px;
-	top: 15px !important;
-	margin: -14px !important;
-	padding: 14px !important;
-}
-#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
-	opacity: .8;
-}
-#show + label, #dbpassword + label, #personal-show + label {
-	position: absolute !important;
-	height: 20px;
-	width: 24px;
-	background-image: url('../img/actions/toggle.svg?v=1');
-	background-repeat: no-repeat;
-	background-position: center;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)";
-	opacity: .3;
-}
-#show + label:before, #dbpassword + label:before, #personal-show + label:before {
-	display: none;
-}
-#pass2, input[name="personal-password-clone"] {
-	padding: .6em 2.5em .4em .4em;
-	width: 8em;
-}
-#personal-show + label {
-	height: 14px;
-	margin-top: -25px;
-	left: 295px;
-	display: block;
-}
-#passwordbutton {
-	margin-left: .5em;
-}
-
-/* Database selector */
-#body-login form #selectDbType {
-	text-align:center;
-	white-space: nowrap; 
-	margin: 0;
-}
-#body-login form #selectDbType .info {
-	white-space: normal;
-}
-#body-login form #selectDbType label {
-	position: static;
-	margin: 0 -3px 5px;
-	font-size: 12px;
-	background:#f8f8f8;
-	color:#888;
-	cursor:pointer;
-	border: 1px solid #ddd;
-}
-#body-login form #selectDbType label span {
-	cursor: pointer;
-	padding: 10px 20px;
-}
-#body-login form #selectDbType label.ui-state-hover,
-#body-login form #selectDbType label.ui-state-active {
-	color:#000;
-	background-color:#e8e8e8; }
-
-
-/* Warnings and errors are the same */
-#body-login .warning,
-#body-login .update,
-#body-login .error {
-	display: block;
-	padding: 10px;
-	background-color: rgba(0,0,0,.3);
-	color: #fff;
-	text-align: left;
-	border-radius: 3px;
-	cursor: default;
-}
-
-#body-login .update {
-	width: inherit;
-	text-align: center;
-}
-
-#body-login .update .appList {
-	list-style: disc;
-	text-align: left;
-	margin-left: 25px;
-	margin-right: 25px;
-}
-
-#body-login .v-align {
-	width: inherit;
-}
-
-#body-login .update img.float-spinner {
-	float: left;
-}
-
-#body-user .warning, #body-settings .warning {
-	margin-top: 8px;
-	padding: 5px;
-	background: #fdd;
-	border-radius: 3px;
-}
-
-.warning legend,
-.warning a,
-.error a {
-	color: #fff !important;
-	font-weight: 600 !important;
-}
-.error a.button {
-	color: #555 !important;
-	display: inline-block;
-	text-align: center;
-}
-.error pre {
-	white-space: pre-wrap;
-	text-align: left;
-}
-
-.error-wide {
-	width: 700px;
-	margin-left: -200px !important;
-}
-
-.error-wide .button {
-	color: black !important;
-}
-
-.warning-input {
-	border-color: #ce3702 !important;
-}
-
-/* Fixes for log in page, TODO should be removed some time */
-#body-login ul.error-wide {
-        margin-top: 35px;
-}
-#body-login .warning {
-	margin: 0 7px 5px 4px;
-}
-#body-login .warning legend {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	opacity: 1;
-}
-#body-login a.warning {
-	cursor: pointer;
-}
-
-/* fixes for update page TODO should be fixed some time in a proper way */
-/* this is just for an error while updating the ownCloud instance */
-#body-login .updateProgress .error {
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-/* Alternative Logins */
-#alternative-logins legend { margin-bottom:10px; }
-#alternative-logins li { height:40px; display:inline-block; white-space:nowrap; }
-
-/* Log in and install button */
-#body-login input {
-	font-size: 20px;
-	margin: 5px;
-	padding: 11px 10px 9px;
-}
-#body-login input[type="text"],
-#body-login input[type="password"] {
-	width: 249px;
-}
-#body-login input.login {
-	width: 269px;
-	background-position: right 16px center;
-}
-#body-login input[type="submit"] {
-	padding: 10px 20px; /* larger log in and installation buttons */
-}
-#remember_login {
-	margin: 18px 5px 0 16px !important;
-}
-#body-login .remember-login-container {
-	display: inline-block;
-	margin: 10px 0;
-	text-align: center;
-	width: 100%;
-}
-#body-login #forgot-password {
-	padding: 11px;
-	float: right;
-	color: #fff;
-}
-
-/* Sticky footer */
-#body-login .wrapper {
-	min-height: 100%;
-	margin: 0 auto -70px;
-	width: 300px;
-}
-#body-login footer, #body-login .push {
-	height: 70px;
-}
-
-/* round profile photos */
-.avatar,
-.avatar img,
-.avatardiv,
-.avatardiv img {
-	border-radius: 50%;
-	flex-shrink: 0;
-}
-td.avatar {
-	border-radius: 0;
-}
-
-
-#notification-container {
-	position: absolute;
-	top: 0;
-	width: 100%;
-	text-align: center;
-}
-#notification {
-	margin: 0 auto;
-	max-width: 60%;
-	z-index: 8000;
-	background-color: #fff;
-	border: 0;
-	padding: 1px 8px;
-	display: none;
-	position: relative;
-	top: 0;
-	border-bottom-left-radius: 3px;
-	border-bottom-right-radius: 3px;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)";
-	opacity: .9;
-}
-#notification span {
-	cursor: pointer;
-	margin-left: 1em;
-}
-#notification {
-	overflow-x: hidden;
-	overflow-y: auto;
-	max-height: 100px;
-}
-#notification .row {
-	position: relative;
-}
-#notification .row .close {
-	display: inline-block;
-	vertical-align: middle;
-	position: absolute;
-	right: 0;
-	top: 0;
-	margin-top: 2px;
-}
-#notification .row.closeable {
-	padding-right: 20px;
-}
-
-tr .action:not(.permanent),
-.selectedActions a {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
-	opacity: 0;
-}
-tr:hover .action,
-tr:focus .action,
-tr .action.permanent,
-.selectedActions a {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-	opacity: .5;
-}
-tr .action {
-	width: 16px;
-	height: 16px;
-}
-.header-action {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
-	opacity: .8;
-}
-tr:hover .action:hover,
-tr:focus .action:focus,
-.selectedActions a:hover,
-.selectedActions a:focus,
-.header-action:hover,
-.header-action:focus {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	opacity: 1;
-}
-tbody tr:hover,
-tbody tr:focus,
-tbody tr:active {
-	background-color: #f8f8f8;
-}
-
-code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; }
-
-#quota {
-	cursor: default;
-	margin: 30px !important;
-	position: relative;
-	padding: 0 !important;
-}
-#quota div {
-	padding: 0;
-	background-color: rgb(220,220,220);
-	font-weight: normal;
-	white-space: nowrap;
-	border-bottom-left-radius: 3px;
-	border-top-left-radius: 3px;
-	min-width: 1%;
-	max-width: 100%;
-}
-#quotatext {padding:.6em 1em;}
-
-#quota div.quota-warning {
-	background-color: #fc4;
-}
-
-.pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; }
-.pager li { display:inline-block; }
-
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { overflow:hidden; text-overflow:ellipsis; }
-.separator { display:inline; border-left:1px solid #d3d3d3; border-right:1px solid #fff; height:10px; width:0px; margin:4px; }
-
-a.bookmarklet { background-color:#ddd; border:1px solid #ccc; padding:5px;padding-top:0px;padding-bottom:2px; text-decoration:none; margin-top:5px }
-
-.exception{color:#000;}
-.exception textarea{width:95%;height:200px;background:#ffe;border:0;}
-
-.ui-icon-circle-triangle-e{ background-image:url('../img/actions/play-next.svg?v=1'); }
-.ui-icon-circle-triangle-w{ background-image:url('../img/actions/play-previous.svg?v=1'); }
-
-.ui-datepicker-prev,.ui-datepicker-next{ border:1px solid #ddd; background:#fff; }
-
-/* ---- DIALOGS ---- */
-#oc-dialog-filepicker-content .dirtree {
-	width:92%;
-	float: left;
-	margin-left: 15px;
-	overflow:hidden;
-}
-#oc-dialog-filepicker-content .dirtree div:first-child a {
-	background-image:url('../img/places/home.svg?v=1');
-	background-repeat:no-repeat;
-	background-position: left center;
-}
-#oc-dialog-filepicker-content .dirtree span:not(:last-child) { cursor: pointer; }
-#oc-dialog-filepicker-content .dirtree span:last-child { font-weight: bold; }
-#oc-dialog-filepicker-content .dirtree span:not(:last-child)::after { content: '>'; padding: 3px;}
-#oc-dialog-filepicker-content .filelist-container {
-	box-sizing: border-box;
-	display: inline-block;
-	overflow-y: auto;
-	height: 100%; /** overflow under the button row */
-	width: 100%;
-}
-
-#oc-dialog-filepicker-content .emptycontent {
-	color: #888;
-	text-align: center;
-	margin-top: 80px;
-	width: 100%;
-	display: none;
-}
-#oc-dialog-filepicker-content .filelist {
-	background-color:white;
-	width:100%;
-}
-#oc-dialog-filepicker-content #filestable.filelist {
-	/* prevent the filepicker to overflow */
-	min-width: initial;
-	margin-bottom: 50px;
-}
-
-#oc-dialog-filepicker-content .filelist td {
-	padding: 14px;
-	border-bottom: 1px solid #eee;
-}
-#oc-dialog-filepicker-content .filelist tr:last-child td {
-	border-bottom: none;
-}
-#oc-dialog-filepicker-content .filelist .filename {
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	background-size: 32px;
-	background-repeat: no-repeat;
-	padding-left: 51px;
-	background-position: 7px 7px;
-	cursor: pointer;
-}
-
-#oc-dialog-filepicker-content .filelist .filesize,
-#oc-dialog-filepicker-content .filelist .date {
-	width: 80px;
-}
-
-#oc-dialog-filepicker-content .filelist .filesize {
-	text-align: right;
-}
-#oc-dialog-filepicker-content .filepicker_element_selected { background-color:lightblue;}
-.ui-dialog {position:fixed !important;}
-span.ui-icon {float: left; margin: 3px 7px 30px 0;}
-
-.move2trash { /* decrease spinner size */
-	width: 16px;
-	height: 16px;
-}
-
-/* ---- TOOLTIPS ---- */
-.extra-data {
-	padding-right: 5px !important;
-}
-.tipsy-inner {
-	max-width: 400px !important;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-/* ---- TAGS ---- */
-#tagsdialog .content {
-	width: 100%; height: 280px;
-}
-#tagsdialog .scrollarea {
-	overflow:auto; border:1px solid #ddd;
-	width: 100%; height: 240px;
-}
-#tagsdialog .bottombuttons {
-	 width: 100%; height: 30px;
-}
-#tagsdialog .bottombuttons * { float:left;}
-#tagsdialog .taglist li { background:#f8f8f8; padding:.3em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 500ms; transition:background-color 500ms; }
-#tagsdialog .taglist li:hover, #tagsdialog .taglist li:active { background:#eee; }
-#tagsdialog .addinput { width: 90%; clear: both; }
-
-/* ---- APP SETTINGS - LEGACY, DO NOT USE THE POPUP! ---- */
-.popup {
-	background-color: #fff;
-	border-radius: 3px;
-	box-shadow: 0 0 10px #aaa;
-	color: #333;
-	padding: 10px;
-	position: fixed !important;
-	z-index: 100;
-}
-.popup.topright { top:7em; right:1em; }
-.popup.bottomleft { bottom:1em; left:33em; }
-.popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/close.svg?v=1') no-repeat center; }
-.popup h2 { font-size:20px; }
-.arrow { border-bottom:10px solid white; border-left:10px solid transparent; border-right:10px solid transparent; display:block; height:0; position:absolute; width:0; z-index:201; }
-.arrow.left { left:-13px; bottom:1.2em; -webkit-transform:rotate(270deg); -ms-transform:rotate(270deg); transform:rotate(270deg); }
-.arrow.up { top:-8px; right:6px; }
-.arrow.down { -webkit-transform:rotate(180deg); -ms-transform:rotate(180deg); transform:rotate(180deg); }
-
-
-/* ---- BREADCRUMB ---- */
-div.crumb {
-	float: left;
-	display: block;
-	background-image: url('../img/breadcrumb.svg?v=1');
-	background-repeat: no-repeat;
-	background-position: right center;
-	height: 44px;
-	background-size: auto 24px;
-}
-div.crumb.hidden {
-	display: none;
-}
-div.crumb a,
-div.crumb > span {
-	position: relative;
-	top: 12px;
-	padding: 14px 24px 14px 17px;
-	color: #555;
-}
-div.crumb.last a {
-	padding-right: 0;
-}
-div.crumb:first-child a {
-	position: relative;
-	top: 13px;
-	padding-right: 14px;
-}
-div.crumb.last {
-	font-weight: 600;
-	margin-right: 10px;
-}
-div.crumb.ellipsized {
-	padding: 0 10px 0 5px;
-}
-div.crumb a.ellipsislink {
-	padding: 0 !important;
-	position: relative;
-	top: 8px !important;
-}
-
-/* some feedback for hover/tap on breadcrumbs */
-div.crumb:hover,
-div.crumb:focus,
-div.crumb a:focus,
-div.crumb:active {
-	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-	opacity:.7;
-}
-
-.appear {
-	opacity: 1;
-	-webkit-transition: opacity 500ms ease 0s;
-	-moz-transition: opacity 500ms ease 0s;
-	-ms-transition: opacity 500ms ease 0s;
-	-o-transition: opacity 500ms ease 0s;
-	transition: opacity 500ms ease 0s;
-}
-.appear.transparent {
-	opacity: 0;
-}
-
-
-/* public footer */
-#body-public footer {
-	position: relative;
-	text-align: center;
-}
-
-#body-public footer .info {
-	color: #777;
-	text-align: center;
-	margin: 0 auto;
-	padding: 20px 0;
-}
-
-#body-public footer .info a {
-	color: #777;
-	font-weight: 600;
-	padding: 13px;
-	margin: -13px;
-}
-
-
-/* LEGACY FIX only - do not use fieldsets for settings */
-fieldset.warning legend, fieldset.update legend {
-	top: 18px;
-	position: relative;
-}
-fieldset.warning legend + p, fieldset.update legend + p {
-	margin-top: 12px;
-}
-
-
-/* for IE10 */
-@-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/css/styles.scss b/core/css/styles.scss
new file mode 100644
index 00000000000..d958a01655b
--- /dev/null
+++ b/core/css/styles.scss
@@ -0,0 +1,1304 @@
+/**
+ * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2016, Lukas Reschke <lukas@statuscode.ch>
+ * @copyright Copyright (c) 2016, Robin Appelman <robin@icewind.nl>
+ * @copyright Copyright (c) 2016, Julius Haertl <jus@bitgrid.net>
+ * @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com>
+ * @copyright Copyright (c) 2016, Morris Jobke <hey@morrisjobke.de>
+ * @copyright Copyright (c) 2016, Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @copyright Copyright (c) 2016, Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @copyright Copyright (c) 2016, Raghu Nayyar <hey@raghunayyar.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ */
+
+html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, dialog, figure, footer, header, hgroup, nav, section {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-weight: inherit;
+	font-size: 100%;
+	font-family: inherit;
+	vertical-align: baseline;
+	cursor: default;
+}
+
+html, body {
+	height: 100%;
+}
+
+article, aside, dialog, figure, footer, header, hgroup, nav, section {
+	display: block;
+}
+
+body {
+	line-height: 1.5;
+}
+
+table {
+	border-collapse: separate;
+	border-spacing: 0;
+	white-space: nowrap;
+}
+
+caption, th, td {
+	text-align: left;
+	font-weight: normal;
+}
+
+table, td, th {
+	vertical-align: middle;
+}
+
+a {
+	border: 0;
+	color: #000;
+	text-decoration: none;
+	cursor: pointer;
+	* {
+		cursor: pointer;
+	}
+}
+
+input {
+	cursor: pointer;
+	* {
+		cursor: pointer;
+	}
+}
+
+select, .button span, label {
+	cursor: pointer;
+}
+
+ul {
+	list-style: none;
+}
+
+body {
+	background-color: #ffffff;
+	font-weight: 400;
+	font-size: .8em;
+	line-height: 1.6em;
+	font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
+	color: #000;
+	height: auto;
+}
+
+#body-login {
+	text-align: center;
+	background-color: #0082c9;
+	background-image: url('../img/background.jpg?v=1');
+	background-position: 50% 50%;
+	background-repeat: no-repeat;
+	background-size: cover;
+}
+
+.two-factor-header {
+	text-align: center;
+}
+
+.two-factor-provider {
+	text-align: center;
+	width: 258px !important;
+	display: inline-block;
+	margin-bottom: 0 !important;
+	background-color: rgba(0, 0, 0, 0.3) !important;
+	border: none !important;
+}
+
+.two-factor-link {
+	display: inline-block;
+	padding: 12px;
+	color: rgba(255, 255, 255, 0.75);
+}
+
+.float-spinner {
+	height: 32px;
+	display: none;
+}
+
+#body-login .float-spinner {
+	margin-top: -32px;
+	padding-top: 32px;
+}
+
+#nojavascript {
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	height: 100%;
+	width: 100%;
+	z-index: 9000;
+	text-align: center;
+	background-color: rgba(0, 0, 0, 0.5);
+	color: #fff;
+	line-height: 125%;
+	font-size: 24px;
+	div {
+		display: block;
+		position: relative;
+		width: 50%;
+		top: 35%;
+		margin: 0px auto;
+	}
+	a {
+		color: #fff;
+		border-bottom: 2px dotted #fff;
+		&:hover, &:focus {
+			color: #ddd;
+		}
+	}
+}
+
+/* SCROLLING */
+
+::-webkit-scrollbar {
+	width: 5px;
+}
+
+::-webkit-scrollbar-track-piece {
+	background-color: transparent;
+}
+
+::-webkit-scrollbar-thumb {
+	background: #ddd;
+	border-radius: 3px;
+}
+
+/* Searchbox */
+
+.searchbox {
+	position: relative;
+	input[type='search'] {
+		position: relative;
+		font-size: 1.2em;
+		padding: 3px;
+		padding-left: 25px;
+		background: transparent url('../img/actions/search-white.svg?v=1') no-repeat 6px center;
+		color: #fff;
+		border: 0;
+		border-radius: 3px;
+		margin-top: 3px;
+		width: 0;
+		cursor: pointer;
+		-webkit-transition: all 100ms;
+		transition: all 100ms;
+		-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)';
+		opacity: .7;
+		&:focus, &:active, &:valid {
+			color: #fff;
+			width: 155px;
+			cursor: text;
+			background-color: #0082c9 !important;
+			border: 1px solid rgba(255, 255, 255, 0.5) !important;
+		}
+		& ~ .icon-close-white {
+			display: inline;
+			position: absolute;
+			width: 15px;
+			height: 32px;
+			right: 3px;
+			top: 0;
+			&, &:focus, &:active, &:hover {
+				border: none;
+				background-color: transparent;
+			}
+		}
+		&:not(:valid) ~ .icon-close-white {
+			display: none;
+		}
+		&::-webkit-search-cancel-button {
+			-webkit-appearance: none;
+		}
+	}
+}
+
+/* CONTENT ------------------------------------------------------------------ */
+
+#controls {
+	box-sizing: border-box;
+	position: fixed;
+	top: 45px;
+	right: 0;
+	left: 0;
+	height: 44px;
+	width: 100%;
+	padding: 0;
+	margin: 0;
+	background-color: rgba(255, 255, 255, 0.95);
+	z-index: 50;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+
+/* position controls for apps with app-navigation */
+
+#app-navigation + #app-content #controls {
+	left: 250px;
+}
+
+.viewer-mode #app-navigation + #app-content #controls {
+	left: 0;
+}
+
+#controls {
+	.button, button {
+		box-sizing: border-box;
+		display: inline-block;
+		height: 36px;
+		padding: 7px 10px;
+	}
+	input {
+		&[type='submit'], &[type='text'], &[type='password'] {
+			box-sizing: border-box;
+			display: inline-block;
+			height: 36px;
+			padding: 7px 10px;
+		}
+	}
+	select {
+		box-sizing: border-box;
+		display: inline-block;
+		height: 36px;
+		padding: 7px 10px;
+	}
+	.button.hidden {
+		display: none;
+	}
+}
+
+#content {
+	position: relative;
+	height: 100%;
+	width: 100%;
+	.hascontrols {
+		margin-top: 45px;
+	}
+}
+
+#content-wrapper {
+	position: absolute;
+	height: 100%;
+	width: 100%;
+	overflow-x: hidden;
+	/* prevent horizontal scrollbar */
+	padding-top: 45px;
+	box-sizing: border-box;
+}
+
+/* allow horizontal scrollbar for personal and admin settings */
+
+#body-settings:not(.snapjs-left) .app-settings {
+	overflow-x: auto;
+}
+
+#emptycontent, .emptycontent {
+	color: #888;
+	text-align: center;
+	margin-top: 30vh;
+	width: 100%;
+}
+
+#emptycontent.emptycontent-search, .emptycontent.emptycontent-search {
+	position: static;
+}
+
+#emptycontent h2, .emptycontent h2 {
+	margin-bottom: 10px;
+	line-height: 150%;
+}
+
+#emptycontent [class^='icon-'], .emptycontent [class^='icon-'], #emptycontent [class*=' icon-'], .emptycontent [class*=' icon-'] {
+	background-size: 64px;
+	height: 64px;
+	width: 64px;
+	margin: 0 auto 15px;
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=40)';
+	opacity: .4;
+}
+
+/* LOG IN & INSTALLATION ------------------------------------------------------------ */
+
+/* Some whitespace to the top */
+
+#body-login {
+	#header {
+		padding-top: 100px;
+	}
+	background-attachment: fixed;
+	/* fix background gradient */
+	height: 100%;
+	/* fix sticky footer */
+	p.info, form fieldset legend, #datadirContent label {
+		text-align: center;
+		color: #fff;
+	}
+	form {
+		fieldset .warning-info, input[type='checkbox'] + label {
+			text-align: center;
+			color: #fff;
+		}
+		.warning input[type='checkbox'] {
+			&:hover + label, &:focus + label, + label {
+				color: #fff !important;
+			}
+		}
+	}
+	.update {
+		h2 {
+			margin: 0 0 20px;
+		}
+		a {
+			color: #fff;
+			border-bottom: 1px solid #aaa;
+		}
+	}
+	.infogroup {
+		margin-bottom: 15px;
+	}
+	p#message img {
+		vertical-align: middle;
+		padding: 5px;
+	}
+	div.buttons {
+		text-align: center;
+	}
+	p.info {
+		margin: 0 auto;
+		padding-top: 20px;
+		-webkit-user-select: none;
+		-moz-user-select: none;
+		-ms-user-select: none;
+		user-select: none;
+		a {
+			font-weight: 600;
+			padding: 13px;
+			margin: -13px;
+		}
+	}
+	form {
+		position: relative;
+		width: 280px;
+		margin: 16px auto;
+		padding: 0;
+		fieldset {
+			margin-bottom: 20px;
+			text-align: left;
+			-webkit-user-select: none;
+			-moz-user-select: none;
+			-ms-user-select: none;
+			user-select: none;
+		}
+		#sqliteInformation {
+			margin-top: -20px;
+			margin-bottom: 20px;
+		}
+		#adminaccount {
+			margin-bottom: 15px;
+		}
+		fieldset legend {
+			width: 100%;
+		}
+	}
+}
+
+/* Dark subtle label text */
+
+/* overrides another !important statement that sets this to unreadable black */
+
+#datadirContent label {
+	width: 100%;
+}
+
+#body-login {
+	#datadirContent label {
+		display: block;
+		margin: 0;
+	}
+	form #datadirField legend {
+		margin-bottom: 15px;
+	}
+	#showAdvanced {
+		padding: 13px;
+		/* increase clickable area of Advanced dropdown */
+		img {
+			vertical-align: bottom;
+			/* adjust position of Advanced dropdown arrow */
+			margin-left: -4px;
+		}
+	}
+	.icon-info-white {
+		padding: 10px;
+	}
+	.strengthify-wrapper {
+		display: inline-block;
+		position: relative;
+		left: 15px;
+		top: -23px;
+		width: 250px;
+	}
+	.tipsy-inner {
+		font-weight: bold;
+		color: #ccc;
+	}
+	input {
+		&[type='text'], &[type='password'], &[type='email'] {
+			border: none;
+			font-weight: 300;
+		}
+	}
+}
+
+/* strengthify wrapper */
+
+/* tipsy for the strengthify wrapper looks better with following font settings */
+
+/* General new input field look */
+
+/* Nicely grouping input field sets */
+
+.grouptop, .groupmiddle, .groupbottom {
+	position: relative;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+}
+
+#body-login .grouptop input, .grouptop input {
+	margin-bottom: 0 !important;
+	border-bottom: 0 !important;
+	border-bottom-left-radius: 0 !important;
+	border-bottom-right-radius: 0 !important;
+}
+
+#body-login .groupmiddle input, .groupmiddle input {
+	margin-top: 0 !important;
+	margin-bottom: 0 !important;
+	border-top: 0 !important;
+	border-bottom: 0 !important;
+	border-radius: 0 !important;
+	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1) inset !important;
+}
+
+#body-login .groupbottom input, .groupbottom input {
+	margin-top: 0 !important;
+	border-top: 0 !important;
+	border-top-right-radius: 0 !important;
+	border-top-left-radius: 0 !important;
+	box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1) inset !important;
+}
+
+#body-login .groupbottom input[type=submit] {
+	box-shadow: none !important;
+}
+
+/* keep the labels for screen readers but hide them since we use placeholders */
+
+label.infield {
+	display: none;
+}
+
+#body-login {
+	form {
+		input[type='checkbox'] + label {
+			position: relative;
+			margin: 0;
+			padding: 14px;
+			vertical-align: middle;
+			-webkit-user-select: none;
+			-moz-user-select: none;
+			-ms-user-select: none;
+			user-select: none;
+		}
+		.errors {
+			background: #fed7d7;
+			border: 1px solid #f00;
+			list-style-indent: inside;
+			margin: 0 0 2em;
+			padding: 1em;
+		}
+	}
+	.success {
+		background: #d7fed7;
+		border: 1px solid #0f0;
+		width: 35%;
+		margin: 30px auto;
+		padding: 1em;
+		text-align: center;
+	}
+	#showAdvanced > img {
+		padding: 4px;
+		box-sizing: border-box;
+	}
+	p.info a, #showAdvanced {
+		color: #fff;
+	}
+	#remember_login {
+		&:hover + label, &:focus + label {
+			opacity: .6;
+		}
+	}
+	#forgot-password {
+		&:hover, &:focus {
+			opacity: .6;
+		}
+	}
+	p.info a {
+		&:hover, &:focus {
+			opacity: .6;
+		}
+	}
+}
+
+/* Show password toggle */
+
+#show, #dbpassword {
+	position: absolute;
+	right: 1em;
+	top: .8em;
+	float: right;
+}
+
+#show, #dbpassword, #personal-show {
+	display: none;
+}
+
+#show + label, #dbpassword + label {
+	right: 21px;
+	top: 15px !important;
+	margin: -14px !important;
+	padding: 14px !important;
+}
+
+#show:checked + label, #dbpassword:checked + label, #personal-show:checked + label {
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)';
+	opacity: .8;
+}
+
+#show + label, #dbpassword + label, #personal-show + label {
+	position: absolute !important;
+	height: 20px;
+	width: 24px;
+	background-image: url('../img/actions/toggle.svg?v=1');
+	background-repeat: no-repeat;
+	background-position: center;
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=30)';
+	opacity: .3;
+}
+
+#show + label:before, #dbpassword + label:before, #personal-show + label:before {
+	display: none;
+}
+
+#pass2, input[name='personal-password-clone'] {
+	padding-right: 30px;
+}
+
+.personal-show-container {
+	position: relative;
+	display: inline-block;
+	margin-right: 6px;
+}
+#personal-show + label {
+	display: block;
+	right: 0;
+	margin-top: -36px;
+    padding: 6px 4px;
+}
+
+/* Database selector */
+
+#body-login {
+	form #selectDbType {
+		text-align: center;
+		white-space: nowrap;
+		margin: 0;
+		.info {
+			white-space: normal;
+		}
+		label {
+			position: static;
+			margin: 0 -3px 5px;
+			font-size: 12px;
+			background: #f8f8f8;
+			color: #888;
+			cursor: pointer;
+			border: 1px solid #ddd;
+			span {
+				cursor: pointer;
+				padding: 10px 20px;
+			}
+			&.ui-state-hover, &.ui-state-active {
+				color: #000;
+				background-color: #e8e8e8;
+			}
+		}
+	}
+	.warning, .update, .error {
+		display: block;
+		padding: 10px;
+		background-color: rgba(0, 0, 0, 0.3);
+		color: #fff;
+		text-align: left;
+		border-radius: 3px;
+		cursor: default;
+	}
+	.update {
+		width: inherit;
+		text-align: center;
+		.appList {
+			list-style: disc;
+			text-align: left;
+			margin-left: 25px;
+			margin-right: 25px;
+		}
+	}
+	.v-align {
+		width: inherit;
+	}
+	.update img.float-spinner {
+		float: left;
+	}
+}
+
+/* Warnings and errors are the same */
+
+#body-user .warning, #body-settings .warning {
+	margin-top: 8px;
+	padding: 5px;
+	background: #fdd;
+	border-radius: 3px;
+}
+
+.warning {
+	legend, a {
+		color: #fff !important;
+		font-weight: 600 !important;
+	}
+}
+
+.error {
+	a {
+		color: #fff !important;
+		font-weight: 600 !important;
+		&.button {
+			color: #555 !important;
+			display: inline-block;
+			text-align: center;
+		}
+	}
+	pre {
+		white-space: pre-wrap;
+		text-align: left;
+	}
+}
+
+.error-wide {
+	width: 700px;
+	margin-left: -200px !important;
+	.button {
+		color: black !important;
+	}
+}
+
+.warning-input {
+	border-color: #ce3702 !important;
+}
+
+/* Fixes for log in page, TODO should be removed some time */
+
+#body-login {
+	ul.error-wide {
+		margin-top: 35px;
+	}
+	.warning {
+		margin: 0 7px 5px 4px;
+		legend {
+			-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+			opacity: 1;
+		}
+	}
+	a.warning {
+		cursor: pointer;
+	}
+	.updateProgress .error {
+		margin-top: 10px;
+		margin-bottom: 10px;
+	}
+}
+
+/* fixes for update page TODO should be fixed some time in a proper way */
+/* this is just for an error while updating the ownCloud instance */
+
+/* Alternative Logins */
+
+#alternative-logins {
+	legend {
+		margin-bottom: 10px;
+	}
+	li {
+		height: 40px;
+		display: inline-block;
+		white-space: nowrap;
+	}
+}
+
+/* Log in and install button */
+
+#body-login input {
+	font-size: 20px;
+	margin: 5px;
+	padding: 10px 10px 8px;
+	&[type='text'], &[type='password'] {
+		width: calc(100% - 10px); /* 5px margin */
+	}
+	&.login {
+		width: 269px;
+		background-position: right 16px center;
+	}
+	&[type='submit'] {
+		padding: 10px 20px;
+		/* larger log in and installation buttons */
+	}
+}
+
+#remember_login {
+	margin: 18px 5px 0 16px !important;
+}
+
+#body-login {
+	.remember-login-container {
+		display: inline-block;
+		margin: 10px 0;
+		text-align: center;
+		width: 100%;
+	}
+	#forgot-password {
+		padding: 11px;
+		float: right;
+		color: #fff;
+	}
+	.wrapper {
+		min-height: 100%;
+		margin: 0 auto -70px;
+		width: 300px;
+	}
+	footer, .push {
+		height: 70px;
+	}
+}
+
+/* Sticky footer */
+
+/* round profile photos */
+
+.avatar, .avatardiv {
+	border-radius: 50%;
+	flex-shrink: 0;
+	img {
+		border-radius: 50%;
+		flex-shrink: 0;
+	}
+}
+
+td.avatar {
+	border-radius: 0;
+}
+
+#notification-container {
+	position: absolute;
+	top: 0;
+	width: 100%;
+	text-align: center;
+}
+
+#notification {
+	margin: 0 auto;
+	max-width: 60%;
+	z-index: 8000;
+	background-color: #fff;
+	border: 0;
+	padding: 1px 8px;
+	display: none;
+	position: relative;
+	top: 0;
+	border-bottom-left-radius: 3px;
+	border-bottom-right-radius: 3px;
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=90)';
+	opacity: .9;
+	span {
+		cursor: pointer;
+		margin-left: 1em;
+	}
+	overflow-x: hidden;
+	overflow-y: auto;
+	max-height: 100px;
+	.row {
+		position: relative;
+		.close {
+			display: inline-block;
+			vertical-align: middle;
+			position: absolute;
+			right: 0;
+			top: 0;
+			margin-top: 2px;
+		}
+		&.closeable {
+			padding-right: 20px;
+		}
+	}
+}
+
+tr .action:not(.permanent), .selectedActions a {
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)';
+	opacity: 0;
+}
+
+tr {
+	&:hover .action, &:focus .action, .action.permanent {
+		-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)';
+		opacity: .5;
+	}
+}
+
+.selectedActions a {
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)';
+	opacity: .5;
+}
+
+tr .action {
+	width: 16px;
+	height: 16px;
+}
+
+.header-action {
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=80)';
+	opacity: .8;
+}
+
+tr {
+	&:hover .action:hover, &:focus .action:focus {
+		-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+		opacity: 1;
+	}
+}
+
+.selectedActions a {
+	&:hover, &:focus {
+		-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+		opacity: 1;
+	}
+}
+
+.header-action {
+	&:hover, &:focus {
+		-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=100)';
+		opacity: 1;
+	}
+}
+
+tbody tr {
+	&:hover, &:focus, &:active {
+		background-color: #f8f8f8;
+	}
+}
+
+code {
+	font-family: 'Lucida Console', 'Lucida Sans Typewriter', 'DejaVu Sans Mono', monospace;
+}
+
+#quota {
+	cursor: default;
+	margin: 30px !important;
+	position: relative;
+	padding: 0 !important;
+	div {
+		padding: 0;
+		background-color: rgb(220, 220, 220);
+		font-weight: normal;
+		white-space: nowrap;
+		border-bottom-left-radius: 3px;
+		border-top-left-radius: 3px;
+		min-width: 1%;
+		max-width: 100%;
+	}
+}
+
+#quotatext {
+	padding: .6em 1em;
+}
+
+#quota div.quota-warning {
+	background-color: #fc4;
+}
+
+.pager {
+	list-style: none;
+	float: right;
+	display: inline;
+	margin: .7em 13em 0 0;
+	li {
+		display: inline-block;
+	}
+}
+
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.separator {
+	display: inline;
+	border-left: 1px solid #d3d3d3;
+	border-right: 1px solid #fff;
+	height: 10px;
+	width: 0px;
+	margin: 4px;
+}
+
+a.bookmarklet {
+	background-color: #ddd;
+	border: 1px solid #ccc;
+	padding: 5px;
+	padding-top: 0px;
+	padding-bottom: 2px;
+	text-decoration: none;
+	margin-top: 5px;
+}
+
+.exception {
+	color: #000;
+	textarea {
+		width: 95%;
+		height: 200px;
+		background: #ffe;
+		border: 0;
+	}
+}
+
+.ui-icon-circle-triangle-e {
+	background-image: url('../img/actions/play-next.svg?v=1');
+}
+
+.ui-icon-circle-triangle-w {
+	background-image: url('../img/actions/play-previous.svg?v=1');
+}
+
+.ui-datepicker-prev, .ui-datepicker-next {
+	border: 1px solid #ddd;
+	background: #fff;
+}
+
+/* ---- DIALOGS ---- */
+
+#oc-dialog-filepicker-content {
+	.dirtree {
+		width: 92%;
+		float: left;
+		margin-left: 15px;
+		overflow: hidden;
+		div:first-child a {
+			background-image: url('../img/places/home.svg?v=1');
+			background-repeat: no-repeat;
+			background-position: left center;
+		}
+		span {
+			&:not(:last-child) {
+				cursor: pointer;
+			}
+			&:last-child {
+				font-weight: bold;
+			}
+			&:not(:last-child)::after {
+				content: '>';
+				padding: 3px;
+			}
+		}
+	}
+	.filelist-container {
+		box-sizing: border-box;
+		display: inline-block;
+		overflow-y: auto;
+		height: 100%;
+		/** overflow under the button row */
+		width: 100%;
+	}
+	.emptycontent {
+		color: #888;
+		text-align: center;
+		margin-top: 80px;
+		width: 100%;
+		display: none;
+	}
+	.filelist {
+		background-color: white;
+		width: 100%;
+	}
+	#filestable.filelist {
+		/* prevent the filepicker to overflow */
+		min-width: initial;
+		margin-bottom: 50px;
+	}
+	.filelist {
+		td {
+			padding: 14px;
+			border-bottom: 1px solid #eee;
+		}
+		tr:last-child td {
+			border-bottom: none;
+		}
+		.filename {
+			overflow: hidden;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			background-size: 32px;
+			background-repeat: no-repeat;
+			padding-left: 51px;
+			background-position: 7px 7px;
+			cursor: pointer;
+		}
+		.filesize, .date {
+			width: 80px;
+		}
+		.filesize {
+			text-align: right;
+		}
+	}
+	.filepicker_element_selected {
+		background-color: lightblue;
+	}
+}
+
+.ui-dialog {
+	position: fixed !important;
+}
+
+span.ui-icon {
+	float: left;
+	margin: 3px 7px 30px 0;
+}
+
+.move2trash {
+	/* decrease spinner size */
+	width: 16px;
+	height: 16px;
+}
+
+/* ---- TOOLTIPS ---- */
+
+.extra-data {
+	padding-right: 5px !important;
+}
+
+.tipsy-inner {
+	max-width: 400px !important;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+/* ---- TAGS ---- */
+
+#tagsdialog {
+	.content {
+		width: 100%;
+		height: 280px;
+	}
+	.scrollarea {
+		overflow: auto;
+		border: 1px solid #ddd;
+		width: 100%;
+		height: 240px;
+	}
+	.bottombuttons {
+		width: 100%;
+		height: 30px;
+		* {
+			float: left;
+		}
+	}
+	.taglist li {
+		background: #f8f8f8;
+		padding: .3em .8em;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		-webkit-transition: background-color 500ms;
+		transition: background-color 500ms;
+		&:hover, &:active {
+			background: #eee;
+		}
+	}
+	.addinput {
+		width: 90%;
+		clear: both;
+	}
+}
+
+/* ---- APP SETTINGS - LEGACY, DO NOT USE THE POPUP! ---- */
+
+.popup {
+	background-color: #fff;
+	border-radius: 3px;
+	box-shadow: 0 0 10px #aaa;
+	color: #333;
+	padding: 10px;
+	position: fixed !important;
+	z-index: 100;
+	&.topright {
+		top: 7em;
+		right: 1em;
+	}
+	&.bottomleft {
+		bottom: 1em;
+		left: 33em;
+	}
+	.close {
+		position: absolute;
+		top: 0.2em;
+		right: 0.2em;
+		height: 20px;
+		width: 20px;
+		background: url('../img/actions/close.svg?v=1') no-repeat center;
+	}
+	h2 {
+		font-size: 20px;
+	}
+}
+
+.arrow {
+	border-bottom: 10px solid white;
+	border-left: 10px solid transparent;
+	border-right: 10px solid transparent;
+	display: block;
+	height: 0;
+	position: absolute;
+	width: 0;
+	z-index: 201;
+	&.left {
+		left: -13px;
+		bottom: 1.2em;
+		-webkit-transform: rotate(270deg);
+		-ms-transform: rotate(270deg);
+		transform: rotate(270deg);
+	}
+	&.up {
+		top: -8px;
+		right: 6px;
+	}
+	&.down {
+		-webkit-transform: rotate(180deg);
+		-ms-transform: rotate(180deg);
+		transform: rotate(180deg);
+	}
+}
+
+/* ---- BREADCRUMB ---- */
+
+div.crumb {
+	float: left;
+	display: block;
+	background-image: url('../img/breadcrumb.svg?v=1');
+	background-repeat: no-repeat;
+	background-position: right center;
+	height: 44px;
+	background-size: auto 24px;
+	&.hidden {
+		display: none;
+	}
+	a, > span {
+		position: relative;
+		top: 12px;
+		padding: 14px 24px 14px 17px;
+		color: #555;
+	}
+	&.last a {
+		padding-right: 0;
+	}
+	&:first-child a {
+		position: relative;
+		top: 13px;
+		padding-right: 14px;
+	}
+	&.last {
+		font-weight: 600;
+		margin-right: 10px;
+	}
+	&.ellipsized {
+		padding: 0 10px 0 5px;
+	}
+	a.ellipsislink {
+		padding: 0 !important;
+		position: relative;
+		top: 8px !important;
+	}
+	&:hover, &:focus, a:focus, &:active {
+		-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=70)';
+		opacity: .7;
+	}
+}
+
+/* some feedback for hover/tap on breadcrumbs */
+
+.appear {
+	opacity: 1;
+	-webkit-transition: opacity 500ms ease 0s;
+	-moz-transition: opacity 500ms ease 0s;
+	-ms-transition: opacity 500ms ease 0s;
+	-o-transition: opacity 500ms ease 0s;
+	transition: opacity 500ms ease 0s;
+	&.transparent {
+		opacity: 0;
+	}
+}
+
+/* public footer */
+
+#body-public footer {
+	position: relative;
+	text-align: center;
+	.info {
+		color: #777;
+		text-align: center;
+		margin: 0 auto;
+		padding: 20px 0;
+		a {
+			color: #777;
+			font-weight: 600;
+			padding: 13px;
+			margin: -13px;
+		}
+	}
+}
+
+/* LEGACY FIX only - do not use fieldsets for settings */
+
+fieldset {
+	&.warning legend, &.update legend {
+		top: 18px;
+		position: relative;
+	}
+	&.warning legend + p, &.update legend + p {
+		margin-top: 12px;
+	}
+}
+
+/* for IE10 */
+@-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/css/systemtags.css b/core/css/systemtags.css
deleted file mode 100644
index d11dc741065..00000000000
--- a/core/css/systemtags.css
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2016
- *
- * This file is licensed under the Affero General Public License version 3
- * or later.
- *
- * See the COPYING-README file.
- *
- */
-
-.systemtags-select2-dropdown .select2-result-label .checkmark {
-	visibility: hidden;
-	margin-left: -5px;
-	margin-right: 5px;
-	padding: 4px;
-}
-
-.systemtags-select2-dropdown .select2-result-label .new-item .systemtags-actions {
-	display: none;
-}
-
-.systemtags-select2-dropdown .select2-selected .select2-result-label .checkmark {
-	visibility: visible;
-}
-
-.systemtags-select2-dropdown .select2-result-label .icon {
-	display: inline-block;
-	opacity: .5;
-}
-.systemtags-select2-dropdown .select2-result-label .icon.rename {
-	padding: 4px;
-}
-
-.systemtags-select2-dropdown .systemtags-actions {
-	position: absolute;
-	right: 5px;
-}
-
-.systemtags-select2-dropdown .systemtags-rename-form {
-	display: inline-block;
-	width: calc(100% - 20px);
-	top: -6px;
-	position: relative;
-}
-
-.systemtags-select2-dropdown .systemtags-rename-form input {
-	display: inline-block;
-	width: calc(100% - 40px);
-}
-
-.systemtags-select2-container {
-	width: 100%;
-}
-
-#select2-drop.systemtags-select2-dropdown .select2-results li.select2-result {
-	padding: 5px;
-}
-
-.systemtags-select2-dropdown span {
-	line-height: 25px;
-}
-
-.systemtags-select2-dropdown .systemtags-item {
-	display: inline-block;
-	height: 25px;
-	width: 100%;
-}
-
-.systemtags-select2-dropdown .select2-result-label {
-	height: 25px;
-}
-
-.systemtags-select2-container .select2-choices .select2-search-choice.select2-locked .label {
-	opacity: 0.5;
-}
-
-.systemtags-select2-dropdown .label {
-	width:85%;
-	display:-moz-inline-box;
-	display:inline-block;
-	overflow:hidden;
-	text-overflow:ellipsis;
-}
-.systemtags-select2-dropdown .label.hidden {
-	display: none;
-}
diff --git a/core/css/systemtags.scss b/core/css/systemtags.scss
new file mode 100644
index 00000000000..b32f33f36e5
--- /dev/null
+++ b/core/css/systemtags.scss
@@ -0,0 +1,81 @@
+/**
+ * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2016, Robin Appelman <robin@icewind.nl>
+ * @copyright Copyright (c) 2016, Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @copyright Copyright (c) 2016, Vincent Petry <pvince81@owncloud.com>
+ * @copyright Copyright (c) 2016, Erik Pellikka <erik@pellikka.org>
+ * @copyright Copyright (c) 2015, Vincent Petry <pvince81@owncloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ */
+
+.systemtags-select2-dropdown {
+	.select2-result-label {
+		.checkmark {
+			visibility: hidden;
+			margin-left: -5px;
+			margin-right: 5px;
+			padding: 4px;
+		}
+		.new-item .systemtags-actions {
+			display: none;
+		}
+	}
+	.select2-selected .select2-result-label .checkmark {
+		visibility: visible;
+	}
+	.select2-result-label .icon {
+		display: inline-block;
+		opacity: .5;
+		&.rename {
+			padding: 4px;
+		}
+	}
+	.systemtags-actions {
+		position: absolute;
+		right: 5px;
+	}
+	.systemtags-rename-form {
+		display: inline-block;
+		width: calc(100% - 20px);
+		top: -6px;
+		position: relative;
+		input {
+			display: inline-block;
+			width: calc(100% - 40px);
+		}
+	}
+	.label {
+		width: 85%;
+		display: -moz-inline-box;
+		display: inline-block;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		&.hidden {
+			display: none;
+		}
+	}
+	span {
+		line-height: 25px;
+	}
+	.systemtags-item {
+		display: inline-block;
+		height: 25px;
+		width: 100%;
+	}
+	.select2-result-label {
+		height: 25px;
+	}
+}
+
+.systemtags-select2-container {
+	width: 100%;
+	.select2-choices .select2-search-choice.select2-locked .label {
+		opacity: 0.5;
+	}
+}
+
+#select2-drop.systemtags-select2-dropdown .select2-results li.select2-result {
+	padding: 5px;
+}
diff --git a/core/css/tooltip.css b/core/css/tooltip.css
deleted file mode 100644
index e5a2f7b2145..00000000000
--- a/core/css/tooltip.css
+++ /dev/null
@@ -1,119 +0,0 @@
-/*!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
- * Copyright 2011-2015 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-.tooltip {
-  position: absolute;
-  display: block;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-style: normal;
-  font-weight: normal;
-  letter-spacing: normal;
-  line-break: auto;
-  line-height: 1.42857143;
-  text-align: left;
-  text-align: start;
-  text-decoration: none;
-  text-shadow: none;
-  text-transform: none;
-  white-space: normal;
-  word-break: normal;
-  word-spacing: normal;
-  word-wrap: normal;
-  font-size: 12px;
-  opacity: 0;
-  z-index: 100000;
-  filter: alpha(opacity=0);
-}
-.tooltip.in {
-  opacity: 0.9;
-  filter: alpha(opacity=90);
-}
-.tooltip.top {
-  margin-top: -3px;
-  padding: 5px 0;
-}
-.tooltip.right {
-  margin-left: 3px;
-  padding: 0 5px;
-}
-.tooltip.bottom {
-  margin-top: 3px;
-  padding: 5px 0;
-}
-.tooltip.left {
-  margin-left: -3px;
-  padding: 0 5px;
-}
-.tooltip-inner {
-  max-width: 350px;
-  padding: 3px 8px;
-  color: #ffffff;
-  text-align: center;
-  background-color: #000000;
-  border-radius: 4px;
-}
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-.tooltip.top .tooltip-arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-width: 5px 5px 0;
-  border-top-color: #000000;
-}
-.tooltip.top-left .tooltip-arrow {
-  bottom: 0;
-  right: 5px;
-  margin-bottom: -5px;
-  border-width: 5px 5px 0;
-  border-top-color: #000000;
-}
-.tooltip.top-right .tooltip-arrow {
-  bottom: 0;
-  left: 5px;
-  margin-bottom: -5px;
-  border-width: 5px 5px 0;
-  border-top-color: #000000;
-}
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-width: 5px 5px 5px 0;
-  border-right-color: #000000;
-}
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-width: 5px 0 5px 5px;
-  border-left-color: #000000;
-}
-.tooltip.bottom .tooltip-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000000;
-}
-.tooltip.bottom-left .tooltip-arrow {
-  top: 0;
-  right: 5px;
-  margin-top: -5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000000;
-}
-.tooltip.bottom-right .tooltip-arrow {
-  top: 0;
-  left: 5px;
-  margin-top: -5px;
-  border-width: 0 5px 5px;
-  border-bottom-color: #000000;
-}
diff --git a/core/css/tooltip.scss b/core/css/tooltip.scss
new file mode 100644
index 00000000000..263dad0b0c9
--- /dev/null
+++ b/core/css/tooltip.scss
@@ -0,0 +1,130 @@
+/**
+ * @copyright Copyright (c) 2016, John Molakvoæ <skjnldsv@protonmail.com>
+ * @copyright Copyright (c) 2016, Robin Appelman <robin@icewind.nl>
+ * @copyright Copyright (c) 2016, Jan-Christoph Borchardt <hey@jancborchardt.net>
+ * @copyright Copyright (c) 2016, Erik Pellikka <erik@pellikka.org>
+ * @copyright Copyright (c) 2015, Vincent Petry <pvince81@owncloud.com>
+ *
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
+.tooltip {
+	position: absolute;
+	display: block;
+	font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+	font-style: normal;
+	font-weight: normal;
+	letter-spacing: normal;
+	line-break: auto;
+	line-height: 1.42857143;
+	text-align: left;
+	text-align: start;
+	text-decoration: none;
+	text-shadow: none;
+	text-transform: none;
+	white-space: normal;
+	word-break: normal;
+	word-spacing: normal;
+	word-wrap: normal;
+	font-size: 12px;
+	opacity: 0;
+	z-index: 100000;
+	filter: alpha(opacity = 0);
+	&.in {
+		opacity: 0.9;
+		filter: alpha(opacity = 90);
+	}
+
+	&.top {
+		margin-top: -3px;
+		padding: 5px 0;
+	}
+	&.bottom {
+		margin-top: 3px;
+		padding: 5px 0;
+	}
+
+	&.right {
+		margin-left: 3px;
+		padding: 0 5px;
+		.tooltip-arrow {
+			top: 50%;
+			left: 0;
+			margin-top: -5px;
+			border-width: 5px 5px 5px 0;
+			border-right-color: #000000;
+		}
+	}
+	&.left {
+		margin-left: -3px;
+		padding: 0 5px;
+		.tooltip-arrow {
+			top: 50%;
+			right: 0;
+			margin-top: -5px;
+			border-width: 5px 0 5px 5px;
+			border-left-color: #000000;
+		}
+	}
+
+	/* TOP */
+	&.top .tooltip-arrow,
+	&.top-left .tooltip-arrow,
+	&.top-right .tooltip-arrow  {
+		bottom: 0;
+		border-width: 5px 5px 0;
+		border-top-color: #000000;
+	}
+	&.top .tooltip-arrow {
+		left: 50%;
+		margin-left: -5px;
+	}
+	&.top-left .tooltip-arrow {
+		right: 5px;
+		margin-bottom: -5px;
+	}
+	&.top-right .tooltip-arrow {
+		left: 5px;
+		margin-bottom: -5px;
+	}
+
+	/* BOTTOM */
+	&.bottom .tooltip-arrow,
+	&.bottom-left .tooltip-arrow,
+	&.bottom-right .tooltip-arrow  {
+		top: 0;
+		border-width: 0 5px 5px;
+		border-bottom-color: #000000;
+	}
+	&.bottom .tooltip-arrow {
+		left: 50%;
+		margin-left: -5px;
+	}
+	&.bottom-left .tooltip-arrow {
+		right: 5px;
+		margin-top: -5px;
+	}
+	&.bottom-right .tooltip-arrow {
+		left: 5px;
+		margin-top: -5px;
+	}
+}
+
+.tooltip-inner {
+	max-width: 350px;
+	padding: 3px 8px;
+	color: #ffffff;
+	text-align: center;
+	background-color: #000000;
+	border-radius: 4px;
+}
+
+.tooltip-arrow {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-color: transparent;
+	border-style: solid;
+}
diff --git a/core/css/update.css b/core/css/update.css
deleted file mode 100644
index 12cda3d5bbd..00000000000
--- a/core/css/update.css
+++ /dev/null
@@ -1,33 +0,0 @@
-#update-progress-icon {
-	height: 32px;
-	margin: 10px;
-	background-size: 32px;
-}
-
-#update-progress-message-error,
-#update-progress-message-warnings {
-	font-weight: 600;
-	margin-bottom: 10px;
-}
-
-#update-progress-message {
-	margin-bottom: 10px;
-}
-
-.update-show-detailed {
-	padding: 13px;
-	display: block;
-	opacity: .75;
-}
-
-#body-login .update a.update-show-detailed {
-	border-bottom: inherit;
-}
-
-#update-progress-detailed {
-	text-align: left;
-}
-
-#body-login .warning.hidden {
-	display: none;
-}
diff --git a/core/img/actions/checkbox-checked-disabled.svg b/core/img/actions/checkbox-checked-disabled.svg
deleted file mode 100644
index 8b0118da343..00000000000
--- a/core/img/actions/checkbox-checked-disabled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2.5 2.5h11v11h-11z" fill="#fff"/><path d="M3 2c-.554 0-1 .446-1 1v10c0 .554.446 1 1 1h10c.554 0 1-.446 1-1V3c0-.554-.446-1-1-1H3zm8.924 2.066l1.433 1.432-6.365 6.365L2.75 7.62l1.414-1.415 2.828 2.83 4.932-4.97z" fill="#969696"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/checkbox-checked-white.svg b/core/img/actions/checkbox-checked-white.svg
deleted file mode 100644
index 8043bd463be..00000000000
--- a/core/img/actions/checkbox-checked-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M3 2c-.554 0-1 .446-1 1v10c0 .554.446 1 1 1h10c.554 0 1-.446 1-1V3c0-.554-.446-1-1-1H3zm8.924 2.066l1.433 1.432-6.365 6.365L2.75 7.62l1.414-1.415 2.828 2.83 4.932-4.97z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/checkbox-checked.svg b/core/img/actions/checkbox-checked.svg
deleted file mode 100644
index bd9241d664c..00000000000
--- a/core/img/actions/checkbox-checked.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2.5 2.5h11v11h-11z" fill="#fff"/><path d="M3 2c-.554 0-1 .446-1 1v10c0 .554.446 1 1 1h10c.554 0 1-.446 1-1V3c0-.554-.446-1-1-1H3zm8.924 2.066l1.433 1.432-6.365 6.365L2.75 7.62l1.414-1.415 2.828 2.83 4.932-4.97z" fill="#0082c9"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/checkbox-disabled-white.svg b/core/img/actions/checkbox-disabled-white.svg
deleted file mode 100644
index c5cf4a66585..00000000000
--- a/core/img/actions/checkbox-disabled-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2.5 2.5h11v11h-11z" fill="#dcdcdc"/><path d="M3 2c-.554 0-1 .446-1 1v10c0 .554.446 1 1 1h10c.554 0 1-.446 1-1V3c0-.554-.446-1-1-1H3zm0 1h10v10H3V3z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/checkbox-disabled.svg b/core/img/actions/checkbox-disabled.svg
deleted file mode 100644
index fa73b4f4352..00000000000
--- a/core/img/actions/checkbox-disabled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2.5 2.5h11v11h-11z" fill="#dcdcdc"/><path d="M3 2c-.554 0-1 .446-1 1v10c0 .554.446 1 1 1h10c.554 0 1-.446 1-1V3c0-.554-.446-1-1-1H3zm0 1h10v10H3V3z" fill="#969696"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/checkbox-mark-white.svg b/core/img/actions/checkbox-mark-white.svg
new file mode 100644
index 00000000000..8407898164b
--- /dev/null
+++ b/core/img/actions/checkbox-mark-white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M11.924 4.066l-4.932 4.97-2.828-2.83L2.75 7.618l4.242 4.243 6.365-6.365-1.433-1.432z"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/checkbox-mark.svg b/core/img/actions/checkbox-mark.svg
new file mode 100644
index 00000000000..1013b6cc3f2
--- /dev/null
+++ b/core/img/actions/checkbox-mark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M11.924 4.066l-4.932 4.97-2.828-2.83L2.75 7.618l4.242 4.243 6.365-6.365-1.433-1.432z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/checkbox-mixed-disabled.svg b/core/img/actions/checkbox-mixed-disabled.svg
deleted file mode 100644
index 2e8e98fb9fc..00000000000
--- a/core/img/actions/checkbox-mixed-disabled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2.5 2.5h11v11h-11z" fill="#dcdcdc"/><path d="M3 2c-.554 0-1 .446-1 1v10c0 .554.446 1 1 1h10c.554 0 1-.446 1-1V3c0-.554-.446-1-1-1H3zm0 1h10v10H3V3z" fill="#969696"/><path d="M4 7h8v2H4z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/checkbox-mixed-white.svg b/core/img/actions/checkbox-mixed-white.svg
index ca7d92bbeed..c66636717be 100644
--- a/core/img/actions/checkbox-mixed-white.svg
+++ b/core/img/actions/checkbox-mixed-white.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M3 2c-.554 0-1 .446-1 1v10c0 .554.446 1 1 1h10c.554 0 1-.446 1-1V3c0-.554-.446-1-1-1H3zm1 5h8v2H4V7z" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M4 7v2h8V7H4z"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/checkbox-mixed.svg b/core/img/actions/checkbox-mixed.svg
index 8a1412bf849..308baae3920 100644
--- a/core/img/actions/checkbox-mixed.svg
+++ b/core/img/actions/checkbox-mixed.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2.5 2.5h11v11h-11z" fill="#fff"/><path d="M3 2c-.554 0-1 .446-1 1v10c0 .554.446 1 1 1h10c.554 0 1-.446 1-1V3c0-.554-.446-1-1-1H3zm1 5h8v2H4V7z" fill="#969696"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path d="M4 7v2h8V7H4z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/checkbox-white.svg b/core/img/actions/checkbox-white.svg
deleted file mode 100644
index 1a0cd569e1c..00000000000
--- a/core/img/actions/checkbox-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M3 2c-.554 0-1 .446-1 1v10c0 .554.446 1 1 1h10c.554 0 1-.446 1-1V3c0-.554-.446-1-1-1H3zm0 1h10v10H3V3z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/checkbox.svg b/core/img/actions/checkbox.svg
deleted file mode 100644
index 46cad084ab5..00000000000
--- a/core/img/actions/checkbox.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M2.5 2.5h11v11h-11z" fill="#fff"/><path d="M3 2c-.554 0-1 .446-1 1v10c0 .554.446 1 1 1h10c.554 0 1-.446 1-1V3c0-.554-.446-1-1-1H3zm0 1h10v10H3V3z" fill="#969696"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/close-white.svg b/core/img/actions/close-white.svg
new file mode 100644
index 00000000000..cd2a8c62468
--- /dev/null
+++ b/core/img/actions/close-white.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1">
+ <path fill="#fff" d="m12.95 11.536l-1.414 1.414-3.536-3.536-3.535 3.536-1.415-1.414 3.536-3.536-3.536-3.536 1.415-1.414 3.535 3.536 3.516-3.555 1.434 1.434-3.536 3.535z"/>
+</svg>
diff --git a/core/img/actions/radio-checked-disabled.svg b/core/img/actions/radio-checked-disabled.svg
deleted file mode 100644
index 470293c2960..00000000000
--- a/core/img/actions/radio-checked-disabled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M8 1.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13z" fill="#fff"/><path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="#969696"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/radio-checked-white.svg b/core/img/actions/radio-checked-white.svg
deleted file mode 100644
index d024c91ff19..00000000000
--- a/core/img/actions/radio-checked-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/radio-checked.svg b/core/img/actions/radio-checked.svg
deleted file mode 100644
index bb4c622a9f7..00000000000
--- a/core/img/actions/radio-checked.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M8 1.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13z" fill="#fff"/><path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6zm0 2a4 4 0 1 0 0 8 4 4 0 0 0 0-8z" fill="#0082c9"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/radio-disabled.svg b/core/img/actions/radio-disabled.svg
deleted file mode 100644
index e6bf778f192..00000000000
--- a/core/img/actions/radio-disabled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M8 1.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13z" fill="#dcdcdc"/><path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6z" fill="#969696"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/radio-white.svg b/core/img/actions/radio-white.svg
deleted file mode 100644
index 0eda991c4d3..00000000000
--- a/core/img/actions/radio-white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/radio.svg b/core/img/actions/radio.svg
deleted file mode 100644
index 31a364b88e0..00000000000
--- a/core/img/actions/radio.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16"><path d="M8 1.5a6.5 6.5 0 1 0 0 13 6.5 6.5 0 0 0 0-13z" fill="#fff"/><path d="M8 1a7 7 0 0 0-7 7 7 7 0 0 0 7 7 7 7 0 0 0 7-7 7 7 0 0 0-7-7zm0 1a6 6 0 0 1 6 6 6 6 0 0 1-6 6 6 6 0 0 1-6-6 6 6 0 0 1 6-6z" fill="#969696"/></svg>
\ No newline at end of file
diff --git a/core/img/actions/settings-dark.svg b/core/img/actions/settings-dark.svg
new file mode 100644
index 00000000000..2160b673e30
--- /dev/null
+++ b/core/img/actions/settings-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1"><path d="M6.938 0A.43.43 0 0 0 6.5.438v1.25a5.818 5.818 0 0 0-1.53.656l-.907-.906a.436.436 0 0 0-.625 0l-1.5 1.5a.436.436 0 0 0 0 .624l.906.907c-.285.48-.514.976-.656 1.53H.938a.43.43 0 0 0-.438.438v2.125C.5 8.81.69 9 .938 9h1.25a5.82 5.82 0 0 0 .656 1.53l-.907.908a.436.436 0 0 0 0 .625l1.5 1.5c.176.176.45.176.625 0l.907-.907c.48.285.976.514 1.53.656v1.25c0 .25.19.438.437.438h2.125a.43.43 0 0 0 .438-.438v-1.25a5.82 5.82 0 0 0 1.53-.657l.907.907c.176.175.45.175.625 0l1.5-1.5a.436.436 0 0 0 0-.625l-.906-.906A5.79 5.79 0 0 0 13.812 9h1.25a.43.43 0 0 0 .438-.438V6.437A.43.43 0 0 0 15.062 6h-1.25a5.79 5.79 0 0 0-.656-1.532l.906-.906a.436.436 0 0 0 0-.625l-1.5-1.5a.436.436 0 0 0-.625 0l-.906.906a5.816 5.816 0 0 0-1.53-.656V.437A.43.43 0 0 0 9.063 0zM8 4.157a3.344 3.344 0 0 1 0 6.686 3.344 3.344 0 0 1 0-6.686z" display="block"/></svg>
diff --git a/core/js/files/client.js b/core/js/files/client.js
index 87559b2084c..cde3afde9d7 100644
--- a/core/js/files/client.js
+++ b/core/js/files/client.js
@@ -31,9 +31,9 @@
 			this._root = this._root.substr(0, this._root.length - 1);
 		}
 
-		var url = 'http://';
+		var url = Client.PROTOCOL_HTTP + '://';
 		if (options.useHTTPS) {
-			url = 'https://';
+			url = Client.PROTOCOL_HTTPS + '://';
 		}
 
 		url += options.host + this._root;
@@ -64,6 +64,19 @@
 	Client.NS_OWNCLOUD = 'http://owncloud.org/ns';
 	Client.NS_NEXTCLOUD = 'http://nextcloud.org/ns';
 	Client.NS_DAV = 'DAV:';
+
+	Client.PROPERTY_GETLASTMODIFIED	= '{' + Client.NS_DAV + '}getlastmodified';
+	Client.PROPERTY_GETETAG	= '{' + Client.NS_DAV + '}getetag';
+	Client.PROPERTY_GETCONTENTTYPE	= '{' + Client.NS_DAV + '}getcontenttype';
+	Client.PROPERTY_RESOURCETYPE	= '{' + Client.NS_DAV + '}resourcetype';
+	Client.PROPERTY_INTERNAL_FILEID	= '{' + Client.NS_OWNCLOUD + '}fileid';
+	Client.PROPERTY_PERMISSIONS	= '{' + Client.NS_OWNCLOUD + '}permissions';
+	Client.PROPERTY_SIZE	= '{' + Client.NS_OWNCLOUD + '}size';
+	Client.PROPERTY_GETCONTENTLENGTH	= '{' + Client.NS_DAV + '}getcontentlength';
+
+	Client.PROTOCOL_HTTP	= 'http';
+	Client.PROTOCOL_HTTPS	= 'https';
+
 	Client._PROPFIND_PROPERTIES = [
 		/**
 		 * Modified time
@@ -259,23 +272,23 @@
 			var props = response.propStat[0].properties;
 
 			var data = {
-				id: props['{' + Client.NS_OWNCLOUD + '}fileid'],
+				id: props[Client.PROPERTY_INTERNAL_FILEID],
 				path: OC.dirname(path) || '/',
 				name: OC.basename(path),
-				mtime: (new Date(props['{' + Client.NS_DAV + '}getlastmodified'])).getTime()
+				mtime: (new Date(props[Client.PROPERTY_GETLASTMODIFIED])).getTime()
 			};
 
-			var etagProp = props['{' + Client.NS_DAV + '}getetag'];
+			var etagProp = props[Client.PROPERTY_GETETAG];
 			if (!_.isUndefined(etagProp)) {
 				data.etag = this._parseEtag(etagProp);
 			}
 
-			var sizeProp = props['{' + Client.NS_DAV + '}getcontentlength'];
+			var sizeProp = props[Client.PROPERTY_GETCONTENTLENGTH];
 			if (!_.isUndefined(sizeProp)) {
 				data.size = parseInt(sizeProp, 10);
 			}
 
-			sizeProp = props['{' + Client.NS_OWNCLOUD + '}size'];
+			sizeProp = props[Client.PROPERTY_SIZE];
 			if (!_.isUndefined(sizeProp)) {
 				data.size = parseInt(sizeProp, 10);
 			}
@@ -294,12 +307,12 @@
 				data.isFavorite = false;
 			}
 
-			var contentType = props['{' + Client.NS_DAV + '}getcontenttype'];
+			var contentType = props[Client.PROPERTY_GETCONTENTTYPE];
 			if (!_.isUndefined(contentType)) {
 				data.mimetype = contentType;
 			}
 
-			var resType = props['{' + Client.NS_DAV + '}resourcetype'];
+			var resType = props[Client.PROPERTY_RESOURCETYPE];
 			var isFile = true;
 			if (!data.mimetype && resType) {
 				var xmlvalue = resType[0];
@@ -310,7 +323,7 @@
 			}
 
 			data.permissions = OC.PERMISSION_READ;
-			var permissionProp = props['{' + Client.NS_OWNCLOUD + '}permissions'];
+			var permissionProp = props[Client.PROPERTY_PERMISSIONS];
 			if (!_.isUndefined(permissionProp)) {
 				var permString = permissionProp || '';
 				data.mountType = null;
@@ -752,7 +765,7 @@
 		},
 
 		/**
-		 * Returns the password 
+		 * Returns the password
 		 *
 		 * @since 11.0.0
 		 * @return {String} password
@@ -816,4 +829,3 @@
 
 	OC.Files.Client = Client;
 })(OC, OC.Files.FileInfo);
-
diff --git a/core/js/js.js b/core/js/js.js
index 972f0e63144..3651635541a 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1669,6 +1669,52 @@ OC.Util = {
 	humanFileSize: humanFileSize,
 
 	/**
+	 * Returns a file size in bytes from a humanly readable string
+	 * Makes 2kB to 2048.
+	 * Inspired by computerFileSize in helper.php
+	 * @param  {string} string file size in human readable format
+	 * @return {number} or null if string could not be parsed
+	 *
+	 *
+	 */
+	computerFileSize: function (string) {
+		if (typeof string != 'string') {
+			return null;
+		}
+
+		var s = string.toLowerCase();
+		var bytes = parseFloat(s)
+
+		if (!isNaN(bytes) && isFinite(s)) {
+			return bytes;
+		}
+
+		var bytesArray = {
+			'b' : 1,
+			'k' : 1024,
+			'kb': 1024,
+			'mb': 1024 * 1024,
+			'm' : 1024 * 1024,
+			'gb': 1024 * 1024 * 1024,
+			'g' : 1024 * 1024 * 1024,
+			'tb': 1024 * 1024 * 1024 * 1024,
+			't' : 1024 * 1024 * 1024 * 1024,
+			'pb': 1024 * 1024 * 1024 * 1024 * 1024,
+			'p' : 1024 * 1024 * 1024 * 1024 * 1024
+		};
+
+		var matches = s.match(/([kmgtp]?b?)$/i);
+		if (matches[1]) {
+			bytes = bytes * bytesArray[matches[1]];
+		} else {
+			return null;
+		}
+
+		bytes = Math.round(bytes);
+		return bytes;
+	},
+
+	/**
 	 * @param timestamp
 	 * @param format
 	 * @returns {string} timestamp formatted as requested
diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index 30d7b98f4e8..6e18dcc1f8b 100644
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -4,7 +4,7 @@ OC.Lostpassword = {
 
 	sendSuccessMsg : t('core', '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.'),
 
-	encryptedMsg : t('core', "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?")
+	encryptedMsg : t('core', "Your files are encrypted. 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?")
 			+ ('<br /><input type="checkbox" id="encrypted-continue" value="Yes" />')
 			+ '<label for="encrypted-continue">'
 			+ t('core', 'I know what I\'m doing')
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js
index e1b9dba14af..89558e21086 100644
--- a/core/js/mimetypelist.js
+++ b/core/js/mimetypelist.js
@@ -86,6 +86,7 @@ OC.MimeTypeList={
     "text/x-c": "text/code",
     "text/x-c++src": "text/code",
     "text/x-h": "text/code",
+    "text/x-ldif": "text/code",
     "text/x-java-source": "text/code",
     "text/x-python": "text/code",
     "text/x-shellscript": "text/code",
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index cb553947de6..84a3d18942f 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -43,6 +43,13 @@
 			'</div>' +
 			'        {{/if}}' +
 			'    {{/if}}' +
+			'     {{#if publicEditing}}' +
+			'<div id="allowPublicEditingWrapper">' +
+			'    <span class="icon-loading-small hidden"></span>' +
+			'    <input type="checkbox" value="1" name="allowPublicEditing" id="sharingDialogAllowPublicEditing-{{cid}}" class="checkbox publicEditingCheckbox" {{{publicEditingChecked}}} />' +
+			'<label for="sharingDialogAllowPublicEditing-{{cid}}">{{publicEditingLabel}}</label>' +
+			'</div>' +
+			'    {{/if}}' +
 			'    {{#if showPasswordCheckBox}}' +
 			'<input type="checkbox" name="showPassword" id="showPassword-{{cid}}" class="checkbox showPasswordCheckbox" {{#if isPasswordSet}}checked="checked"{{/if}} value="1" />' +
 			'<label for="showPassword-{{cid}}">{{enablePasswordLabel}}</label>' +
@@ -87,6 +94,7 @@
 			'click .linkCheckbox': 'onLinkCheckBoxChange',
 			'click .linkText': 'onLinkTextClick',
 			'change .publicUploadCheckbox': 'onAllowPublicUploadChange',
+			'change .publicEditingCheckbox': 'onAllowPublicEditingChange',
 			'change .hideFileListCheckbox': 'onHideFileListChange',
 			'click .showPasswordCheckbox': 'onShowPasswordClick'
 		},
@@ -128,7 +136,8 @@
 				'onLinkTextClick',
 				'onShowPasswordClick',
 				'onHideFileListChange',
-				'onAllowPublicUploadChange'
+				'onAllowPublicUploadChange',
+				'onAllowPublicEditingChange'
 			);
 
 			var clipboard = new Clipboard('.clipboardButton');
@@ -266,6 +275,20 @@
 			});
 		},
 
+		onAllowPublicEditingChange: function() {
+			var $checkbox = this.$('.publicEditingCheckbox');
+			$checkbox.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock');
+
+			var permissions = OC.PERMISSION_READ;
+			if($checkbox.is(':checked')) {
+				permissions = OC.PERMISSION_UPDATE | OC.PERMISSION_READ;
+			}
+
+			this.model.saveLinkShare({
+				permissions: permissions
+			});
+		},
+
 		onHideFileListChange: function () {
 			var $checkbox = this.$('.hideFileListCheckbox');
 			$checkbox.siblings('.icon-loading-small').removeClass('hidden').addClass('inlineblock');
@@ -307,6 +330,12 @@
 				publicUploadChecked = 'checked="checked"';
 			}
 
+			var publicEditingChecked = '';
+			if(this.model.isPublicEditingAllowed()) {
+				publicEditingChecked = 'checked="checked"';
+			}
+
+
 			var hideFileList = publicUploadChecked;
 
 			var hideFileListChecked = '';
@@ -320,6 +349,11 @@
 				&& (   !this.configModel.get('enforcePasswordForPublicLink')
 					|| !this.model.get('linkShare').password);
 
+			var publicEditable =
+				!this.model.isFolder()
+				&& isLinkShare
+				&& this.model.updatePermissionPossible();
+
 			this.$el.html(linkShareTemplate({
 				cid: this.cid,
 				shareAllowed: true,
@@ -337,6 +371,9 @@
 				publicUploadChecked: publicUploadChecked,
 				hideFileListChecked: hideFileListChecked,
 				publicUploadLabel: t('core', 'Allow upload and editing'),
+				publicEditing: publicEditable,
+				publicEditingChecked: publicEditingChecked,
+				publicEditingLabel: t('core', 'Allow editing'),
 				hideFileListLabel: t('core', 'File drop (upload only)'),
 				mailPrivatePlaceholder: t('core', 'Email link to person'),
 				mailButtonText: t('core', 'Send')
diff --git a/core/js/sharedialogresharerinfoview.js b/core/js/sharedialogresharerinfoview.js
index 654eebf4997..9a9d95cfb60 100644
--- a/core/js/sharedialogresharerinfoview.js
+++ b/core/js/sharedialogresharerinfoview.js
@@ -80,7 +80,7 @@
 					'core',
 					'Shared with you and the group {group} by {owner}',
 					{
-						group: this.model.getReshareWith(),
+						group: this.model.getReshareWithDisplayName(),
 						owner: ownerDisplayName
 					}
 				);
diff --git a/core/js/sharedialogshareelistview.js b/core/js/sharedialogshareelistview.js
index a0a7bbfa2dc..4647dedd722 100644
--- a/core/js/sharedialogshareelistview.js
+++ b/core/js/sharedialogshareelistview.js
@@ -35,47 +35,7 @@
 						'{{/unless}}' +
 						'{{/if}}' +
 						'<a href="#"><span class="icon icon-more"></span></a>' +
-						'<div class="popovermenu bubble hidden menu">' +
-							'<ul>' +
-								'{{#if isResharingAllowed}} {{#if sharePermissionPossible}} {{#unless isMailShare}}' +
-								'<li>' +
-									'<span class="shareOption">' +
-										'<input id="canShare-{{cid}}-{{shareWith}}" type="checkbox" name="share" class="permissions checkbox" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />' +
-										'<label for="canShare-{{cid}}-{{shareWith}}">{{canShareLabel}}</label>' +
-									'</span>' +
-								'</li>' +
-								'{{/unless}} {{/if}} {{/if}}' +
-								'{{#if isFolder}}' +
-									'{{#if createPermissionPossible}}{{#unless isMailShare}}' +
-									'<li>' +
-										'<span class="shareOption">' +
-											'<input id="canCreate-{{cid}}-{{shareWith}}" type="checkbox" name="create" class="permissions checkbox" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>' +
-											'<label for="canCreate-{{cid}}-{{shareWith}}">{{createPermissionLabel}}</label>' +
-										'</span>' +
-									'</li>' +
-									'{{/unless}}{{/if}}' +
-									'{{#if updatePermissionPossible}}{{#unless isMailShare}}' +
-									'<li>' +
-										'<span class="shareOption">' +
-											'<input id="canUpdate-{{cid}}-{{shareWith}}" type="checkbox" name="update" class="permissions checkbox" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>' +
-											'<label for="canUpdate-{{cid}}-{{shareWith}}">{{updatePermissionLabel}}</label>' +
-										'</span>' +
-									'</li>' +
-									'{{/unless}}{{/if}}' +
-									'{{#if deletePermissionPossible}}{{#unless isMailShare}}' +
-									'<li>' +
-										'<span class="shareOption">' +
-											'<input id="canDelete-{{cid}}-{{shareWith}}" type="checkbox" name="delete" class="permissions checkbox" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>' +
-											'<label for="canDelete-{{cid}}-{{shareWith}}">{{deletePermissionLabel}}</label>' +
-										'</span>' +
-									'</li>' +
-									'{{/unless}}{{/if}}' +
-								'{{/if}}' +
-								'<li>' +
-									'<a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span>{{unshareLabel}}</span></a>' +
-								'</li>' +
-							'</ul>' +
-						'</div>' +
+						'{{{popoverMenu}}}' +
 					'</span>' +
 				'</li>' +
 			'{{/each}}' +
@@ -94,6 +54,49 @@
 			'</ul>'
 		;
 
+	var TEMPLATE_POPOVER_MENU =
+		'<div class="popovermenu bubble hidden menu">' +
+			'<ul>' +
+				'{{#if isResharingAllowed}} {{#if sharePermissionPossible}} {{#unless isMailShare}}' +
+				'<li>' +
+					'<span class="shareOption menuitem">' +
+						'<input id="canShare-{{cid}}-{{shareWith}}" type="checkbox" name="share" class="permissions checkbox" {{#if hasSharePermission}}checked="checked"{{/if}} data-permissions="{{sharePermission}}" />' +
+						'<label for="canShare-{{cid}}-{{shareWith}}">{{canShareLabel}}</label>' +
+					'</span>' +
+				'</li>' +
+				'{{/unless}} {{/if}} {{/if}}' +
+				'{{#if isFolder}}' +
+					'{{#if createPermissionPossible}}{{#unless isMailShare}}' +
+					'<li>' +
+						'<span class="shareOption menuitem">' +
+							'<input id="canCreate-{{cid}}-{{shareWith}}" type="checkbox" name="create" class="permissions checkbox" {{#if hasCreatePermission}}checked="checked"{{/if}} data-permissions="{{createPermission}}"/>' +
+							'<label for="canCreate-{{cid}}-{{shareWith}}">{{createPermissionLabel}}</label>' +
+						'</span>' +
+					'</li>' +
+					'{{/unless}}{{/if}}' +
+					'{{#if updatePermissionPossible}}{{#unless isMailShare}}' +
+					'<li>' +
+						'<span class="shareOption menuitem">' +
+							'<input id="canUpdate-{{cid}}-{{shareWith}}" type="checkbox" name="update" class="permissions checkbox" {{#if hasUpdatePermission}}checked="checked"{{/if}} data-permissions="{{updatePermission}}"/>' +
+							'<label for="canUpdate-{{cid}}-{{shareWith}}">{{updatePermissionLabel}}</label>' +
+						'</span>' +
+					'</li>' +
+					'{{/unless}}{{/if}}' +
+					'{{#if deletePermissionPossible}}{{#unless isMailShare}}' +
+					'<li>' +
+						'<span class="shareOption menuitem">' +
+							'<input id="canDelete-{{cid}}-{{shareWith}}" type="checkbox" name="delete" class="permissions checkbox" {{#if hasDeletePermission}}checked="checked"{{/if}} data-permissions="{{deletePermission}}"/>' +
+							'<label for="canDelete-{{cid}}-{{shareWith}}">{{deletePermissionLabel}}</label>' +
+						'</span>' +
+					'</li>' +
+					'{{/unless}}{{/if}}' +
+				'{{/if}}' +
+				'<li>' +
+					'<a href="#" class="unshare"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span>{{unshareLabel}}</span></a>' +
+				'</li>' +
+			'</ul>' +
+		'</div>';
+
 	/**
 	 * @class OCA.Share.ShareDialogShareeListView
 	 * @member {OC.Share.ShareItemModel} model
@@ -114,8 +117,14 @@
 		/** @type {Function} **/
 		_template: undefined,
 
+		/** @type {Function} **/
+		_popoverMenuTemplate: undefined,
+
 		_menuOpen: false,
 
+		/** @type {boolean|number} **/
+		_renderPermissionChange: false,
+
 		events: {
 			'click .unshare': 'onUnshare',
 			'click .icon-more': 'onToggleMenu',
@@ -182,8 +191,8 @@
 			});
 		},
 
-		getShareeList: function() {
-			var universal = {
+		getShareProperties: function() {
+			return {
 				avatarEnabled: this.configModel.areAvatarsEnabled(),
 				unshareLabel: t('core', 'Unshare'),
 				canShareLabel: t('core', 'can reshare'),
@@ -205,6 +214,15 @@
 				deletePermission: OC.PERMISSION_DELETE,
 				isFolder: this.model.isFolder()
 			};
+		},
+
+		/**
+		 * get an array of sharees' share properties
+		 *
+		 * @returns {Array}
+		 */
+		getShareeList: function() {
+			var universal = this.getShareProperties();
 
 			if(!this.model.hasUserShares()) {
 				return [];
@@ -256,29 +274,45 @@
 		},
 
 		render: function() {
-			this.$el.html(this.template({
-				cid: this.cid,
-				sharees: this.getShareeList(),
-				linkReshares: this.getLinkReshares()
-			}));
-
-			if(this.configModel.areAvatarsEnabled()) {
-				this.$('.avatar').each(function() {
-					var $this = $(this);
-					if ($this.hasClass('imageplaceholderseed')) {
-						$this.css({width: 32, height: 32});
-						$this.imageplaceholder($this.data('seed'));
-					} else {
-						//                         user,   size,  ie8fix, hidedefault,  callback, displayname
-						$this.avatar($this.data('username'), 32, undefined, undefined, undefined, $this.data('displayname'));
-					}
+			if(!this._renderPermissionChange) {
+				this.$el.html(this.template({
+					cid: this.cid,
+					sharees: this.getShareeList(),
+					linkReshares: this.getLinkReshares()
+				}));
+
+				if (this.configModel.areAvatarsEnabled()) {
+					this.$('.avatar').each(function () {
+						var $this = $(this);
+						if ($this.hasClass('imageplaceholderseed')) {
+							$this.css({width: 32, height: 32});
+							$this.imageplaceholder($this.data('seed'));
+						} else {
+						    //                         user,   size,  ie8fix, hidedefault,  callback, displayname
+							$this.avatar($this.data('username'), 32, undefined, undefined, undefined, $this.data('displayname'));
+						}
+					});
+				}
+
+				this.$('.has-tooltip').tooltip({
+					placement: 'bottom'
 				});
+			} else {
+				var permissionChangeShareId = parseInt(this._renderPermissionChange, 10);
+				var shareWithIndex = this.model.findShareWithIndex(permissionChangeShareId);
+				var sharee = this.getShareeObject(shareWithIndex);
+				$.extend(sharee, this.getShareProperties());
+				var $li = this.$('li[data-share-id=' + permissionChangeShareId + ']');
+				$li.find('.popovermenu').replaceWith(this.popoverMenuTemplate(sharee));
+
+				var checkBoxId = 'canEdit-' + this.cid + '-' + sharee.shareWith;
+				checkBoxId = '#' + checkBoxId.replace( /(:|\.|\[|\]|,|=|@)/g, "\\$1");
+				var $edit = $li.parent().find(checkBoxId);
+				if($edit.length === 1) {
+					$edit.prop('checked', sharee.hasEditPermission);
+				}
 			}
 
-			this.$('.has-tooltip').tooltip({
-				placement: 'bottom'
-			});
-
 			var _this = this;
 			this.$('.popovermenu').on('afterHide', function() {
 				_this._menuOpen = false;
@@ -292,6 +326,8 @@
 				}
 			}
 
+			this._renderPermissionChange = false;
+
 			this.delegateEvents();
 
 			return this;
@@ -305,9 +341,28 @@
 			if (!this._template) {
 				this._template = Handlebars.compile(TEMPLATE);
 			}
+			var sharees = data.sharees;
+			if(_.isArray(sharees)) {
+				for (var i = 0; i < sharees.length; i++) {
+					data.sharees[i].popoverMenu = this.popoverMenuTemplate(sharees[i]);
+				}
+			}
 			return this._template(data);
 		},
 
+		/**
+		 * renders the popover template and returns the resulting HTML
+		 *
+		 * @param {Object} data
+		 * @returns {string}
+		 */
+		popoverMenuTemplate: function(data) {
+			if(!this._popoverMenuTemplate) {
+				this._popoverMenuTemplate = Handlebars.compile(TEMPLATE_POPOVER_MENU);
+			}
+			return this._popoverMenuTemplate(data);
+		},
+
 		onUnshare: function(event) {
 			event.preventDefault();
 			event.stopPropagation();
@@ -385,7 +440,20 @@
 				permissions |= $(checkbox).data('permissions');
 			});
 
-			this.model.updateShare(shareId, {permissions: permissions});
+
+			/** disable checkboxes during save operation to avoid race conditions **/
+			$li.find('input[type=checkbox]').prop('disabled', true);
+			var enableCb = function() {
+				$li.find('input[type=checkbox]').prop('disabled', false);
+			};
+			var errorCb = function(elem, msg) {
+				OC.dialogs.alert(msg, t('core', 'Error while sharing'));
+				enableCb();
+			};
+
+			this.model.updateShare(shareId, {permissions: permissions}, {error: errorCb, success: enableCb});
+
+			this._renderPermissionChange = shareId;
 		},
 	});
 
diff --git a/core/js/shareitemmodel.js b/core/js/shareitemmodel.js
index a784f59f67f..ae4c07e3f4e 100644
--- a/core/js/shareitemmodel.js
+++ b/core/js/shareitemmodel.js
@@ -272,6 +272,10 @@
 			return this.get('allowPublicUploadStatus');
 		},
 
+		isPublicEditingAllowed: function() {
+			return this.get('allowPublicEditingStatus');
+		},
+
 		/**
 		 * @returns {boolean}
 		 */
@@ -345,6 +349,14 @@
 		},
 
 		/**
+		 * @returns {string}
+		 */
+		getReshareWithDisplayName: function() {
+			var reshare = this.get('reshare');
+			return reshare.share_with_displayname || reshare.share_with;
+		},
+
+		/**
 		 * @returns {number}
 		 */
 		getReshareType: function() {
@@ -391,6 +403,26 @@
 			return share.share_with_displayname;
 		},
 
+		/**
+		 * returns the array index of a sharee for a provided shareId
+		 *
+		 * @param shareId
+		 * @returns {number}
+		 */
+		findShareWithIndex: function(shareId) {
+			var shares = this.get('shares');
+			if(!_.isArray(shares)) {
+				throw "Unknown Share";
+			}
+			for(var i = 0; i < shares.length; i++) {
+				var shareWith = shares[i];
+				if(shareWith.id === shareId) {
+					return i;
+				}
+			}
+			throw "Unknown Sharee";
+		},
+
 		getShareType: function(shareIndex) {
 			/** @type OC.Share.Types.ShareInfo **/
 			var share = this.get('shares')[shareIndex];
@@ -553,7 +585,7 @@
 			return superShare;
 		},
 
-		fetch: function() {
+		fetch: function(options) {
 			var model = this;
 			this.trigger('request', this);
 
@@ -577,6 +609,10 @@
 					shares: sharesMap,
 					reshare: reshare
 				}));
+
+				if(!_.isUndefined(options) && _.isFunction(options.success)) {
+					options.success();
+				}
 			});
 
 			return deferred;
@@ -647,6 +683,17 @@
 				});
 			}
 
+			var allowPublicEditingStatus = true;
+			if(!_.isUndefined(data.shares)) {
+				$.each(data.shares, function (key, value) {
+					if (value.share_type === OC.Share.SHARE_TYPE_LINK) {
+						allowPublicEditingStatus = (value.permissions & OC.PERMISSION_UPDATE) ? true : false;
+						return true;
+					}
+				});
+			}
+
+
 			var hideFileListStatus = false;
 			if(!_.isUndefined(data.shares)) {
 				$.each(data.shares, function (key, value) {
@@ -730,6 +777,7 @@
 				linkShare: linkShare,
 				permissions: permissions,
 				allowPublicUploadStatus: allowPublicUploadStatus,
+				allowPublicEditingStatus: allowPublicEditingStatus,
 				hideFileListStatus: hideFileListStatus
 			};
 		},
diff --git a/core/js/systemtags/systemtagmodel.js b/core/js/systemtags/systemtagmodel.js
index 89728357e25..72450a2abd0 100644
--- a/core/js/systemtags/systemtagmodel.js
+++ b/core/js/systemtags/systemtagmodel.js
@@ -9,7 +9,15 @@
  */
 
 (function(OC) {
-	var NS_OWNCLOUD = 'http://owncloud.org/ns';
+
+	_.extend(OC.Files.Client, {
+		PROPERTY_FILEID:	'{' + OC.Files.Client.NS_OWNCLOUD + '}id',
+		PROPERTY_CAN_ASSIGN:'{' + OC.Files.Client.NS_OWNCLOUD + '}can-assign',
+		PROPERTY_DISPLAYNAME:	'{' + OC.Files.Client.NS_OWNCLOUD + '}display-name',
+		PROPERTY_USERVISIBLE:	'{' + OC.Files.Client.NS_OWNCLOUD + '}user-visible',
+		PROPERTY_USERASSIGNABLE:'{' + OC.Files.Client.NS_OWNCLOUD + '}user-assignable',
+	});
+
 	/**
 	 * @class OCA.SystemTags.SystemTagsCollection
 	 * @classdesc
@@ -28,12 +36,12 @@
 		},
 
 		davProperties: {
-			'id': '{' + NS_OWNCLOUD + '}id',
-			'name': '{' + NS_OWNCLOUD + '}display-name',
-			'userVisible': '{' + NS_OWNCLOUD + '}user-visible',
-			'userAssignable': '{' + NS_OWNCLOUD + '}user-assignable',
+			'id':	OC.Files.Client.PROPERTY_FILEID,
+			'name': OC.Files.Client.PROPERTY_DISPLAYNAME,
+			'userVisible': 	OC.Files.Client.PROPERTY_USERVISIBLE,
+			'userAssignable': 	OC.Files.Client.PROPERTY_USERASSIGNABLE,
 			// read-only, effective permissions computed by the server,
-			'canAssign': '{' + NS_OWNCLOUD + '}can-assign'
+			'canAssign': OC.Files.Client.PROPERTY_CAN_ASSIGN
 		},
 
 		parse: function(data) {
@@ -50,4 +58,3 @@
 	OC.SystemTags = OC.SystemTags || {};
 	OC.SystemTags.SystemTagModel = SystemTagModel;
 })(OC);
-
diff --git a/core/js/systemtags/systemtagsinputfield.js b/core/js/systemtags/systemtagsinputfield.js
index 690525c0ebb..d5f6bd5f97e 100644
--- a/core/js/systemtags/systemtagsinputfield.js
+++ b/core/js/systemtags/systemtagsinputfield.js
@@ -40,7 +40,9 @@
 		'<form class="systemtags-rename-form">' +
 		'    <label class="hidden-visually" for="{{cid}}-rename-input">{{renameLabel}}</label>' +
 		'    <input id="{{cid}}-rename-input" type="text" value="{{name}}">' +
-		'    <a href="#" class="delete icon icon-delete" title="{{deleteTooltip}}"></a>' +
+		'    {{#if isAdmin}}' +
+		'      <a href="#" class="delete icon icon-delete" title="{{deleteTooltip}}"></a>' +
+		'    {{/if}}' +
 		'</form>';
 
 	/**
@@ -148,7 +150,8 @@
 				cid: this.cid,
 				name: oldName,
 				deleteTooltip: t('core', 'Delete'),
-				renameLabel: t('core', 'Rename')
+				renameLabel: t('core', 'Rename'),
+				isAdmin: this._isAdmin
 			}));
 			$item.find('.label').after($renameForm);
 			$item.find('.label, .systemtags-actions').addClass('hidden');
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index d1734a9f3d1..d83c0cd9a38 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -590,6 +590,36 @@ describe('Core base tests', function() {
 				}
 			});
 		});
+		describe('computerFileSize', function() {
+			it('correctly parses file sizes from a human readable formated string', function() {
+				var data = [
+					['125', 125],
+					['125.25', 125.25],
+					['0 B', 0],
+					['125 B', 125],
+					['125b', 125],
+					['125 KB', 128000],
+					['125kb', 128000],
+					['122.1 MB', 128031130],
+					['122.1mb', 128031130],
+					['119.2 GB', 127990025421],
+					['119.2gb', 127990025421],
+					['116.4 TB', 127983153473126],
+					['116.4tb', 127983153473126]
+				];
+				for (var i = 0; i < data.length; i++) {
+					expect(OC.Util.computerFileSize(data[i][0])).toEqual(data[i][1]);
+				}
+			});
+			it('returns null if the parameter is not a string', function() {
+				expect(OC.Util.computerFileSize(NaN)).toEqual(null);
+				expect(OC.Util.computerFileSize(125)).toEqual(null);
+			});
+			it('returns null if the string is unparsable', function() {
+				expect(OC.Util.computerFileSize('')).toEqual(null);
+				expect(OC.Util.computerFileSize('foobar')).toEqual(null);
+			});
+		});
 		describe('stripTime', function() {
 			it('strips time from dates', function() {
 				expect(OC.Util.stripTime(new Date(2014, 2, 24, 15, 4, 45, 24)))
@@ -937,8 +967,9 @@ describe('Core base tests', function() {
 			fadeOutStub.restore();
 		});
 		it('hides the first notification when calling hide without arguments', function() {
-			var $row1 = OC.Notification.show('One');
+			OC.Notification.show('One');
 			var $row2 = OC.Notification.show('Two');
+			spyOn(console, 'warn');
 
 			var $el = $('#notification');
 			var $rows = $el.find('.row');
@@ -946,6 +977,7 @@ describe('Core base tests', function() {
 
 			OC.Notification.hide();
 
+			expect(console.warn).toHaveBeenCalled();
 			$rows = $el.find('.row');
 			expect($rows.length).toEqual(1);
 			expect($rows.eq(0).is($row2)).toEqual(true);
diff --git a/core/js/tests/specs/l10nSpec.js b/core/js/tests/specs/l10nSpec.js
index 2ceb2f4a916..064b27aa34a 100644
--- a/core/js/tests/specs/l10nSpec.js
+++ b/core/js/tests/specs/l10nSpec.js
@@ -21,6 +21,7 @@ describe('OC.L10N tests', function() {
 
 	describe('text translation', function() {
 		beforeEach(function() {
+			spyOn(console, 'warn');
 			OC.L10N.register(TEST_APP, {
 				'Hello world!': 'Hallo Welt!',
 				'Hello {name}, the weather is {weather}': 'Hallo {name}, das Wetter ist {weather}',
@@ -78,8 +79,10 @@ describe('OC.L10N tests', function() {
 		}
 
 		it('generates plural for default text when translation does not exist', function() {
+			spyOn(console, 'warn');
 			OC.L10N.register(TEST_APP, {
 			});
+			expect(console.warn).toHaveBeenCalled();
 			expect(
 				n(TEST_APP, 'download %n file', 'download %n files', 0)
 			).toEqual('download 0 files');
@@ -94,10 +97,12 @@ describe('OC.L10N tests', function() {
 			).toEqual('download 1024 files');
 		});
 		it('generates plural with default function when no forms specified', function() {
+			spyOn(console, 'warn');
 			OC.L10N.register(TEST_APP, {
 				'_download %n file_::_download %n files_':
 					['%n Datei herunterladen', '%n Dateien herunterladen']
 			});
+			expect(console.warn).toHaveBeenCalled();
 			checkPlurals();
 		});
 		it('generates plural with generated function when forms is specified', function() {
@@ -150,9 +155,11 @@ describe('OC.L10N tests', function() {
 		it('calls callback if translation already available', function() {
 			var promiseStub = sinon.stub();
 			var callbackStub = sinon.stub();
+			spyOn(console, 'warn');
 			OC.L10N.register(TEST_APP, {
 				'Hello world!': 'Hallo Welt!'
 			});
+			expect(console.warn).toHaveBeenCalled();
 			OC.L10N.load(TEST_APP, callbackStub).then(promiseStub);
 			expect(callbackStub.calledOnce).toEqual(true);
 			expect(promiseStub.calledOnce).toEqual(true);
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index 985610d51fb..cbb74714ff7 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -975,16 +975,35 @@ describe('OC.Share.ShareDialogView', function() {
 			dialog.render();
 			expect(dialog.$el.find('.shareWithField').prop('disabled')).toEqual(true);
 		});
-		it('shows reshare owner', function() {
+		it('shows reshare owner for single user share', function() {
 			shareModel.set({
 				reshare: {
-					uid_owner: 'user1'
+					uid_owner: 'user1',
+					displayname_owner: 'User One',
+					share_type: OC.Share.SHARE_TYPE_USER
 				},
 				shares: [],
 				permissions: OC.PERMISSION_READ
 			});
 			dialog.render();
 			expect(dialog.$el.find('.resharerInfoView .reshare').length).toEqual(1);
+			expect(dialog.$el.find('.resharerInfoView .reshare').text().trim()).toEqual('Shared with you by User One');
+		});
+		it('shows reshare owner for single user share', function() {
+			shareModel.set({
+				reshare: {
+					uid_owner: 'user1',
+					displayname_owner: 'User One',
+					share_with: 'group2',
+					share_with_displayname: 'Group Two',
+					share_type: OC.Share.SHARE_TYPE_GROUP
+				},
+				shares: [],
+				permissions: OC.PERMISSION_READ
+			});
+			dialog.render();
+			expect(dialog.$el.find('.resharerInfoView .reshare').length).toEqual(1);
+			expect(dialog.$el.find('.resharerInfoView .reshare').text().trim()).toEqual('Shared with you and the group Group Two by User One');
 		});
 		it('does not show reshare owner if owner is current user', function() {
 			shareModel.set({
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
index 1cddcb2acaa..3d3baf75d15 100644
--- a/core/js/tests/specs/shareitemmodelSpec.js
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -190,6 +190,7 @@ describe('OC.Share.ShareItemModel', function() {
 					uid_owner: 'owner',
 					displayname_owner: 'Owner',
 					share_with: 'root',
+					share_with_displayname: 'Wurzel',
 					permissions: 1
 				},
 				{
@@ -221,7 +222,11 @@ describe('OC.Share.ShareItemModel', function() {
 			// user share has higher priority
 			expect(reshare.share_type).toEqual(OC.Share.SHARE_TYPE_USER);
 			expect(reshare.share_with).toEqual('root');
+			expect(reshare.share_with_displayname).toEqual('Wurzel');
 			expect(reshare.id).toEqual('1');
+
+			expect(model.getReshareWith()).toEqual('root');
+			expect(model.getReshareWithDisplayName()).toEqual('Wurzel');
 		});
 		it('does not parse link share when for a different file', function() {
 			/* jshint camelcase: false */
diff --git a/core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js b/core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js
index 503bef7cf2b..8d3f67bfa0d 100644
--- a/core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js
+++ b/core/js/tests/specs/systemtags/systemtagsinputfieldSpec.js
@@ -267,20 +267,6 @@ describe('OC.SystemTags.SystemTagsInputField tests', function() {
 
 				saveStub.restore();
 			});
-			it('deletes model and submits change when clicking delete', function() {
-				var destroyStub = sinon.stub(OC.SystemTags.SystemTagModel.prototype, 'destroy');
-
-				expect($dropdown.find('.delete').length).toEqual(0);
-				$dropdown.find('.rename').mouseup();
-				// delete button appears
-				expect($dropdown.find('.delete').length).toEqual(1);
-				$dropdown.find('.delete').mouseup();
-
-				expect(destroyStub.calledOnce).toEqual(true);
-				expect(destroyStub.calledOn(view.collection.get('1')));
-
-				destroyStub.restore();
-			});
 		});
 		describe('setting data', function() {
 			it('sets value when calling setValues', function() {
@@ -299,12 +285,18 @@ describe('OC.SystemTags.SystemTagsInputField tests', function() {
 	});
 
 	describe('as admin', function() {
+		var $dropdown;
+
 		beforeEach(function() {
 			view = new OC.SystemTags.SystemTagsInputField({
 				isAdmin: true
 			});
-			view.render();
 			$('.testInputContainer').append(view.$el);
+			$dropdown = $('<div class="select2-dropdown"></div>');
+			select2Stub.withArgs('dropdown').returns($dropdown);
+			$('#testArea').append($dropdown);
+
+			view.render();
 		});
 		it('formatResult renders tag name with visibility', function() {
 			var opts = select2Stub.getCall(0).args[0];
@@ -431,15 +423,50 @@ describe('OC.SystemTags.SystemTagsInputField tests', function() {
 				]);
 			});
 		});
+		describe('tag actions', function() {
+			var opts;
+
+			beforeEach(function() {
+
+				opts = select2Stub.getCall(0).args[0];
+
+				view.collection.add([
+					new OC.SystemTags.SystemTagModel({id: '1', name: 'abc'}),
+				]);
+
+				$dropdown.append(opts.formatResult(view.collection.get('1').toJSON()));
+
+			});
+			it('deletes model and submits change when clicking delete', function() {
+				var destroyStub = sinon.stub(OC.SystemTags.SystemTagModel.prototype, 'destroy');
+
+				expect($dropdown.find('.delete').length).toEqual(0);
+				$dropdown.find('.rename').mouseup();
+				// delete button appears
+				expect($dropdown.find('.delete').length).toEqual(1);
+				$dropdown.find('.delete').mouseup();
+
+				expect(destroyStub.calledOnce).toEqual(true);
+				expect(destroyStub.calledOn(view.collection.get('1')));
+
+				destroyStub.restore();
+			});
+		});
 	});
 
 	describe('as user', function() {
+		var $dropdown;
+
 		beforeEach(function() {
 			view = new OC.SystemTags.SystemTagsInputField({
 				isAdmin: false
 			});
-			view.render();
 			$('.testInputContainer').append(view.$el);
+			$dropdown = $('<div class="select2-dropdown"></div>');
+			select2Stub.withArgs('dropdown').returns($dropdown);
+			$('#testArea').append($dropdown);
+
+			view.render();
 		});
 		it('formatResult renders tag name only', function() {
 			var opts = select2Stub.getCall(0).args[0];
@@ -570,5 +597,33 @@ describe('OC.SystemTags.SystemTagsInputField tests', function() {
 				]);
 			});
 		});
+		describe('tag actions', function() {
+			var opts;
+
+			beforeEach(function() {
+
+				opts = select2Stub.getCall(0).args[0];
+
+				view.collection.add([
+					new OC.SystemTags.SystemTagModel({id: '1', name: 'abc'}),
+				]);
+
+				$dropdown.append(opts.formatResult(view.collection.get('1').toJSON()));
+
+			});
+			it('deletes model and submits change when clicking delete', function() {
+				var destroyStub = sinon.stub(OC.SystemTags.SystemTagModel.prototype, 'destroy');
+
+				expect($dropdown.find('.delete').length).toEqual(0);
+				$dropdown.find('.rename').mouseup();
+				// delete button appears only for admins
+				expect($dropdown.find('.delete').length).toEqual(0);
+				$dropdown.find('.delete').mouseup();
+
+				expect(destroyStub.notCalled).toEqual(true);
+
+				destroyStub.restore();
+			});
+		});
 	});
 });
diff --git a/core/js/update.js b/core/js/update.js
index 32cf2ce5ecc..e849d8a16ce 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -72,7 +72,7 @@
 				var span = $('<span>')
 					.addClass('bold');
 				if(message === 'Exception: Updates between multiple major versions and downgrades are unsupported.') {
-					span.append(t('core', 'The update was unsuccessful. For more information <a href="{url}">check our forum post</a> covering this issue.', {'url': 'https://forum.owncloud.org/viewtopic.php?f=17&t=32087'}));
+					span.append(t('core', 'The update was unsuccessful. For more information <a href="{url}">check our forum post</a> covering this issue.', {'url': 'https://help.nextcloud.com/t/updates-between-multiple-major-versions-are-unsupported/7094'}));
 				} else {
 					span.append(t('core', 'The update was unsuccessful. ' +
 						'Please report this issue to the ' +
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
new file mode 100644
index 00000000000..a23ead44e93
--- /dev/null
+++ b/core/l10n/bg_BG.js
@@ -0,0 +1,370 @@
+OC.L10N.register(
+    "core",
+    {
+    "Please select a file." : "Моля изберете файл.",
+    "File is too big" : "Файлът е твърде голям",
+    "The selected file is not an image." : "Избраният файл не е изображение.",
+    "The selected file cannot be read." : "Избраният файл не може да бъде отворен.",
+    "Invalid file provided" : "Предоставен е невалиден файл",
+    "No image or file provided" : "Не бяха доставени картинка или файл",
+    "Unknown filetype" : "Непознат тип файл",
+    "Invalid image" : "Невалидно изображение",
+    "An error occurred. Please contact your admin." : "Възникна неизвестна грешка. Свържете с администратора.",
+    "No temporary profile picture available, try again" : "Не е налична временна профилна снимка, опитайте отново",
+    "No crop data provided" : "Липсват данни за изрязването",
+    "No valid crop data provided" : "Липсват данни за изрязването",
+    "Crop is not square" : "Областта не е квадратна",
+    "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." : "Неуспешно изпращане на имейл за възстановяване на паролата. Моля, уверете се, че потребителското име е правилно.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Имейлът за възстановяване на паролата  не може да бъде изпратен защо потребителят няма имейл адрес. Свържете се с администратора.",
+    "%s password reset" : "Паролата на %s е променена",
+    "Couldn't send reset email. Please contact your administrator." : "Неуспешно изпращане на имейл за възстановяване на паролата. Моля, свържете се с вашия администратор.",
+    "Preparing update" : "Подготовка за актуализиране",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "Предупреждение при поправка:",
+    "Repair error: " : "Грешка при поправка:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Моля използвайте съветникът за обновяване в команден ред, защото автоматичният е забранен в config.php.",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Проверка на таблица %s",
+    "Turned on maintenance mode" : "Режимът за поддръжка е включен",
+    "Turned off maintenance mode" : "Режимът за поддръжка е изключен",
+    "Maintenance mode is kept active" : "Режим на поддръжка се поддържа активен",
+    "Updating database schema" : "Актуализиране на схемата на базата данни",
+    "Updated database" : "Базата данни е обоновена",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Проверка дали схемата на базата данни може да се актуализира (възможно е да отнеме повече време в зависимост от големината на базата данни)",
+    "Checked database schema update" : "Обновяването на схемата на базата данни е проверено",
+    "Checking updates of apps" : "Проверка на актуализациите за добавките",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Проверка дали схемата на базата данни %s може да бъде актуализирана (това може да отнеме повече време в зависимост от големината на базата данни)",
+    "Checked database schema update for apps" : "Обновяването на схемата на базата данни за приложения е проверено",
+    "Updated \"%s\" to %s" : "Обновен \"%s\" до %s",
+    "Set log level to debug" : "Промени ниво на лог на дебъг",
+    "Reset log level" : "Възстанови ниво на лог",
+    "Starting code integrity check" : "Стартиране на проверка за цялостта на кода",
+    "Finished code integrity check" : "Приключена проверка за цялостта на кода",
+    "%s (3rdparty)" : "%s (3-ти лица)",
+    "%s (incompatible)" : "%s (несъвместим)",
+    "Following apps have been disabled: %s" : "Следната добавка беше изключена: %s",
+    "Already up to date" : "Вече е актуална",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Има проблем с проверката за цялостта на кода. Повече информация…</a>",
+    "Settings" : "Настройки",
+    "Connection to server lost" : "Връзката със сървъра е загубена",
+    "Problem loading page, reloading in 5 seconds" : "Проблем при зареждане на страницата, презареждане след 5 секунди",
+    "Saving..." : "Запазване...",
+    "Dismiss" : "Отхвърляне",
+    "This action requires you to confirm your password" : "Това действие изисква да потвърдите паролата си",
+    "Authentication required" : "Изисква удостоверяване",
+    "Password" : "Парола",
+    "Cancel" : "Отказ",
+    "Confirm" : "Потвърди",
+    "Failed to authenticate, try again" : "Грешка при удостоверяване, опитайте пак",
+    "seconds ago" : "преди секунди",
+    "Logging in …" : "Вписване ...",
+    "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." : "Връзката за възстановяване на паролата беше изпратена до вашия имейл. Ако не я получите в разумен период от време, проверете спам и junk папките.<br>Ако не я откривате и там, се свържете с местния администратор.",
+    "I know what I'm doing" : "Знам какво правя",
+    "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържете се с администратора.",
+    "No" : "Не",
+    "Yes" : "Да",
+    "No files in here" : "Тук няма файлове",
+    "Choose" : "Избиране",
+    "Error loading file picker template: {error}" : "Грешка при зареждането на шаблон за избор на файл: {error}",
+    "Ok" : "Добре",
+    "Error loading message template: {error}" : "Грешка при зареждането на шаблон за съобщения: {error}",
+    "read-only" : "Само за четене",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} файлов конфликт","{count} файлови кофликта"],
+    "One file conflict" : "Един файлов конфликт",
+    "New Files" : "Нови файлове",
+    "Already existing files" : "Вече съществуващи файлове",
+    "Which files do you want to keep?" : "Кои файлове желете да запазите?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ако изберете и двете версии, към името на копирания файл ще бъде добавено число.",
+    "Continue" : "Продължаване",
+    "(all selected)" : "(всички избрани)",
+    "({count} selected)" : "({count} избрани)",
+    "Error loading file exists template" : "Грешка при зареждането на шаблон за вече съществуващ файл",
+    "Pending" : "Чакащо",
+    "Very weak password" : "Много слаба парола",
+    "Weak password" : "Слаба парола",
+    "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 set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Вашият уеб сървър не е настроен правилно за да отвори \"{url}\". Допълнителна информация може да бъде намерена в нашата <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документация</a>.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Не е настроен кеш за паметта. За да повишите ефективността, моля настройте кеш за паметта ако е възможно. Допълнителна информация може да бъде намерена в нашата <a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom не се чете от PHP, което е крайно нежелателно поради съображения за сигурност. Допълнителна информация може да бъде намерена в нашата <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документация</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "В момента използвате PHP {version}. Препоръчваме Ви да обновите своята PHP версия за да се възползвате от <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">актуализации за ефективността и сигурността, предоставени от PHP Group</a>, веднага след като вашата дистрибуция я поддържа.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Хедърите за обратно прокси са невалидни, или достъпвате Nextcloud от доверено прокси. Ако не достъпвате Nextcloud от доверено прокси, то това е проблем в сигурността и може да позволи на хакер да прикрие IP адреса си в Nextcloud. Допълнителна информация може да бъде намерена в нашата <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документация</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Кеширането на паметта е настроено като разпределена кеш, но е инсталиран грешен PHP модул \"memcache\".  \\OC\\Memcache\\Memcached поддържа само \"memcached\", и не \"memcache\". Прегледайте <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki относно модулите</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Някой от файловете не преминаха проверката за цялост на кода. Допълнителна информация за това как да разрешите този проблем може да се намери в нашата <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документация</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Списък с невалидни файлове…</a> / <a href=\"{rescanEndpoint}\">Сканиране отново…</a>)",
+    "Error occurred while checking server setup" : "Възникна грешка при проверката на настройките на сървъра.",
+    "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 файлът не функционира. Силно препоръчваме да настроите уеб сървъра по такъв начин, че директорията за данни да не бъде достъпна или я преместете извън директорията на уеб сървъра.",
+    "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 at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP хедъра на \"Strict-Transport-Security\" не е конфигуриран за най-малко \"{seconds}\" секунди. За по-голяма сигурност Ви препоръчваме да активирате HSTS, както е описано в нашите <a href=\"{docUrl}\" rel=\"noreferrer\">съвети за сигурност</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}",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка при споделяне",
+    "Error while unsharing" : "Грешка при премахване на споделянето",
+    "Error setting expiration date" : "Грешка при настройване на датата за изтичане",
+    "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дни след създаването ѝ.",
+    "Set expiration date" : "Задаване на дата на изтичане",
+    "Expiration" : "Изтичане",
+    "Expiration date" : "Дата на изтичане",
+    "Choose a password for the public link" : "Изберете парола за общодостъпната връзка",
+    "Copied!" : "Копирано!",
+    "Copy" : "Копиране",
+    "Not supported!" : "Не се поддържа!",
+    "Press ⌘-C to copy." : "За копиране натиснете ⌘-C.",
+    "Press Ctrl-C to copy." : "За копиране натиснете Ctrl-C.",
+    "Resharing is not allowed" : "Повторно споделяне не е разрешено.",
+    "Share link" : "Връзка за споделяне",
+    "Link" : "Връзка",
+    "Password protect" : "Защитено с парола",
+    "Allow upload and editing" : "Позволи обновяване и редактиране",
+    "Allow editing" : "Позволяване на редактиране",
+    "File drop (upload only)" : "Пускане на файл (качване само)",
+    "Email link to person" : "Имейл връзка към човек",
+    "Send" : "Изпращане",
+    "Shared with you and the group {group} by {owner}" : "Споделено от {owner} с вас и групата {group}",
+    "Shared with you by {owner}" : "Споделено с вас от {owner}",
+    "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} споделен с връзка",
+    "group" : "група",
+    "remote" : "отдалечен",
+    "email" : "имейл",
+    "Unshare" : "Прекратяване на споделяне",
+    "can reshare" : "може да споделя",
+    "can edit" : "може да променя",
+    "can create" : "може да създава",
+    "can change" : "може да ",
+    "can delete" : "може да изтрива",
+    "access control" : "контрол на достъпа",
+    "Could not unshare" : "Споделянето не е прекратено",
+    "Share details could not be loaded for this item." : "Данните за споделяне не могат да бъдат заредени",
+    "No users or groups found for {search}" : "Няма потребители или групи за {search}",
+    "No users found for {search}" : "Няма потребители за {search}",
+    "An error occurred. Please try again" : "Възникна грешка. Моля, опитайте отново.",
+    "{sharee} (group)" : "{sharee} (група)",
+    "{sharee} (remote)" : "{sharee} (отдалечен)",
+    "{sharee} (email)" : "{sharee} (email)",
+    "Share" : "Споделяне",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Сподели с хора на други сървъри, използващи тяхните Федерални Cloud ID username@example.com/nextcloud",
+    "Share with users or by mail..." : "Споделяне с потребители или чрез имейл...",
+    "Share with users or remote users..." : "Споделяне с потребители или с отдалечени потребители...",
+    "Share with users, remote users or by mail..." : "Споделяне с потребители, отдалечени потребители или с имейл...",
+    "Share with users or groups..." : "Споделяне с потребители или групи...",
+    "Share with users, groups or by mail..." : "Споделяне с потребители, групи или чрез имейл...",
+    "Share with users, groups or remote users..." : "Споделяне с потребители, групи или отдалечени потребители...",
+    "Share with users, groups, remote users or by mail..." : "Споделяне с потребители, групи, отдалечени потребители или чрез имейл...",
+    "Share with users..." : "Споделяне с потребители...",
+    "Error removing share" : "Грешка при махане на споделяне",
+    "Non-existing tag #{tag}" : "Не-съществуващ етикет #{tag}",
+    "restricted" : "ограничен",
+    "invisible" : "невидим",
+    "({scope})" : "({scope})",
+    "Delete" : "Изтриване",
+    "Rename" : "Преименуване",
+    "Collaborative tags" : "Съвместни тагове",
+    "No tags found" : "Няма открити етикети",
+    "The object type is not specified." : "Типът на обекта не е избран.",
+    "Enter new" : "Въвеждане на нов",
+    "Add" : "Добавяне",
+    "Edit tags" : "Промяна на етикетите",
+    "Error loading dialog template: {error}" : "Грешка при зареждането на шаблон за диалог: {error}.",
+    "No tags selected for deletion." : "Не са избрани тагове за изтриване.",
+    "unknown text" : "непознат текст",
+    "Hello world!" : "Здравей Свят!",
+    "sunny" : "слънчево",
+    "Hello {name}, the weather is {weather}" : "Здравей {name}, времето е {weather}",
+    "Hello {name}" : "Здравейте, {name}",
+    "new" : "нов",
+    "_download %n file_::_download %n files_" : ["изтегли %n файл","изтегли %n файла"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Актуализирането е в процес, в някой среди - напускането на тази страница може да прекъсне процеса.",
+    "Update to {version}" : "Обнови до {version}",
+    "An error occurred." : "Възникна грешка.",
+    "Please reload the page." : "Моля, презаредете страницата.",
+    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Актуализацията беше неуспешна. За повече информация <a href=\"{url}\">погледнете нашият пост</a> покриващ този въпрос.",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Обновяването беше неуспешно. Моля отнесете този проблем към <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\"> Nextcloud общността</a>.",
+    "Continue to Nextcloud" : "Продължете към Nextcloud",
+    "The update was successful. Redirecting you to Nextcloud now." : "Обновяването беше успешно. Сега те пренасочваме към Nextcloud.",
+    "Searching other places" : "Търсене на друго място",
+    "No search results in other folders for '{tag}{filter}{endtag}'" : "Няма резултати от търсенето в други папки за '{tag}{filter}{endtag}'",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} търсен резултат в друга папка","{count} търсени резултати в други папки"],
+    "Personal" : "Лични",
+    "Users" : "Потребители",
+    "Apps" : "Приложения",
+    "Admin" : "Админ",
+    "Help" : "Помощ",
+    "Access forbidden" : "Достъпът е забранен",
+    "File not found" : "Файлът не е открит",
+    "The specified document has not been found on the server." : "Избраният документ не е намерен на сървъра.",
+    "You can click here to return to %s." : "Можете да натиснете тук, за да се върнете на %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здравейте,\n\nсамо да ви уведомяваме, че %s сподели %s с вас.\nРазгледай го: %s\n\n",
+    "The share will expire on %s." : "Споделянето ще изтече на %s.",
+    "Cheers!" : "Поздрави!",
+    "Internal Server Error" : "Вътрешна системна грешка",
+    "The server encountered an internal error and was unable to complete your request." : "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Моля, свържете се със сървърния администратор, ако тази грешка се появи отново. Също така Ви Молим да включите техническите данни, показани в доклада по-долу.",
+    "More details can be found in the server log." : "Повече детайли могат да бъдат намерени в сървърния журнал.",
+    "Technical details" : "Технически детайли",
+    "Remote Address: %s" : "Отдалечен адрес: %s",
+    "Request ID: %s" : "ID на заявка: %s",
+    "Type: %s" : "Тип: %s",
+    "Code: %s" : "Код: %s",
+    "Message: %s" : "Съобщение: %s",
+    "File: %s" : "Файл: %s",
+    "Line: %s" : "Линия: %s",
+    "Trace" : "Проследяване на грешките",
+    "Security warning" : "Предупреждение за сигурност",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашата директория за данни и файлове Ви вероятно са достъпни от интернет, поради това, че файлът \".htaccess\" не функционира.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "За информация как правилно да конфигурирате сървъра, моля, вижте <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">документацията</a>.",
+    "Create an <strong>admin account</strong>" : "Създаване на <strong>администраторски профил</strong>.",
+    "Username" : "Потребител",
+    "Storage & database" : "Хранилища и бази данни",
+    "Data folder" : "Директория за данни",
+    "Configure the database" : "Конфигуриране на базата данни",
+    "Only %s is available." : "Само %s е наличен.",
+    "Install and activate additional PHP modules to choose other database types." : "Инсталирайте и активирайте допълнителни PHP модули, за да изберете други видове бази данни.",
+    "For more details check out the documentation." : "За повече детайли проверете документацията.",
+    "Database user" : "Потребител за базата данни",
+    "Database password" : "Парола за базата данни",
+    "Database name" : "Име на базата данни",
+    "Database tablespace" : "Tablespace на базата данни",
+    "Database host" : "Хост за базата данни",
+    "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 не се препоръчва, особено ако ползвате клиента за настолен компютър.",
+    "Finish setup" : "Завършване на настройките",
+    "Finishing …" : "Завършване...",
+    "Need help?" : "Нуждаете се от помощ?",
+    "See the documentation" : "Прегледайте документацията",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "За да функционира приложението изисква JavaScript. Моля, {linkstart}включете JavaScript{linkend} и презаредете страницата.",
+    "Search" : "Търсене",
+    "Log out" : "Отписване",
+    "This action requires you to confirm your password:" : "Това действие изисква да потвърдите паролата си:",
+    "Confirm your password" : "Потвърдете паролата си",
+    "Server side authentication failed!" : "Удостоверяването от страна на сървъра е неуспешно!",
+    "Please contact your administrator." : "Моля, свържете се с администратора.",
+    "An internal error occurred." : "Възникна вътрешна грешка.",
+    "Please try again or contact your administrator." : "Опитайте отново или се свържете с администраотра.",
+    "Username or email" : "Потребител или имейл",
+    "Wrong password. Reset it?" : "Грешна парола. Желаете ли нова парола?",
+    "Wrong password." : "Грешна парола",
+    "Log in" : "Вписване",
+    "Stay logged in" : "Остани вписан",
+    "Alternative Logins" : "Алтернативни методи на вписване",
+    "Use the following link to reset your password: {link}" : "Използвайте следната връзка, за да възстановите паролата си: {link}",
+    "New password" : "Нова парола",
+    "New Password" : "Нова парола",
+    "Reset password" : "Възстановяване на паролата",
+    "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 Nextcloud instance is currently in single user mode." : "В момента този Nextcloud е в режим допускащ само един потребител.",
+    "This means only administrators can use the instance." : "Това означава, че само администраторът може да го използва.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Свържете се със системния администратор ако това съобщение се задържи твърде дълго или се е появило неочаквано.",
+    "Thank you for your patience." : "Благодарим за търпението.",
+    "Two-factor authentication" : "Двуфакторно удостоверяване",
+    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Повишената сигурност е активирана за профила ви. Моля удостоверете използвайки втори фактор.",
+    "Cancel log in" : "Откажи вписване",
+    "Use backup code" : "Използвай код за възстановяване",
+    "Error while validating your second factor" : "Грешка при валидиране на втория ви фактор",
+    "You are accessing the server from an untrusted domain." : "Свръзвате се със сървъра от домейн, който не е отбелязан като сигурен.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Моля, свържете се с администратора. Ако сте администратор на текущата инстанция, конфигурирайте \"trusted_domains\" настройките в 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\" като сигурен домейн",
+    "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" : "Начало на обновяването",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "За да избегнеш таймаутове при по-големи инсталации, можеш да изпълниш следните команди в инсталанционната директория:",
+    "Detailed logs" : "Подробни логове",
+    "Update needed" : "Нужно е обновяване",
+    "Please use the command line updater because you have a big instance." : "Моля използвайте съветникът за обновяване в команден ред, защото инстанцията ви е голяма.",
+    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "За помощ, вижте  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документацията</a>.",
+    "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 е отново на линия.",
+    "Error loading tags" : "Грешка при зареждане на етикети",
+    "Tag already exists" : "Етикетът вече съществува",
+    "Error deleting tag(s)" : "Грешка при изтриване на етикет(и)",
+    "Error tagging" : "Грешка при задаване на етикета",
+    "Error untagging" : "Грешка при премахване на етикета",
+    "Error favoriting" : "Грешка при добавяне в любими",
+    "Error unfavoriting" : "Грешка при премахване от любими",
+    "Couldn't send mail to following users: %s " : "Изпращането на имейл до следните потребители не е възможно: %s",
+    "Sunday" : "неделя",
+    "Monday" : "понеделник",
+    "Tuesday" : "вторник",
+    "Wednesday" : "сряда",
+    "Thursday" : "четвъртък",
+    "Friday" : "петък",
+    "Saturday" : "събота",
+    "Sun." : "нед",
+    "Mon." : "пон",
+    "Tue." : "вт",
+    "Wed." : "ср",
+    "Thu." : "чет",
+    "Fri." : "пет",
+    "Sat." : "съб",
+    "Su" : "нд",
+    "Mo" : "пн",
+    "Tu" : "вт",
+    "We" : "ср",
+    "Th" : "чт",
+    "Fr" : "пт",
+    "Sa" : "сб",
+    "January" : "януари",
+    "February" : "февруару",
+    "March" : "март",
+    "April" : "април",
+    "May" : "май",
+    "June" : "юни",
+    "July" : "юли",
+    "August" : "август",
+    "September" : "септември",
+    "October" : "октомври",
+    "November" : "ноември",
+    "December" : "декември",
+    "Jan." : "яну",
+    "Feb." : "фев",
+    "Mar." : "мар",
+    "Apr." : "апр",
+    "May." : "май",
+    "Jun." : "юни",
+    "Jul." : "юли",
+    "Aug." : "авг",
+    "Sep." : "сеп",
+    "Oct." : "окт",
+    "Nov." : "ное",
+    "Dec." : "дек",
+    "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?" : "Файловете Ви са криптирани. Ако не сте настроили ключ за възстановяване, няма да можете да възстановите данните си след смяна на паролата.<br />Ако не сте сигурни какво да направите, моля, свържете се с Вашия администратор преди да продължите. <br/>Наистина ли желаете да продължите?",
+    "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." : "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
+    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Хедърите за обратно прокси са невалидни, или достъпвате Nextcloud от доверено прокси. Ако не достъпвате Nextcloud от доверено прокси, то това е проблем в сигурността и може да позволи на хакер да прикрие IP адреса си в Nextcloud. Допълнителна информация може да бъде намерена в нашата <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документация</a>.",
+    "Hide file listing" : "Скрий показването на файлове",
+    "Sending ..." : "Изпращане ...",
+    "Email sent" : "Имейла е изпратен",
+    "Send link via email" : "Сподели връзка с имейл",
+    "notify by email" : "уведомяване по електронна поща",
+    "can share" : "може да споделя",
+    "create" : "създаване",
+    "change" : "промяна",
+    "delete" : "изтриване",
+    "{sharee} (at {server})" : "{sharee} (в {server})",
+    "Share with users…" : "Споделяне с потребители...",
+    "Share with users, groups or remote users…" : "Споделяне с потребители, групи и отдалечени потребители...",
+    "Share with users or groups…" : "Споделяне с потребители или групи...",
+    "Share with users or remote users…" : "Споделяне с потребители или с отдалечени потребители...",
+    "Warning" : "Предупреждение",
+    "Error while sending notification" : "Грешка при изпращане на уведомление",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Актуализирането е в процес, в някой среди - напускането на тази страница може да прекъсне процеса.",
+    "Updating to {version}" : "Обновяване до {version}",
+    "The update was successful. There were warnings." : "Обновяването мина успешно. Има предупреждения.",
+    "No search results in other folders" : "Няма търсени резултати в други папки",
+    "Two-step verification" : "Потвърждаване в две стъпки",
+    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Повишената сигурност е активирана за профила ви. Моля удостоверете използвайки втори фактор.",
+    "Cancel login" : "Откажи вписване",
+    "Please authenticate using the selected factor." : "Моля удостоверете използвайки вторият фактор.",
+    "An error occured while verifying the token" : "Възникна грешка при проверка на токена"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
new file mode 100644
index 00000000000..7146057c1f0
--- /dev/null
+++ b/core/l10n/bg_BG.json
@@ -0,0 +1,368 @@
+{ "translations": {
+    "Please select a file." : "Моля изберете файл.",
+    "File is too big" : "Файлът е твърде голям",
+    "The selected file is not an image." : "Избраният файл не е изображение.",
+    "The selected file cannot be read." : "Избраният файл не може да бъде отворен.",
+    "Invalid file provided" : "Предоставен е невалиден файл",
+    "No image or file provided" : "Не бяха доставени картинка или файл",
+    "Unknown filetype" : "Непознат тип файл",
+    "Invalid image" : "Невалидно изображение",
+    "An error occurred. Please contact your admin." : "Възникна неизвестна грешка. Свържете с администратора.",
+    "No temporary profile picture available, try again" : "Не е налична временна профилна снимка, опитайте отново",
+    "No crop data provided" : "Липсват данни за изрязването",
+    "No valid crop data provided" : "Липсват данни за изрязването",
+    "Crop is not square" : "Областта не е квадратна",
+    "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." : "Неуспешно изпращане на имейл за възстановяване на паролата. Моля, уверете се, че потребителското име е правилно.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Имейлът за възстановяване на паролата  не може да бъде изпратен защо потребителят няма имейл адрес. Свържете се с администратора.",
+    "%s password reset" : "Паролата на %s е променена",
+    "Couldn't send reset email. Please contact your administrator." : "Неуспешно изпращане на имейл за възстановяване на паролата. Моля, свържете се с вашия администратор.",
+    "Preparing update" : "Подготовка за актуализиране",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "Предупреждение при поправка:",
+    "Repair error: " : "Грешка при поправка:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Моля използвайте съветникът за обновяване в команден ред, защото автоматичният е забранен в config.php.",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Проверка на таблица %s",
+    "Turned on maintenance mode" : "Режимът за поддръжка е включен",
+    "Turned off maintenance mode" : "Режимът за поддръжка е изключен",
+    "Maintenance mode is kept active" : "Режим на поддръжка се поддържа активен",
+    "Updating database schema" : "Актуализиране на схемата на базата данни",
+    "Updated database" : "Базата данни е обоновена",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Проверка дали схемата на базата данни може да се актуализира (възможно е да отнеме повече време в зависимост от големината на базата данни)",
+    "Checked database schema update" : "Обновяването на схемата на базата данни е проверено",
+    "Checking updates of apps" : "Проверка на актуализациите за добавките",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Проверка дали схемата на базата данни %s може да бъде актуализирана (това може да отнеме повече време в зависимост от големината на базата данни)",
+    "Checked database schema update for apps" : "Обновяването на схемата на базата данни за приложения е проверено",
+    "Updated \"%s\" to %s" : "Обновен \"%s\" до %s",
+    "Set log level to debug" : "Промени ниво на лог на дебъг",
+    "Reset log level" : "Възстанови ниво на лог",
+    "Starting code integrity check" : "Стартиране на проверка за цялостта на кода",
+    "Finished code integrity check" : "Приключена проверка за цялостта на кода",
+    "%s (3rdparty)" : "%s (3-ти лица)",
+    "%s (incompatible)" : "%s (несъвместим)",
+    "Following apps have been disabled: %s" : "Следната добавка беше изключена: %s",
+    "Already up to date" : "Вече е актуална",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Има проблем с проверката за цялостта на кода. Повече информация…</a>",
+    "Settings" : "Настройки",
+    "Connection to server lost" : "Връзката със сървъра е загубена",
+    "Problem loading page, reloading in 5 seconds" : "Проблем при зареждане на страницата, презареждане след 5 секунди",
+    "Saving..." : "Запазване...",
+    "Dismiss" : "Отхвърляне",
+    "This action requires you to confirm your password" : "Това действие изисква да потвърдите паролата си",
+    "Authentication required" : "Изисква удостоверяване",
+    "Password" : "Парола",
+    "Cancel" : "Отказ",
+    "Confirm" : "Потвърди",
+    "Failed to authenticate, try again" : "Грешка при удостоверяване, опитайте пак",
+    "seconds ago" : "преди секунди",
+    "Logging in …" : "Вписване ...",
+    "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." : "Връзката за възстановяване на паролата беше изпратена до вашия имейл. Ако не я получите в разумен период от време, проверете спам и junk папките.<br>Ако не я откривате и там, се свържете с местния администратор.",
+    "I know what I'm doing" : "Знам какво правя",
+    "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържете се с администратора.",
+    "No" : "Не",
+    "Yes" : "Да",
+    "No files in here" : "Тук няма файлове",
+    "Choose" : "Избиране",
+    "Error loading file picker template: {error}" : "Грешка при зареждането на шаблон за избор на файл: {error}",
+    "Ok" : "Добре",
+    "Error loading message template: {error}" : "Грешка при зареждането на шаблон за съобщения: {error}",
+    "read-only" : "Само за четене",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} файлов конфликт","{count} файлови кофликта"],
+    "One file conflict" : "Един файлов конфликт",
+    "New Files" : "Нови файлове",
+    "Already existing files" : "Вече съществуващи файлове",
+    "Which files do you want to keep?" : "Кои файлове желете да запазите?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ако изберете и двете версии, към името на копирания файл ще бъде добавено число.",
+    "Continue" : "Продължаване",
+    "(all selected)" : "(всички избрани)",
+    "({count} selected)" : "({count} избрани)",
+    "Error loading file exists template" : "Грешка при зареждането на шаблон за вече съществуващ файл",
+    "Pending" : "Чакащо",
+    "Very weak password" : "Много слаба парола",
+    "Weak password" : "Слаба парола",
+    "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 set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Вашият уеб сървър не е настроен правилно за да отвори \"{url}\". Допълнителна информация може да бъде намерена в нашата <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документация</a>.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Не е настроен кеш за паметта. За да повишите ефективността, моля настройте кеш за паметта ако е възможно. Допълнителна информация може да бъде намерена в нашата <a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom не се чете от PHP, което е крайно нежелателно поради съображения за сигурност. Допълнителна информация може да бъде намерена в нашата <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документация</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "В момента използвате PHP {version}. Препоръчваме Ви да обновите своята PHP версия за да се възползвате от <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">актуализации за ефективността и сигурността, предоставени от PHP Group</a>, веднага след като вашата дистрибуция я поддържа.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Хедърите за обратно прокси са невалидни, или достъпвате Nextcloud от доверено прокси. Ако не достъпвате Nextcloud от доверено прокси, то това е проблем в сигурността и може да позволи на хакер да прикрие IP адреса си в Nextcloud. Допълнителна информация може да бъде намерена в нашата <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документация</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Кеширането на паметта е настроено като разпределена кеш, но е инсталиран грешен PHP модул \"memcache\".  \\OC\\Memcache\\Memcached поддържа само \"memcached\", и не \"memcache\". Прегледайте <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki относно модулите</a>.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Някой от файловете не преминаха проверката за цялост на кода. Допълнителна информация за това как да разрешите този проблем може да се намери в нашата <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документация</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Списък с невалидни файлове…</a> / <a href=\"{rescanEndpoint}\">Сканиране отново…</a>)",
+    "Error occurred while checking server setup" : "Възникна грешка при проверката на настройките на сървъра.",
+    "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 файлът не функционира. Силно препоръчваме да настроите уеб сървъра по такъв начин, че директорията за данни да не бъде достъпна или я преместете извън директорията на уеб сървъра.",
+    "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 at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP хедъра на \"Strict-Transport-Security\" не е конфигуриран за най-малко \"{seconds}\" секунди. За по-голяма сигурност Ви препоръчваме да активирате HSTS, както е описано в нашите <a href=\"{docUrl}\" rel=\"noreferrer\">съвети за сигурност</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}",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка при споделяне",
+    "Error while unsharing" : "Грешка при премахване на споделянето",
+    "Error setting expiration date" : "Грешка при настройване на датата за изтичане",
+    "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дни след създаването ѝ.",
+    "Set expiration date" : "Задаване на дата на изтичане",
+    "Expiration" : "Изтичане",
+    "Expiration date" : "Дата на изтичане",
+    "Choose a password for the public link" : "Изберете парола за общодостъпната връзка",
+    "Copied!" : "Копирано!",
+    "Copy" : "Копиране",
+    "Not supported!" : "Не се поддържа!",
+    "Press ⌘-C to copy." : "За копиране натиснете ⌘-C.",
+    "Press Ctrl-C to copy." : "За копиране натиснете Ctrl-C.",
+    "Resharing is not allowed" : "Повторно споделяне не е разрешено.",
+    "Share link" : "Връзка за споделяне",
+    "Link" : "Връзка",
+    "Password protect" : "Защитено с парола",
+    "Allow upload and editing" : "Позволи обновяване и редактиране",
+    "Allow editing" : "Позволяване на редактиране",
+    "File drop (upload only)" : "Пускане на файл (качване само)",
+    "Email link to person" : "Имейл връзка към човек",
+    "Send" : "Изпращане",
+    "Shared with you and the group {group} by {owner}" : "Споделено от {owner} с вас и групата {group}",
+    "Shared with you by {owner}" : "Споделено с вас от {owner}",
+    "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} споделен с връзка",
+    "group" : "група",
+    "remote" : "отдалечен",
+    "email" : "имейл",
+    "Unshare" : "Прекратяване на споделяне",
+    "can reshare" : "може да споделя",
+    "can edit" : "може да променя",
+    "can create" : "може да създава",
+    "can change" : "може да ",
+    "can delete" : "може да изтрива",
+    "access control" : "контрол на достъпа",
+    "Could not unshare" : "Споделянето не е прекратено",
+    "Share details could not be loaded for this item." : "Данните за споделяне не могат да бъдат заредени",
+    "No users or groups found for {search}" : "Няма потребители или групи за {search}",
+    "No users found for {search}" : "Няма потребители за {search}",
+    "An error occurred. Please try again" : "Възникна грешка. Моля, опитайте отново.",
+    "{sharee} (group)" : "{sharee} (група)",
+    "{sharee} (remote)" : "{sharee} (отдалечен)",
+    "{sharee} (email)" : "{sharee} (email)",
+    "Share" : "Споделяне",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Сподели с хора на други сървъри, използващи тяхните Федерални Cloud ID username@example.com/nextcloud",
+    "Share with users or by mail..." : "Споделяне с потребители или чрез имейл...",
+    "Share with users or remote users..." : "Споделяне с потребители или с отдалечени потребители...",
+    "Share with users, remote users or by mail..." : "Споделяне с потребители, отдалечени потребители или с имейл...",
+    "Share with users or groups..." : "Споделяне с потребители или групи...",
+    "Share with users, groups or by mail..." : "Споделяне с потребители, групи или чрез имейл...",
+    "Share with users, groups or remote users..." : "Споделяне с потребители, групи или отдалечени потребители...",
+    "Share with users, groups, remote users or by mail..." : "Споделяне с потребители, групи, отдалечени потребители или чрез имейл...",
+    "Share with users..." : "Споделяне с потребители...",
+    "Error removing share" : "Грешка при махане на споделяне",
+    "Non-existing tag #{tag}" : "Не-съществуващ етикет #{tag}",
+    "restricted" : "ограничен",
+    "invisible" : "невидим",
+    "({scope})" : "({scope})",
+    "Delete" : "Изтриване",
+    "Rename" : "Преименуване",
+    "Collaborative tags" : "Съвместни тагове",
+    "No tags found" : "Няма открити етикети",
+    "The object type is not specified." : "Типът на обекта не е избран.",
+    "Enter new" : "Въвеждане на нов",
+    "Add" : "Добавяне",
+    "Edit tags" : "Промяна на етикетите",
+    "Error loading dialog template: {error}" : "Грешка при зареждането на шаблон за диалог: {error}.",
+    "No tags selected for deletion." : "Не са избрани тагове за изтриване.",
+    "unknown text" : "непознат текст",
+    "Hello world!" : "Здравей Свят!",
+    "sunny" : "слънчево",
+    "Hello {name}, the weather is {weather}" : "Здравей {name}, времето е {weather}",
+    "Hello {name}" : "Здравейте, {name}",
+    "new" : "нов",
+    "_download %n file_::_download %n files_" : ["изтегли %n файл","изтегли %n файла"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Актуализирането е в процес, в някой среди - напускането на тази страница може да прекъсне процеса.",
+    "Update to {version}" : "Обнови до {version}",
+    "An error occurred." : "Възникна грешка.",
+    "Please reload the page." : "Моля, презаредете страницата.",
+    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Актуализацията беше неуспешна. За повече информация <a href=\"{url}\">погледнете нашият пост</a> покриващ този въпрос.",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Обновяването беше неуспешно. Моля отнесете този проблем към <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\"> Nextcloud общността</a>.",
+    "Continue to Nextcloud" : "Продължете към Nextcloud",
+    "The update was successful. Redirecting you to Nextcloud now." : "Обновяването беше успешно. Сега те пренасочваме към Nextcloud.",
+    "Searching other places" : "Търсене на друго място",
+    "No search results in other folders for '{tag}{filter}{endtag}'" : "Няма резултати от търсенето в други папки за '{tag}{filter}{endtag}'",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} търсен резултат в друга папка","{count} търсени резултати в други папки"],
+    "Personal" : "Лични",
+    "Users" : "Потребители",
+    "Apps" : "Приложения",
+    "Admin" : "Админ",
+    "Help" : "Помощ",
+    "Access forbidden" : "Достъпът е забранен",
+    "File not found" : "Файлът не е открит",
+    "The specified document has not been found on the server." : "Избраният документ не е намерен на сървъра.",
+    "You can click here to return to %s." : "Можете да натиснете тук, за да се върнете на %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здравейте,\n\nсамо да ви уведомяваме, че %s сподели %s с вас.\nРазгледай го: %s\n\n",
+    "The share will expire on %s." : "Споделянето ще изтече на %s.",
+    "Cheers!" : "Поздрави!",
+    "Internal Server Error" : "Вътрешна системна грешка",
+    "The server encountered an internal error and was unable to complete your request." : "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Моля, свържете се със сървърния администратор, ако тази грешка се появи отново. Също така Ви Молим да включите техническите данни, показани в доклада по-долу.",
+    "More details can be found in the server log." : "Повече детайли могат да бъдат намерени в сървърния журнал.",
+    "Technical details" : "Технически детайли",
+    "Remote Address: %s" : "Отдалечен адрес: %s",
+    "Request ID: %s" : "ID на заявка: %s",
+    "Type: %s" : "Тип: %s",
+    "Code: %s" : "Код: %s",
+    "Message: %s" : "Съобщение: %s",
+    "File: %s" : "Файл: %s",
+    "Line: %s" : "Линия: %s",
+    "Trace" : "Проследяване на грешките",
+    "Security warning" : "Предупреждение за сигурност",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашата директория за данни и файлове Ви вероятно са достъпни от интернет, поради това, че файлът \".htaccess\" не функционира.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "За информация как правилно да конфигурирате сървъра, моля, вижте <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">документацията</a>.",
+    "Create an <strong>admin account</strong>" : "Създаване на <strong>администраторски профил</strong>.",
+    "Username" : "Потребител",
+    "Storage & database" : "Хранилища и бази данни",
+    "Data folder" : "Директория за данни",
+    "Configure the database" : "Конфигуриране на базата данни",
+    "Only %s is available." : "Само %s е наличен.",
+    "Install and activate additional PHP modules to choose other database types." : "Инсталирайте и активирайте допълнителни PHP модули, за да изберете други видове бази данни.",
+    "For more details check out the documentation." : "За повече детайли проверете документацията.",
+    "Database user" : "Потребител за базата данни",
+    "Database password" : "Парола за базата данни",
+    "Database name" : "Име на базата данни",
+    "Database tablespace" : "Tablespace на базата данни",
+    "Database host" : "Хост за базата данни",
+    "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 не се препоръчва, особено ако ползвате клиента за настолен компютър.",
+    "Finish setup" : "Завършване на настройките",
+    "Finishing …" : "Завършване...",
+    "Need help?" : "Нуждаете се от помощ?",
+    "See the documentation" : "Прегледайте документацията",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "За да функционира приложението изисква JavaScript. Моля, {linkstart}включете JavaScript{linkend} и презаредете страницата.",
+    "Search" : "Търсене",
+    "Log out" : "Отписване",
+    "This action requires you to confirm your password:" : "Това действие изисква да потвърдите паролата си:",
+    "Confirm your password" : "Потвърдете паролата си",
+    "Server side authentication failed!" : "Удостоверяването от страна на сървъра е неуспешно!",
+    "Please contact your administrator." : "Моля, свържете се с администратора.",
+    "An internal error occurred." : "Възникна вътрешна грешка.",
+    "Please try again or contact your administrator." : "Опитайте отново или се свържете с администраотра.",
+    "Username or email" : "Потребител или имейл",
+    "Wrong password. Reset it?" : "Грешна парола. Желаете ли нова парола?",
+    "Wrong password." : "Грешна парола",
+    "Log in" : "Вписване",
+    "Stay logged in" : "Остани вписан",
+    "Alternative Logins" : "Алтернативни методи на вписване",
+    "Use the following link to reset your password: {link}" : "Използвайте следната връзка, за да възстановите паролата си: {link}",
+    "New password" : "Нова парола",
+    "New Password" : "Нова парола",
+    "Reset password" : "Възстановяване на паролата",
+    "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 Nextcloud instance is currently in single user mode." : "В момента този Nextcloud е в режим допускащ само един потребител.",
+    "This means only administrators can use the instance." : "Това означава, че само администраторът може да го използва.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Свържете се със системния администратор ако това съобщение се задържи твърде дълго или се е появило неочаквано.",
+    "Thank you for your patience." : "Благодарим за търпението.",
+    "Two-factor authentication" : "Двуфакторно удостоверяване",
+    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Повишената сигурност е активирана за профила ви. Моля удостоверете използвайки втори фактор.",
+    "Cancel log in" : "Откажи вписване",
+    "Use backup code" : "Използвай код за възстановяване",
+    "Error while validating your second factor" : "Грешка при валидиране на втория ви фактор",
+    "You are accessing the server from an untrusted domain." : "Свръзвате се със сървъра от домейн, който не е отбелязан като сигурен.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Моля, свържете се с администратора. Ако сте администратор на текущата инстанция, конфигурирайте \"trusted_domains\" настройките в 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\" като сигурен домейн",
+    "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" : "Начало на обновяването",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "За да избегнеш таймаутове при по-големи инсталации, можеш да изпълниш следните команди в инсталанционната директория:",
+    "Detailed logs" : "Подробни логове",
+    "Update needed" : "Нужно е обновяване",
+    "Please use the command line updater because you have a big instance." : "Моля използвайте съветникът за обновяване в команден ред, защото инстанцията ви е голяма.",
+    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "За помощ, вижте  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документацията</a>.",
+    "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 е отново на линия.",
+    "Error loading tags" : "Грешка при зареждане на етикети",
+    "Tag already exists" : "Етикетът вече съществува",
+    "Error deleting tag(s)" : "Грешка при изтриване на етикет(и)",
+    "Error tagging" : "Грешка при задаване на етикета",
+    "Error untagging" : "Грешка при премахване на етикета",
+    "Error favoriting" : "Грешка при добавяне в любими",
+    "Error unfavoriting" : "Грешка при премахване от любими",
+    "Couldn't send mail to following users: %s " : "Изпращането на имейл до следните потребители не е възможно: %s",
+    "Sunday" : "неделя",
+    "Monday" : "понеделник",
+    "Tuesday" : "вторник",
+    "Wednesday" : "сряда",
+    "Thursday" : "четвъртък",
+    "Friday" : "петък",
+    "Saturday" : "събота",
+    "Sun." : "нед",
+    "Mon." : "пон",
+    "Tue." : "вт",
+    "Wed." : "ср",
+    "Thu." : "чет",
+    "Fri." : "пет",
+    "Sat." : "съб",
+    "Su" : "нд",
+    "Mo" : "пн",
+    "Tu" : "вт",
+    "We" : "ср",
+    "Th" : "чт",
+    "Fr" : "пт",
+    "Sa" : "сб",
+    "January" : "януари",
+    "February" : "февруару",
+    "March" : "март",
+    "April" : "април",
+    "May" : "май",
+    "June" : "юни",
+    "July" : "юли",
+    "August" : "август",
+    "September" : "септември",
+    "October" : "октомври",
+    "November" : "ноември",
+    "December" : "декември",
+    "Jan." : "яну",
+    "Feb." : "фев",
+    "Mar." : "мар",
+    "Apr." : "апр",
+    "May." : "май",
+    "Jun." : "юни",
+    "Jul." : "юли",
+    "Aug." : "авг",
+    "Sep." : "сеп",
+    "Oct." : "окт",
+    "Nov." : "ное",
+    "Dec." : "дек",
+    "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?" : "Файловете Ви са криптирани. Ако не сте настроили ключ за възстановяване, няма да можете да възстановите данните си след смяна на паролата.<br />Ако не сте сигурни какво да направите, моля, свържете се с Вашия администратор преди да продължите. <br/>Наистина ли желаете да продължите?",
+    "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." : "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
+    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Хедърите за обратно прокси са невалидни, или достъпвате Nextcloud от доверено прокси. Ако не достъпвате Nextcloud от доверено прокси, то това е проблем в сигурността и може да позволи на хакер да прикрие IP адреса си в Nextcloud. Допълнителна информация може да бъде намерена в нашата <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документация</a>.",
+    "Hide file listing" : "Скрий показването на файлове",
+    "Sending ..." : "Изпращане ...",
+    "Email sent" : "Имейла е изпратен",
+    "Send link via email" : "Сподели връзка с имейл",
+    "notify by email" : "уведомяване по електронна поща",
+    "can share" : "може да споделя",
+    "create" : "създаване",
+    "change" : "промяна",
+    "delete" : "изтриване",
+    "{sharee} (at {server})" : "{sharee} (в {server})",
+    "Share with users…" : "Споделяне с потребители...",
+    "Share with users, groups or remote users…" : "Споделяне с потребители, групи и отдалечени потребители...",
+    "Share with users or groups…" : "Споделяне с потребители или групи...",
+    "Share with users or remote users…" : "Споделяне с потребители или с отдалечени потребители...",
+    "Warning" : "Предупреждение",
+    "Error while sending notification" : "Грешка при изпращане на уведомление",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Актуализирането е в процес, в някой среди - напускането на тази страница може да прекъсне процеса.",
+    "Updating to {version}" : "Обновяване до {version}",
+    "The update was successful. There were warnings." : "Обновяването мина успешно. Има предупреждения.",
+    "No search results in other folders" : "Няма търсени резултати в други папки",
+    "Two-step verification" : "Потвърждаване в две стъпки",
+    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Повишената сигурност е активирана за профила ви. Моля удостоверете използвайки втори фактор.",
+    "Cancel login" : "Откажи вписване",
+    "Please authenticate using the selected factor." : "Моля удостоверете използвайки вторият фактор.",
+    "An error occured while verifying the token" : "Възникна грешка при проверка на токена"
+},"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 b96bd2116a0..3c590e6f727 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -60,7 +60,7 @@ OC.L10N.register(
     "seconds ago" : "před pár sekundami",
     "Logging in …" : "Přihlašování …",
     "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." : "Odkaz na obnovení hesla byl odeslán na vaši emailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte nevyžádanou poštu a koš.<br>Pokud jej nenaleznete, kontaktujte svého správce systému.",
-    "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?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data zpět.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce systému, než budete pokračovat. <br />Opravdu si přejete pokračovat?",
+    "Your files are encrypted. 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?" : "Vaše soubory jsou šifrovány. Po vyresetování vašeho hesla nebudete moc získat data zpět.<br/>Pokud si nejste jisti tím co děláte, předtím než budete pokračovat, kontaktujte vašeho administrátora.<br/>Opravdu chcete pokračovat?",
     "I know what I'm doing" : "Vím co dělám",
     "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého správce systému.",
     "No" : "Ne",
@@ -122,6 +122,8 @@ OC.L10N.register(
     "Link" : "Odkaz",
     "Password protect" : "Chránit heslem",
     "Allow upload and editing" : "Povolit nahrávání a úpravy",
+    "Allow editing" : "Povolit úpravy",
+    "File drop (upload only)" : "Přetažení souboru (pouze nahrání)",
     "Email link to person" : "Odeslat osobě odkaz emailem",
     "Send" : "Odeslat",
     "Shared with you and the group {group} by {owner}" : "S Vámi a skupinou {group} sdílí {owner}",
@@ -229,6 +231,7 @@ OC.L10N.register(
     "Database name" : "Název databáze",
     "Database tablespace" : "Tabulkový prostor databáze",
     "Database host" : "Hostitel databáze",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Prosím, specifikujte port spolu se jménem hostitele (t. j., localhost:5432).",
     "Performance warning" : "Varování o výkonu",
     "SQLite will be used as database." : "Bude použita SQLite databáze.",
     "For larger installations we recommend to choose a different database backend." : "Pro větší instalace doporučujeme vybrat jiné databázové řešení.",
@@ -238,8 +241,8 @@ OC.L10N.register(
     "Need help?" : "Potřebujete pomoc?",
     "See the documentation" : "Shlédnout dokumentaci",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím {linkstart}povolte JavaScript{linkend} a znovu načtěte stránku.",
-    "Log out" : "Odhlásit se",
     "Search" : "Hledat",
+    "Log out" : "Odhlásit se",
     "This action requires you to confirm your password:" : "Tato akce vyžaduje potvrzení vašeho hesla:",
     "Confirm your password" : "Potvrdit heslo",
     "Server side authentication failed!" : "Autentizace na serveru selhala!",
@@ -337,9 +340,9 @@ OC.L10N.register(
     "Oct." : "íjen",
     "Nov." : "listopad",
     "Dec." : "prosinec",
+    "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?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data zpět.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce systému, než budete pokračovat. <br />Opravdu si přejete pokračovat?",
     "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." : "Tento server nemá funkční připojení k Internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích emailů také nemusí fungovat. Pokud chcete využívat všechny možnosti ownCloud, doporučujeme povolit pro tento server připojení k Internetu.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurace hlaviček reverzní proxy není správná nebo přistupujete na ownCloud z důvěryhodné proxy. Pokud nepřistupujete k ownCloud z důvěryhodné proxy, potom je toto bezpečností chyba a může útočníkovi umožnit falšovat IP adresu, kterou ownCloud vidí. Další informace lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>.",
-    "Allow editing" : "Povolit úpravy",
     "Hide file listing" : "Skrýt seznam souborů",
     "Sending ..." : "Odesílám ...",
     "Email sent" : "Email odeslán",
@@ -364,20 +367,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Bylo zapnuto vylepšené zabezpečení pro tento účet. Přihlašte se za použití druhého faktoru.",
     "Cancel login" : "Zrušit přihlášení",
     "Please authenticate using the selected factor." : "Přihlašte se za použití vybraného faktoru.",
-    "An error occured while verifying the token" : "Chyba při ověřování tokenu",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Tento webový server není správně nastaven pro rozpoznání \"{url}\". Více informací lze nalézt v naší <a target=\"_blank\" href=\"{docLink}\">dokumentaci</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Nebyla nakonfigurována paměťová cache. Pokud je dostupná, nakonfigurujte ji prosím pro zlepšení výkonu. Další informace lze nalézt v naší <a target=\"_blank\" 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 target=\"_blank\" 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 naší <a target=\"_blank\" href=\"{docLink}\">dokumentaci</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Aktuálně používáte PHP {version}. Doporučujeme aktualizovat verzi PHP, abyste mohli využít <a target=\"_blank\" href=\"{phpLink}\">výkonnostních a bezpečnostních aktualizací poskytovaných autory PHP</a> tak rychle, jak to vaše distribuce umožňuje.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Konfigurace hlaviček reverzní proxy není správná nebo přistupujete na Nextcloud z důvěryhodné proxy. Pokud nepřistupujete k Nextcloud z důvěryhodné proxy, potom je toto bezpečností chyba a může útočníkovi umožnit falšovat IP adresu, kterou ownCloud vidí. Další informace lze nalézt v naší <a target=\"_blank\" href=\"{docLink}\">dokumentaci</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Je nakonfigurován memcached jako distribuovaná cache, ale je nainstalovaný nesprávný PHP modul \"memcache\". \\OC\\Memcache\\Memcached podporuje pouze \"memcached\" a ne \"memcache\". Podívejte se na <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki o obou modulech</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Některé soubory neprošly kontrolou integrity. Více informací o tom jak tento problém vyřešit, lze nalézt v naší <a target=\"_blank\" href=\"{docLink}\">dokumentaci</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Seznam neplatných souborů…</a> / <a href=\"{rescanEndpoint}\">Znovu ověřit…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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>.",
-    "An error occured. Please try again" : "Došlo k chybě. Zkuste to prosím znovu",
-    "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",
-    "not assignable" : "nepřiřaditelné",
-    "Updating {productName} to version {version}, this may take a while." : "Aktualizace {productName} na verzi {version}, to chvíli potrvá.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
-    "An internal error occured." : "Nastala vnitřní chyba."
+    "An error occured while verifying the token" : "Chyba při ověřování tokenu"
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 20f86d4de2d..ef9261ac7b9 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -58,7 +58,7 @@
     "seconds ago" : "před pár sekundami",
     "Logging in …" : "Přihlašování …",
     "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." : "Odkaz na obnovení hesla byl odeslán na vaši emailovou adresu. Pokud jej v krátké době neobdržíte, zkontrolujte nevyžádanou poštu a koš.<br>Pokud jej nenaleznete, kontaktujte svého správce systému.",
-    "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?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data zpět.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce systému, než budete pokračovat. <br />Opravdu si přejete pokračovat?",
+    "Your files are encrypted. 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?" : "Vaše soubory jsou šifrovány. Po vyresetování vašeho hesla nebudete moc získat data zpět.<br/>Pokud si nejste jisti tím co děláte, předtím než budete pokračovat, kontaktujte vašeho administrátora.<br/>Opravdu chcete pokračovat?",
     "I know what I'm doing" : "Vím co dělám",
     "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého správce systému.",
     "No" : "Ne",
@@ -120,6 +120,8 @@
     "Link" : "Odkaz",
     "Password protect" : "Chránit heslem",
     "Allow upload and editing" : "Povolit nahrávání a úpravy",
+    "Allow editing" : "Povolit úpravy",
+    "File drop (upload only)" : "Přetažení souboru (pouze nahrání)",
     "Email link to person" : "Odeslat osobě odkaz emailem",
     "Send" : "Odeslat",
     "Shared with you and the group {group} by {owner}" : "S Vámi a skupinou {group} sdílí {owner}",
@@ -227,6 +229,7 @@
     "Database name" : "Název databáze",
     "Database tablespace" : "Tabulkový prostor databáze",
     "Database host" : "Hostitel databáze",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Prosím, specifikujte port spolu se jménem hostitele (t. j., localhost:5432).",
     "Performance warning" : "Varování o výkonu",
     "SQLite will be used as database." : "Bude použita SQLite databáze.",
     "For larger installations we recommend to choose a different database backend." : "Pro větší instalace doporučujeme vybrat jiné databázové řešení.",
@@ -236,8 +239,8 @@
     "Need help?" : "Potřebujete pomoc?",
     "See the documentation" : "Shlédnout dokumentaci",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím {linkstart}povolte JavaScript{linkend} a znovu načtěte stránku.",
-    "Log out" : "Odhlásit se",
     "Search" : "Hledat",
+    "Log out" : "Odhlásit se",
     "This action requires you to confirm your password:" : "Tato akce vyžaduje potvrzení vašeho hesla:",
     "Confirm your password" : "Potvrdit heslo",
     "Server side authentication failed!" : "Autentizace na serveru selhala!",
@@ -335,9 +338,9 @@
     "Oct." : "íjen",
     "Nov." : "listopad",
     "Dec." : "prosinec",
+    "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?" : "Vaše soubory jsou šifrovány. Pokud jste nepovolili klíč pro obnovení, neexistuje způsob jak získat po změně hesla vaše data zpět.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce systému, než budete pokračovat. <br />Opravdu si přejete pokračovat?",
     "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." : "Tento server nemá funkční připojení k Internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích emailů také nemusí fungovat. Pokud chcete využívat všechny možnosti ownCloud, doporučujeme povolit pro tento server připojení k Internetu.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurace hlaviček reverzní proxy není správná nebo přistupujete na ownCloud z důvěryhodné proxy. Pokud nepřistupujete k ownCloud z důvěryhodné proxy, potom je toto bezpečností chyba a může útočníkovi umožnit falšovat IP adresu, kterou ownCloud vidí. Další informace lze nalézt v naší <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentaci</a>.",
-    "Allow editing" : "Povolit úpravy",
     "Hide file listing" : "Skrýt seznam souborů",
     "Sending ..." : "Odesílám ...",
     "Email sent" : "Email odeslán",
@@ -362,20 +365,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Bylo zapnuto vylepšené zabezpečení pro tento účet. Přihlašte se za použití druhého faktoru.",
     "Cancel login" : "Zrušit přihlášení",
     "Please authenticate using the selected factor." : "Přihlašte se za použití vybraného faktoru.",
-    "An error occured while verifying the token" : "Chyba při ověřování tokenu",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Tento webový server není správně nastaven pro rozpoznání \"{url}\". Více informací lze nalézt v naší <a target=\"_blank\" href=\"{docLink}\">dokumentaci</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Nebyla nakonfigurována paměťová cache. Pokud je dostupná, nakonfigurujte ji prosím pro zlepšení výkonu. Další informace lze nalézt v naší <a target=\"_blank\" 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 target=\"_blank\" 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 naší <a target=\"_blank\" href=\"{docLink}\">dokumentaci</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Aktuálně používáte PHP {version}. Doporučujeme aktualizovat verzi PHP, abyste mohli využít <a target=\"_blank\" href=\"{phpLink}\">výkonnostních a bezpečnostních aktualizací poskytovaných autory PHP</a> tak rychle, jak to vaše distribuce umožňuje.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Konfigurace hlaviček reverzní proxy není správná nebo přistupujete na Nextcloud z důvěryhodné proxy. Pokud nepřistupujete k Nextcloud z důvěryhodné proxy, potom je toto bezpečností chyba a může útočníkovi umožnit falšovat IP adresu, kterou ownCloud vidí. Další informace lze nalézt v naší <a target=\"_blank\" href=\"{docLink}\">dokumentaci</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Je nakonfigurován memcached jako distribuovaná cache, ale je nainstalovaný nesprávný PHP modul \"memcache\". \\OC\\Memcache\\Memcached podporuje pouze \"memcached\" a ne \"memcache\". Podívejte se na <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki o obou modulech</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Některé soubory neprošly kontrolou integrity. Více informací o tom jak tento problém vyřešit, lze nalézt v naší <a target=\"_blank\" href=\"{docLink}\">dokumentaci</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Seznam neplatných souborů…</a> / <a href=\"{rescanEndpoint}\">Znovu ověřit…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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>.",
-    "An error occured. Please try again" : "Došlo k chybě. Zkuste to prosím znovu",
-    "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",
-    "not assignable" : "nepřiřaditelné",
-    "Updating {productName} to version {version}, this may take a while." : "Aktualizace {productName} na verzi {version}, to chvíli potrvá.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
-    "An internal error occured." : "Nastala vnitřní chyba."
+    "An error occured while verifying the token" : "Chyba při ověřování tokenu"
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/core/l10n/da.js b/core/l10n/da.js
index a29f3d00a3d..16740e8fc55 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -50,7 +50,6 @@ OC.L10N.register(
     "Cancel" : "Annuller",
     "seconds ago" : "sekunder siden",
     "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." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
-    "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?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
     "I know what I'm doing" : "Jeg ved, hvad jeg har gang i",
     "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
     "No" : "Nej",
@@ -101,6 +100,7 @@ OC.L10N.register(
     "Share link" : "Del link",
     "Link" : "Link",
     "Password protect" : "Beskyt med adgangskode",
+    "Allow editing" : "Tillad redigering",
     "Email link to person" : "E-mail link til person",
     "Send" : "Send",
     "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
@@ -192,8 +192,8 @@ OC.L10N.register(
     "Need help?" : "Brug for hjælp?",
     "See the documentation" : "Se dokumentationen",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denne applikation kræver JavaScript for at fungere korrekt. {linkstart}Slå venligst JavaScript til{linkend} og genindlæs siden. ",
-    "Log out" : "Log ud",
     "Search" : "Søg",
+    "Log out" : "Log ud",
     "Server side authentication failed!" : "Server side godkendelse mislykkedes!",
     "Please contact your administrator." : "Kontakt venligst din administrator",
     "An internal error occurred." : "Der opstod en intern fejl.",
@@ -279,8 +279,8 @@ OC.L10N.register(
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dec.",
+    "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?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurationen af reverse proxy-headere er ikke korrekt eller du tilgår ownCloud fra en betroet proxy. Hvis du ikke tilgår ownCloud fra en betroet proxy, så er dette et sikkerhedsproblem og kan tillade en angriber af forfalske deres IP-adresse som synlig for ownCloud. Yderligere information kan findes i vores <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
-    "Allow editing" : "Tillad redigering",
     "Sending ..." : "Sender ...",
     "Email sent" : "E-mail afsendt",
     "Send link via email" : "Send link via e-mail",
@@ -296,7 +296,6 @@ OC.L10N.register(
     "Warning" : "Advarsel",
     "Error while sending notification" : "Fejl ved afsendelse af notifikation",
     "No search results in other folders" : "Søgning gav ingen resultater in andre mapper",
-    "Cancel login" : "Annuller login",
-    "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"
+    "Cancel login" : "Annuller login"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/da.json b/core/l10n/da.json
index 253b1966cd0..b479be4e426 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -48,7 +48,6 @@
     "Cancel" : "Annuller",
     "seconds ago" : "sekunder siden",
     "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." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
-    "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?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
     "I know what I'm doing" : "Jeg ved, hvad jeg har gang i",
     "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
     "No" : "Nej",
@@ -99,6 +98,7 @@
     "Share link" : "Del link",
     "Link" : "Link",
     "Password protect" : "Beskyt med adgangskode",
+    "Allow editing" : "Tillad redigering",
     "Email link to person" : "E-mail link til person",
     "Send" : "Send",
     "Shared with you and the group {group} by {owner}" : "Delt med dig og gruppen {group} af {owner}",
@@ -190,8 +190,8 @@
     "Need help?" : "Brug for hjælp?",
     "See the documentation" : "Se dokumentationen",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denne applikation kræver JavaScript for at fungere korrekt. {linkstart}Slå venligst JavaScript til{linkend} og genindlæs siden. ",
-    "Log out" : "Log ud",
     "Search" : "Søg",
+    "Log out" : "Log ud",
     "Server side authentication failed!" : "Server side godkendelse mislykkedes!",
     "Please contact your administrator." : "Kontakt venligst din administrator",
     "An internal error occurred." : "Der opstod en intern fejl.",
@@ -277,8 +277,8 @@
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dec.",
+    "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?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurationen af reverse proxy-headere er ikke korrekt eller du tilgår ownCloud fra en betroet proxy. Hvis du ikke tilgår ownCloud fra en betroet proxy, så er dette et sikkerhedsproblem og kan tillade en angriber af forfalske deres IP-adresse som synlig for ownCloud. Yderligere information kan findes i vores <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
-    "Allow editing" : "Tillad redigering",
     "Sending ..." : "Sender ...",
     "Email sent" : "E-mail afsendt",
     "Send link via email" : "Send link via e-mail",
@@ -294,7 +294,6 @@
     "Warning" : "Advarsel",
     "Error while sending notification" : "Fejl ved afsendelse af notifikation",
     "No search results in other folders" : "Søgning gav ingen resultater in andre mapper",
-    "Cancel login" : "Annuller login",
-    "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"
+    "Cancel login" : "Annuller login"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/de.js b/core/l10n/de.js
index f16de9940aa..3ac9e1ab061 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "Please select a file." : "Bitte wähle eine Datei aus.",
+    "Please select a file." : "Bitte eine Datei wählen.",
     "File is too big" : "Datei ist zu groß",
     "The selected file is not an image." : "Die ausgewählte Datei ist kein Bild.",
     "The selected file cannot be read." : "Die ausgewählte Datei konnte nicht gelesen werden.",
@@ -60,7 +60,7 @@ OC.L10N.register(
     "seconds ago" : "Gerade eben",
     "Logging in …" : "Melde an ...",
     "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." : "Der Link zum Rücksetzen deines Passwortes ist an deine E-Mail-Adresse versandt worden. Solltest du in Kürze keine entsprechende E-Mail erhalten, überprüfe bitte deinen Spam-Ordner.<br>Ansonsten kannst du dich bei deinem lokalen Administrator melden.",
-    "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?" : "Deine Dateien sind verschlüsselt. Solltest du den Wiederherstellungsschlüssel nicht aktiviert haben, gibt es keine Möglichkeit, deine Daten zurückzuerlangen, nachdem dein Passwort zurückgesetzt wurde.<br />Falls du dir nicht sicher bist, was zu tun ist, kontaktiere bitte deinen Administrator, bevor du fortfährst<br />Möchtest du wirklich fortfahren?",
+    "Your files are encrypted. 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?" : "Deine Dateien sind verschlüsselt. Es gibt keinen Weg Deine Dateien nach dem Rücksetzen des Passwortes wiederherzustellen.<br />Falls Du Dir nicht sicher bist, kontaktiere Deinen Administrator.<br />Möchtest Du wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere deinen Administrator.",
     "No" : "Nein",
@@ -87,7 +87,7 @@ OC.L10N.register(
     "So-so password" : "Passables Passwort",
     "Good password" : "Gutes Passwort",
     "Strong password" : "Starkes Passwort",
-    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ihr Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich nicht funktioniert.",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Dein Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, da die WebDAV-Schnittstelle vermutlich nicht funktioniert.",
     "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Dein Web-Server ist nicht richtig eingerichtet um die folgende URL richtig aufzulösen \"{url}\". Weitere Informationen findest du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.",
     "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Dieser Server hat keine funktionierende Internetverbindung: Mehrere Ziele konnten nicht erreicht werden. Dies bedeutet, dass einige Funktionen, wie das Einhängen exernen Speichers, Benachrichtigungen über Updates oder die Installation von Drittanbieter-Apps nicht funktionieren. \nDer Zugriff auf entfernte Dateien und das Senden von E-Mail-Benachrichtigungen wird wahrscheinlich ebenfalls nicht funktionieren.\nEs wird empfohlen, die Internet-Verbindung für diesen Server zu aktivieren, wenn Du alle Funktionen nutzen möchtest.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Zur Erhöhung der Leistungsfähigkeit kann ein Memory-Cache konfiguriert werden. Weitere Informationen findest du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.",
@@ -122,6 +122,7 @@ OC.L10N.register(
     "Link" : "Link",
     "Password protect" : "Passwortschutz",
     "Allow upload and editing" : "Hochladen und Bearbeiten erlauben",
+    "Allow editing" : "Bearbeitung erlauben",
     "File drop (upload only)" : "Dateien ablegen (nur Hochladen)",
     "Email link to person" : "Link per E-Mail verschicken",
     "Send" : "Senden",
@@ -139,7 +140,7 @@ OC.L10N.register(
     "can delete" : "kann löschen",
     "access control" : "Zugriffskontrolle",
     "Could not unshare" : "Freigabe konnte nicht entfernt werden",
-    "Share details could not be loaded for this item." : "Details der geteilten Freigabe konnten nicht geladen werden zu diesem Eintrag.",
+    "Share details could not be loaded for this item." : "Details der geteilten Freigabe zu diesem Eintrag konnten nicht geladen werden.",
     "No users or groups found for {search}" : "Keine Benutzer oder Gruppen gefunden für {search}",
     "No users found for {search}" : "Kein Benutzer gefunden für {search}",
     "An error occurred. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
@@ -230,6 +231,7 @@ OC.L10N.register(
     "Database name" : "Datenbank-Name",
     "Database tablespace" : "Datenbank-Tablespace",
     "Database host" : "Datenbank-Host",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Bitte die Portnummer mit der Hostadresse zusammen angeben (z.B. localhost:5432)",
     "Performance warning" : "Leistungswarnung",
     "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
     "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
@@ -239,14 +241,14 @@ OC.L10N.register(
     "Need help?" : "Hilfe nötig?",
     "See the documentation" : "Schau in die Dokumentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Diese Anwendung benötigt JavaScript zum ordnungsgemäßen Betrieb. Bitte aktiviere {linkstart}JavaScript{linkend} und lade die Seite neu.",
-    "Log out" : "Abmelden",
     "Search" : "Suche",
+    "Log out" : "Abmelden",
     "This action requires you to confirm your password:" : "Dieser Vorgang benötigt eine Passwortbestätigung von dir:",
     "Confirm your password" : "Bestätige dein Passwort",
     "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
-    "Please contact your administrator." : "Bitte kontaktiere deinen Administrator.",
+    "Please contact your administrator." : "Bitte kontaktiere den Administrator.",
     "An internal error occurred." : "Es ist ein interner Fehler aufgetreten.",
-    "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere deinen Administrator.",
+    "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere den Administrator.",
     "Username or email" : "Benutzername oder E-Mail",
     "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "Wrong password." : "Falsches Passwort.",
@@ -260,7 +262,7 @@ OC.L10N.register(
     "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 Nextcloud instance is currently in single user mode." : "Diese Nextcloud-Instanz befindet sich derzeit im Einzelbenutzermodus.",
     "This means only administrators can use the instance." : "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
-    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktiere deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktiere den Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
     "Thank you for your patience." : "Vielen Dank für deine Geduld.",
     "Two-factor authentication" : "Zwei-Faktor Authentifizierung",
     "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Die erweiterte Sicherheit wurde für dein Konto aktiviert. Bitte authentifiziere dich mit einem zweiten Faktor. ",
@@ -338,9 +340,9 @@ OC.L10N.register(
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dez.",
+    "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?" : "Deine Dateien sind verschlüsselt. Solltest du den Wiederherstellungsschlüssel nicht aktiviert haben, gibt es keine Möglichkeit, deine Daten zurückzuerlangen, nachdem dein Passwort zurückgesetzt wurde.<br />Falls du dir nicht sicher bist, was zu tun ist, kontaktiere bitte deinen Administrator, bevor du fortfährst<br />Möchtest du wirklich fortfahren?",
     "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." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn du alle Funktionen nutzen möchtest.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Der REVERSE PROXY HEADER ist falsch, oder du greifst auf Nextcloud über einen vertrauenswürdigen Proxy zu. Wenn du nicht über einen vertrauenswürdigen Proxy zugreifst, dann liegt ein Sicherheitsproblem vor, das es einem Angreifer ermöglichen könnte, die für Nextcloud sichtbare IP-Adresse zu fälschen. Weitere Informationen hierzu findest du in der <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.",
-    "Allow editing" : "Bearbeitung erlauben",
     "Hide file listing" : "Dateiliste verbergen",
     "Sending ..." : "Senden…",
     "Email sent" : "E-Mail wurde verschickt",
@@ -365,20 +367,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Die erweiterte Sicherheit wurde für dein Konto aktiviert. Bitte authentifiziere dich mit der zweiten Stufe.",
     "Cancel login" : "Anmelden abbrechen",
     "Please authenticate using the selected factor." : "Bitte authentifiziere dich mit dem ausgewählten zweiten Faktor. ",
-    "An error occured while verifying the token" : "Es ist ein Fehler bei der Verifizierung des Tokens aufgetreten",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Dein Web-Server ist nicht richtig eingerichtet um die folgende URL richtig aufzulösen: \"{url}\". Weitere Informationen findest du in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" 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 findest du in unserer <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu findest du in unserer <a target=\"_blank\"  href=\"{docLink}\">Dokumentation</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du verwendest derzeit PHP {version}. Wir empfehlen ein Upgrade deiner PHP-Version, um die <a target=\"_blank\" href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP-Gruppe bereitgestellt werden</a>, sobald deine Distribution diese unterstützt.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Die Reverse-Proxy-Header Konfiguration ist falsch, oder du greifst auf die Nextcloud von einem vertrauenswürdigen Proxy zu. Wenn du auf die Nextcloud nicht von einem vertrauenswürdigen Proxy zugreifst, dann liegt ein Sicherheitsproblem vor, das einem Angreifer ermöglichen könnte, die für Nextcloud sichtbare IP-Adresse zu fälschen. Weitere Informationen hierzu findest du in der <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached ist als distributed cache konfiguriert aber das falsche PHP-Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nur \"memcached\" jedoch nicht \"memcache\". Im <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki nach beiden Modulen suchen</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Einige Dateien haben die Integritätsprüfung nicht bestanden. Weiterführende Information zum Lösen des Problems findest du in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien ...</a> / <a href=\"{rescanEndpoint}\">Erneut analysieren…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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. Um die Sicherheit zu erhöhen, empfehlen wir das Aktivieren von HSTS, wie es in den <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.",
-    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Teile es mit Nutzern auf anderen Nextclouds. Die Syntax hierfür lautet: username@example.com/nextcloud",
-    "not assignable" : "nicht zuweisbar",
-    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}, dies kann eine Weile dauern.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren deines Servers kannst du der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
-    "An internal error occured." : "Es ist ein interner Fehler aufgetreten."
+    "An error occured while verifying the token" : "Es ist ein Fehler bei der Verifizierung des Tokens aufgetreten"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 027b10bda5f..be81fc7f0a2 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Please select a file." : "Bitte wähle eine Datei aus.",
+    "Please select a file." : "Bitte eine Datei wählen.",
     "File is too big" : "Datei ist zu groß",
     "The selected file is not an image." : "Die ausgewählte Datei ist kein Bild.",
     "The selected file cannot be read." : "Die ausgewählte Datei konnte nicht gelesen werden.",
@@ -58,7 +58,7 @@
     "seconds ago" : "Gerade eben",
     "Logging in …" : "Melde an ...",
     "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." : "Der Link zum Rücksetzen deines Passwortes ist an deine E-Mail-Adresse versandt worden. Solltest du in Kürze keine entsprechende E-Mail erhalten, überprüfe bitte deinen Spam-Ordner.<br>Ansonsten kannst du dich bei deinem lokalen Administrator melden.",
-    "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?" : "Deine Dateien sind verschlüsselt. Solltest du den Wiederherstellungsschlüssel nicht aktiviert haben, gibt es keine Möglichkeit, deine Daten zurückzuerlangen, nachdem dein Passwort zurückgesetzt wurde.<br />Falls du dir nicht sicher bist, was zu tun ist, kontaktiere bitte deinen Administrator, bevor du fortfährst<br />Möchtest du wirklich fortfahren?",
+    "Your files are encrypted. 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?" : "Deine Dateien sind verschlüsselt. Es gibt keinen Weg Deine Dateien nach dem Rücksetzen des Passwortes wiederherzustellen.<br />Falls Du Dir nicht sicher bist, kontaktiere Deinen Administrator.<br />Möchtest Du wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere deinen Administrator.",
     "No" : "Nein",
@@ -85,7 +85,7 @@
     "So-so password" : "Passables Passwort",
     "Good password" : "Gutes Passwort",
     "Strong password" : "Starkes Passwort",
-    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Ihr Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich nicht funktioniert.",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Dein Webserver ist noch nicht hinreichend für Datei-Synchronisation konfiguriert, da die WebDAV-Schnittstelle vermutlich nicht funktioniert.",
     "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Dein Web-Server ist nicht richtig eingerichtet um die folgende URL richtig aufzulösen \"{url}\". Weitere Informationen findest du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.",
     "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Dieser Server hat keine funktionierende Internetverbindung: Mehrere Ziele konnten nicht erreicht werden. Dies bedeutet, dass einige Funktionen, wie das Einhängen exernen Speichers, Benachrichtigungen über Updates oder die Installation von Drittanbieter-Apps nicht funktionieren. \nDer Zugriff auf entfernte Dateien und das Senden von E-Mail-Benachrichtigungen wird wahrscheinlich ebenfalls nicht funktionieren.\nEs wird empfohlen, die Internet-Verbindung für diesen Server zu aktivieren, wenn Du alle Funktionen nutzen möchtest.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Zur Erhöhung der Leistungsfähigkeit kann ein Memory-Cache konfiguriert werden. Weitere Informationen findest du in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.",
@@ -120,6 +120,7 @@
     "Link" : "Link",
     "Password protect" : "Passwortschutz",
     "Allow upload and editing" : "Hochladen und Bearbeiten erlauben",
+    "Allow editing" : "Bearbeitung erlauben",
     "File drop (upload only)" : "Dateien ablegen (nur Hochladen)",
     "Email link to person" : "Link per E-Mail verschicken",
     "Send" : "Senden",
@@ -137,7 +138,7 @@
     "can delete" : "kann löschen",
     "access control" : "Zugriffskontrolle",
     "Could not unshare" : "Freigabe konnte nicht entfernt werden",
-    "Share details could not be loaded for this item." : "Details der geteilten Freigabe konnten nicht geladen werden zu diesem Eintrag.",
+    "Share details could not be loaded for this item." : "Details der geteilten Freigabe zu diesem Eintrag konnten nicht geladen werden.",
     "No users or groups found for {search}" : "Keine Benutzer oder Gruppen gefunden für {search}",
     "No users found for {search}" : "Kein Benutzer gefunden für {search}",
     "An error occurred. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
@@ -228,6 +229,7 @@
     "Database name" : "Datenbank-Name",
     "Database tablespace" : "Datenbank-Tablespace",
     "Database host" : "Datenbank-Host",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Bitte die Portnummer mit der Hostadresse zusammen angeben (z.B. localhost:5432)",
     "Performance warning" : "Leistungswarnung",
     "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
     "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
@@ -237,14 +239,14 @@
     "Need help?" : "Hilfe nötig?",
     "See the documentation" : "Schau in die Dokumentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Diese Anwendung benötigt JavaScript zum ordnungsgemäßen Betrieb. Bitte aktiviere {linkstart}JavaScript{linkend} und lade die Seite neu.",
-    "Log out" : "Abmelden",
     "Search" : "Suche",
+    "Log out" : "Abmelden",
     "This action requires you to confirm your password:" : "Dieser Vorgang benötigt eine Passwortbestätigung von dir:",
     "Confirm your password" : "Bestätige dein Passwort",
     "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
-    "Please contact your administrator." : "Bitte kontaktiere deinen Administrator.",
+    "Please contact your administrator." : "Bitte kontaktiere den Administrator.",
     "An internal error occurred." : "Es ist ein interner Fehler aufgetreten.",
-    "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere deinen Administrator.",
+    "Please try again or contact your administrator." : "Bitte versuche es noch einmal oder kontaktiere den Administrator.",
     "Username or email" : "Benutzername oder E-Mail",
     "Wrong password. Reset it?" : "Falsches Passwort. Soll es zurückgesetzt werden?",
     "Wrong password." : "Falsches Passwort.",
@@ -258,7 +260,7 @@
     "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 Nextcloud instance is currently in single user mode." : "Diese Nextcloud-Instanz befindet sich derzeit im Einzelbenutzermodus.",
     "This means only administrators can use the instance." : "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
-    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktiere deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktiere den Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
     "Thank you for your patience." : "Vielen Dank für deine Geduld.",
     "Two-factor authentication" : "Zwei-Faktor Authentifizierung",
     "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Die erweiterte Sicherheit wurde für dein Konto aktiviert. Bitte authentifiziere dich mit einem zweiten Faktor. ",
@@ -336,9 +338,9 @@
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dez.",
+    "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?" : "Deine Dateien sind verschlüsselt. Solltest du den Wiederherstellungsschlüssel nicht aktiviert haben, gibt es keine Möglichkeit, deine Daten zurückzuerlangen, nachdem dein Passwort zurückgesetzt wurde.<br />Falls du dir nicht sicher bist, was zu tun ist, kontaktiere bitte deinen Administrator, bevor du fortfährst<br />Möchtest du wirklich fortfahren?",
     "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." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn du alle Funktionen nutzen möchtest.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Der REVERSE PROXY HEADER ist falsch, oder du greifst auf Nextcloud über einen vertrauenswürdigen Proxy zu. Wenn du nicht über einen vertrauenswürdigen Proxy zugreifst, dann liegt ein Sicherheitsproblem vor, das es einem Angreifer ermöglichen könnte, die für Nextcloud sichtbare IP-Adresse zu fälschen. Weitere Informationen hierzu findest du in der <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.",
-    "Allow editing" : "Bearbeitung erlauben",
     "Hide file listing" : "Dateiliste verbergen",
     "Sending ..." : "Senden…",
     "Email sent" : "E-Mail wurde verschickt",
@@ -363,20 +365,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Die erweiterte Sicherheit wurde für dein Konto aktiviert. Bitte authentifiziere dich mit der zweiten Stufe.",
     "Cancel login" : "Anmelden abbrechen",
     "Please authenticate using the selected factor." : "Bitte authentifiziere dich mit dem ausgewählten zweiten Faktor. ",
-    "An error occured while verifying the token" : "Es ist ein Fehler bei der Verifizierung des Tokens aufgetreten",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Dein Web-Server ist nicht richtig eingerichtet um die folgende URL richtig aufzulösen: \"{url}\". Weitere Informationen findest du in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" 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 findest du in unserer <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu findest du in unserer <a target=\"_blank\"  href=\"{docLink}\">Dokumentation</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du verwendest derzeit PHP {version}. Wir empfehlen ein Upgrade deiner PHP-Version, um die <a target=\"_blank\" href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP-Gruppe bereitgestellt werden</a>, sobald deine Distribution diese unterstützt.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Die Reverse-Proxy-Header Konfiguration ist falsch, oder du greifst auf die Nextcloud von einem vertrauenswürdigen Proxy zu. Wenn du auf die Nextcloud nicht von einem vertrauenswürdigen Proxy zugreifst, dann liegt ein Sicherheitsproblem vor, das einem Angreifer ermöglichen könnte, die für Nextcloud sichtbare IP-Adresse zu fälschen. Weitere Informationen hierzu findest du in der <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached ist als distributed cache konfiguriert aber das falsche PHP-Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nur \"memcached\" jedoch nicht \"memcache\". Im <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki nach beiden Modulen suchen</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Einige Dateien haben die Integritätsprüfung nicht bestanden. Weiterführende Information zum Lösen des Problems findest du in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien ...</a> / <a href=\"{rescanEndpoint}\">Erneut analysieren…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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. Um die Sicherheit zu erhöhen, empfehlen wir das Aktivieren von HSTS, wie es in den <a href=\"{docUrl}\">Sicherheitshinweisen</a> beschrieben ist.",
-    "An error occured. Please try again" : "Es ist ein Fehler aufgetreten. Bitte versuche es noch einmal",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Teile es mit Nutzern auf anderen Nextclouds. Die Syntax hierfür lautet: username@example.com/nextcloud",
-    "not assignable" : "nicht zuweisbar",
-    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}, dies kann eine Weile dauern.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren deines Servers kannst du der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
-    "An internal error occured." : "Es ist ein interner Fehler aufgetreten."
+    "An error occured while verifying the token" : "Es ist ein Fehler bei der Verifizierung des Tokens aufgetreten"
 },"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 b54de30fbac..626653e7d63 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -60,7 +60,7 @@ OC.L10N.register(
     "seconds ago" : "Gerade eben",
     "Logging in …" : "Melde an ...",
     "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." : "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse versandt worden. Sollten Sie ihn nicht in Kürze erhalten, prüfen Sie bitte Ihren Spam-Ordner.<br>Wenn die E-Mail sich nicht darin befindet, wenden Sie sich bette an Ihrem lokalen Administrator.",
-    "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?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+    "Your files are encrypted. 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?" : "Ihre Dateien sind verschlüsselt. Es gibt keinen Weg Ihre Dateien nach dem Rücksetzen des Passwortes wiederherzustellen.<br />Falls Sie sich nicht sicher sind, kontaktieren Sie Ihren Administrator.<br />Möchten Sie wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
     "No" : "Nein",
@@ -95,7 +95,7 @@ OC.L10N.register(
     "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Sie verwenden im Moment PHP {version}. Wir empfehlen ein Upgrade ihrer PHP Version, um die <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP Gruppe bereitgestellt werden</a>, sobald ihre Distribution diese unterstützt.",
     "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Die Reverse-Proxy-Header-Konfiguration ist fehlerhaft oder Sie greifen auf Nextcloud über einen vertrauenswürdigen Proxy zu. Wenn Sie auf Nextcloud nicht über einen vertrauenswürdigen Proxy zugreifen, dann besteht ein Sicherheitsproblem, das einem Angreifer erlaubt die IP-Adresse, die für Nextcloud sichtbar ist, auszuspähen. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.",
     "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcache ist als verteilter Cache konfiguriert, aber das falsche PHP Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nur \"memcached\" und nicht \"memcache\". Siehe <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached Wiki über beide Module</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Manche Dateien haben die Integritätsprüfung nicht bestanden. Weitere Informationen um den Fehler zu behen finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien...</a> / <a href=\"{rescanEndpoint}\">Erneut scannen…</a>)",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Manche Dateien haben die Integritätsprüfung nicht bestanden. Weitere Informationen um den Fehler zu beheben finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien...</a> / <a href=\"{rescanEndpoint}\">Erneut scannen…</a>)",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "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." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Ihren Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Sie es aus dem Document-Root-Verzeichnis des Webservers herausverschieben.",
     "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.",
@@ -122,6 +122,7 @@ OC.L10N.register(
     "Link" : "Link",
     "Password protect" : "Passwortschutz",
     "Allow upload and editing" : "Hochladen und Bearbeiten erlauben",
+    "Allow editing" : "Bearbeitung erlauben",
     "File drop (upload only)" : "Dateien ablegen (nur Hochladen)",
     "Email link to person" : "Link per E-Mail verschicken",
     "Send" : "Senden",
@@ -224,12 +225,13 @@ OC.L10N.register(
     "Configure the database" : "Datenbank einrichten",
     "Only %s is available." : "Es ist nur %s verfügbar.",
     "Install and activate additional PHP modules to choose other database types." : "Installieren und aktivieren Sie zusätzliche PHP-Module, um andere Datenbank-Typen auswählen zu können.",
-    "For more details check out the documentation." : "Schauen Sie für weitere Informationen in die Dokumentation.",
+    "For more details check out the documentation." : "Weitere Informationen finden Sie in der Dokumentation.",
     "Database user" : "Datenbank-Benutzer",
     "Database password" : "Datenbank-Passwort",
     "Database name" : "Datenbank-Name",
     "Database tablespace" : "Datenbank-Tablespace",
     "Database host" : "Datenbank-Host",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Bitte die Portnummer mit der Hostadresse zusammen angeben (z.B. localhost:5432)",
     "Performance warning" : "Leistungswarnung",
     "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
     "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
@@ -239,8 +241,8 @@ OC.L10N.register(
     "Need help?" : "Hilfe nötig?",
     "See the documentation" : "Schauen Sie in die Dokumentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Diese Anwendung benötigt zum ordnungsgemäßen Betrieb JavaScript. Bitte {linkstart}aktivieren Sie JavaScript{linkend} und laden Sie die Seite neu.",
-    "Log out" : "Abmelden",
     "Search" : "Suche",
+    "Log out" : "Abmelden",
     "This action requires you to confirm your password:" : "Dieser Vorgang benötigt eine Passwortbestätigung von Ihnen:",
     "Confirm your password" : "Bestätigen Sie Ihr Passwort",
     "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
@@ -264,7 +266,7 @@ OC.L10N.register(
     "Thank you for your patience." : "Vielen Dank für Ihre Geduld.",
     "Two-factor authentication" : "Zwei-Faktor Authentifizierung",
     "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Die erweiterte Sicherheit wurde für Ihr Konto aktiviert. Bitte authentifizieren Sie sich mit einem zweiten Faktor. ",
-    "Cancel log in" : "Anmelden abbrechen",
+    "Cancel log in" : "Anmeldung abbrechen",
     "Use backup code" : "Backup-Code benutzen",
     "Error while validating your second factor" : "Fehler beim Bestätigen des zweiten Sicherheitsfaktors",
     "You are accessing the server from an untrusted domain." : "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu.",
@@ -338,9 +340,9 @@ OC.L10N.register(
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dez.",
+    "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?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
     "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." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Sie alle Funktionen nutzen möchten.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Der REVERSE PROXY HEADER ist falsch, oder Sie greifen auf die Nextcloud von einem vertrauenswürdigen Proxy zu. Wenn Sie auf die Nextcloud nicht von einem vertrauenswürdigen Proxy zugreifen, dann liegt ein Sicherheitsproblem vor, das einem Angreifer ermöglichen könnte, die für Nextcloud sichtbare IP-Adresse zu fäschen. Weitere Informationen hierzu finden Sie in der <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.",
-    "Allow editing" : "Bearbeitung erlauben",
     "Hide file listing" : "Dateiliste verbergen",
     "Sending ..." : "Senden…",
     "Email sent" : "E-Mail gesendet",
@@ -365,20 +367,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Die erweiterte Sicherheit wurde für Ihr Konto aktiviert. Bitte authentifizieren Sie sich mit einem zweiten Faktor. ",
     "Cancel login" : "Anmelden abbrechen",
     "Please authenticate using the selected factor." : "Bitte authentifizieren Sie sich mit dem ausgewählten zweiten Faktor. ",
-    "An error occured while verifying the token" : "Es ist ein Fehler bei der Verifizierung des Tokens aufgetreten",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ihr Webserver ist nicht richtig konfiguriert um \"{url}\" aufzulösen. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" href=\"[docLink}\">Dokumentation</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfigurieren Sie zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\"  href=\"{docLink}\">Dokumentation</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Sie verwenden im Moment PHP {version}. Wir empfehlen ein Upgrade ihrer PHP Version, um die <a target=\"_blank\"  href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP Gruppe bereitgestellt werden</a>, sobald ihre Distribution diese unterstützt.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Die Reverse-Proxy-Header Konfiguration ist falsch, oder Sie greifen auf die Nextcloud von einem vertrauenswürdigen Proxy zu. Wenn Sie auf die Nextcloud nicht von einem vertrauenswürdigen Proxy zugreifen, dann liegt ein Sicherheitsproblem vor, das einem Angreifer ermöglichen könnte, die für Nextcloud sichtbare IP-Adresse zu fälschen. Weitere Informationen hierzu finden Sie in der <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached ist als distributed cache konfiguriert aber das falsche PHP-Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nur \"memcached\" jedoch nicht \"memcache\". Im <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki nach beiden Modulen suchen</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Manche Dateien haben die Integritätsprüfung nicht bestanden. Weitere Informationen um den Fehler zu behen finden Sie in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien...</a> / <a href=\"{rescanEndpoint}\">Erneut scannen…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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 mehr Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\" >Sicherheitshinweisen</a> erläutert ist.",
-    "An error occured. Please try again" : "Fehler aufgetreten. Bitte erneut versuchen",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Teilen Sie es mit Nutzern in anderen Nextclouds. Die Syntax hierfür lautet: username@beispiel.de/nextcloud",
-    "not assignable" : "nicht zuweisbar",
-    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}, dies kann etwas dauern.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren Ihres Servers können Sie der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
-    "An internal error occured." : "Es ist ein interner Fehler aufgetreten."
+    "An error occured while verifying the token" : "Es ist ein Fehler bei der Verifizierung des Tokens aufgetreten"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 0eff22d41d8..213f7886d71 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -58,7 +58,7 @@
     "seconds ago" : "Gerade eben",
     "Logging in …" : "Melde an ...",
     "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." : "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse versandt worden. Sollten Sie ihn nicht in Kürze erhalten, prüfen Sie bitte Ihren Spam-Ordner.<br>Wenn die E-Mail sich nicht darin befindet, wenden Sie sich bette an Ihrem lokalen Administrator.",
-    "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?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+    "Your files are encrypted. 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?" : "Ihre Dateien sind verschlüsselt. Es gibt keinen Weg Ihre Dateien nach dem Rücksetzen des Passwortes wiederherzustellen.<br />Falls Sie sich nicht sicher sind, kontaktieren Sie Ihren Administrator.<br />Möchten Sie wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
     "No" : "Nein",
@@ -93,7 +93,7 @@
     "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Sie verwenden im Moment PHP {version}. Wir empfehlen ein Upgrade ihrer PHP Version, um die <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP Gruppe bereitgestellt werden</a>, sobald ihre Distribution diese unterstützt.",
     "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Die Reverse-Proxy-Header-Konfiguration ist fehlerhaft oder Sie greifen auf Nextcloud über einen vertrauenswürdigen Proxy zu. Wenn Sie auf Nextcloud nicht über einen vertrauenswürdigen Proxy zugreifen, dann besteht ein Sicherheitsproblem, das einem Angreifer erlaubt die IP-Adresse, die für Nextcloud sichtbar ist, auszuspähen. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.",
     "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcache ist als verteilter Cache konfiguriert, aber das falsche PHP Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nur \"memcached\" und nicht \"memcache\". Siehe <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached Wiki über beide Module</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Manche Dateien haben die Integritätsprüfung nicht bestanden. Weitere Informationen um den Fehler zu behen finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien...</a> / <a href=\"{rescanEndpoint}\">Erneut scannen…</a>)",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Manche Dateien haben die Integritätsprüfung nicht bestanden. Weitere Informationen um den Fehler zu beheben finden Sie in unserer <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien...</a> / <a href=\"{rescanEndpoint}\">Erneut scannen…</a>)",
     "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
     "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." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar. Die .htaccess-Datei funktioniert nicht. Es wird dringend empfohlen, Ihren Webserver dahingehend zu konfigurieren, dass das Datenverzeichnis nicht mehr vom Internet aus erreichbar ist oder dass Sie es aus dem Document-Root-Verzeichnis des Webservers herausverschieben.",
     "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.",
@@ -120,6 +120,7 @@
     "Link" : "Link",
     "Password protect" : "Passwortschutz",
     "Allow upload and editing" : "Hochladen und Bearbeiten erlauben",
+    "Allow editing" : "Bearbeitung erlauben",
     "File drop (upload only)" : "Dateien ablegen (nur Hochladen)",
     "Email link to person" : "Link per E-Mail verschicken",
     "Send" : "Senden",
@@ -222,12 +223,13 @@
     "Configure the database" : "Datenbank einrichten",
     "Only %s is available." : "Es ist nur %s verfügbar.",
     "Install and activate additional PHP modules to choose other database types." : "Installieren und aktivieren Sie zusätzliche PHP-Module, um andere Datenbank-Typen auswählen zu können.",
-    "For more details check out the documentation." : "Schauen Sie für weitere Informationen in die Dokumentation.",
+    "For more details check out the documentation." : "Weitere Informationen finden Sie in der Dokumentation.",
     "Database user" : "Datenbank-Benutzer",
     "Database password" : "Datenbank-Passwort",
     "Database name" : "Datenbank-Name",
     "Database tablespace" : "Datenbank-Tablespace",
     "Database host" : "Datenbank-Host",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Bitte die Portnummer mit der Hostadresse zusammen angeben (z.B. localhost:5432)",
     "Performance warning" : "Leistungswarnung",
     "SQLite will be used as database." : "SQLite wird als Datenbank benutzt.",
     "For larger installations we recommend to choose a different database backend." : "Bei größeren Installationen wird die Wahl eines anderen Datenbank-Backends empfohlen.",
@@ -237,8 +239,8 @@
     "Need help?" : "Hilfe nötig?",
     "See the documentation" : "Schauen Sie in die Dokumentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Diese Anwendung benötigt zum ordnungsgemäßen Betrieb JavaScript. Bitte {linkstart}aktivieren Sie JavaScript{linkend} und laden Sie die Seite neu.",
-    "Log out" : "Abmelden",
     "Search" : "Suche",
+    "Log out" : "Abmelden",
     "This action requires you to confirm your password:" : "Dieser Vorgang benötigt eine Passwortbestätigung von Ihnen:",
     "Confirm your password" : "Bestätigen Sie Ihr Passwort",
     "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
@@ -262,7 +264,7 @@
     "Thank you for your patience." : "Vielen Dank für Ihre Geduld.",
     "Two-factor authentication" : "Zwei-Faktor Authentifizierung",
     "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Die erweiterte Sicherheit wurde für Ihr Konto aktiviert. Bitte authentifizieren Sie sich mit einem zweiten Faktor. ",
-    "Cancel log in" : "Anmelden abbrechen",
+    "Cancel log in" : "Anmeldung abbrechen",
     "Use backup code" : "Backup-Code benutzen",
     "Error while validating your second factor" : "Fehler beim Bestätigen des zweiten Sicherheitsfaktors",
     "You are accessing the server from an untrusted domain." : "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu.",
@@ -336,9 +338,9 @@
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dez.",
+    "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?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
     "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." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie das Einhängen externen Speicherplatzes, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren werden. Der Fernzugriff auf Dateien und der Versand von E-Mail-Benachrichtigungen kann ebenfalls nicht funktionieren. Es wird empfohlen, die Internetverbindung dieses Servers zu aktivieren, wenn Sie alle Funktionen nutzen möchten.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Der REVERSE PROXY HEADER ist falsch, oder Sie greifen auf die Nextcloud von einem vertrauenswürdigen Proxy zu. Wenn Sie auf die Nextcloud nicht von einem vertrauenswürdigen Proxy zugreifen, dann liegt ein Sicherheitsproblem vor, das einem Angreifer ermöglichen könnte, die für Nextcloud sichtbare IP-Adresse zu fäschen. Weitere Informationen hierzu finden Sie in der <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">Dokumentation</a>.",
-    "Allow editing" : "Bearbeitung erlauben",
     "Hide file listing" : "Dateiliste verbergen",
     "Sending ..." : "Senden…",
     "Email sent" : "E-Mail gesendet",
@@ -363,20 +365,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Die erweiterte Sicherheit wurde für Ihr Konto aktiviert. Bitte authentifizieren Sie sich mit einem zweiten Faktor. ",
     "Cancel login" : "Anmelden abbrechen",
     "Please authenticate using the selected factor." : "Bitte authentifizieren Sie sich mit dem ausgewählten zweiten Faktor. ",
-    "An error occured while verifying the token" : "Es ist ein Fehler bei der Verifizierung des Tokens aufgetreten",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ihr Webserver ist nicht richtig konfiguriert um \"{url}\" aufzulösen. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\" href=\"[docLink}\">Dokumentation</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Es wurde kein PHP Memory Cache konfiguriert. Konfigurieren Sie zur Erhöhung der Leistungsfähigkeit, soweit verfügbar, einen Memory Cache. Weitere Informationen finden Sie in unserer <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom ist von PHP nicht lesbar, wovon aus Sicherheitsgründen dringend abgeraten wird. Weitere Informationen hierzu finden Sie in unserer <a target=\"_blank\"  href=\"{docLink}\">Dokumentation</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Sie verwenden im Moment PHP {version}. Wir empfehlen ein Upgrade ihrer PHP Version, um die <a target=\"_blank\"  href=\"{phpLink}\">Geschwindigkeits- und Sicherheitsupdates zu nutzen, welche von der PHP Gruppe bereitgestellt werden</a>, sobald ihre Distribution diese unterstützt.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Die Reverse-Proxy-Header Konfiguration ist falsch, oder Sie greifen auf die Nextcloud von einem vertrauenswürdigen Proxy zu. Wenn Sie auf die Nextcloud nicht von einem vertrauenswürdigen Proxy zugreifen, dann liegt ein Sicherheitsproblem vor, das einem Angreifer ermöglichen könnte, die für Nextcloud sichtbare IP-Adresse zu fälschen. Weitere Informationen hierzu finden Sie in der <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached ist als distributed cache konfiguriert aber das falsche PHP-Modul \"memcache\" ist installiert. \\OC\\Memcache\\Memcached unterstützt nur \"memcached\" jedoch nicht \"memcache\". Im <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki nach beiden Modulen suchen</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Manche Dateien haben die Integritätsprüfung nicht bestanden. Weitere Informationen um den Fehler zu behen finden Sie in unserer <a target=\"_blank\" href=\"{docLink}\">Dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste der ungültigen Dateien...</a> / <a href=\"{rescanEndpoint}\">Erneut scannen…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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 mehr Sicherheit wird das Aktivieren von HSTS empfohlen, wie es in unseren <a href=\"{docUrl}\" >Sicherheitshinweisen</a> erläutert ist.",
-    "An error occured. Please try again" : "Fehler aufgetreten. Bitte erneut versuchen",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Teilen Sie es mit Nutzern in anderen Nextclouds. Die Syntax hierfür lautet: username@beispiel.de/nextcloud",
-    "not assignable" : "nicht zuweisbar",
-    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}, dies kann etwas dauern.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Informationen zum richtigen Konfigurieren Ihres Servers können Sie der <a href=\"%s\" target=\"_blank\">Dokumentation</a> entnehmen.",
-    "An internal error occured." : "Es ist ein interner Fehler aufgetreten."
+    "An error occured while verifying the token" : "Es ist ein Fehler bei der Verifizierung des Tokens aufgetreten"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/el.js b/core/l10n/el.js
index aa4b77e1686..e8d61bd3547 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Please select a file." : "Παρακαλώ επιλέξτε αρχείο.",
     "File is too big" : "Το αρχείο είναι πολύ μεγάλο",
+    "The selected file is not an image." : "Το επιλεγμένο αρχείο δεν είναι εικόνας.",
+    "The selected file cannot be read." : "Το επιλεγμένο αρχείο δεν μπορεί να αναγνωσθεί",
     "Invalid file provided" : "Έχει δοθεί μη έγκυρο αρχείο",
     "No image or file provided" : "Δεν δόθηκε εικόνα ή αρχείο",
     "Unknown filetype" : "Άγνωστος τύπος αρχείου",
@@ -47,7 +49,6 @@ OC.L10N.register(
     "Cancel" : "Άκυρο",
     "seconds ago" : "δευτερόλεπτα πριν",
     "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." : "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
-    "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?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
     "I know what I'm doing" : "Γνωρίζω τι κάνω",
     "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "No" : "Όχι",
@@ -96,6 +97,7 @@ OC.L10N.register(
     "Share link" : "Διαμοιρασμός συνδέσμου",
     "Link" : "Σύνδεσμος",
     "Password protect" : "Προστασία συνθηματικού",
+    "Allow editing" : "Επιτρέπεται η επεξεργασία",
     "Email link to person" : "Αποστολή συνδέσμου με email ",
     "Send" : "Αποστολή",
     "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
@@ -184,8 +186,8 @@ OC.L10N.register(
     "Need help?" : "Θέλετε βοήθεια;",
     "See the documentation" : "Δείτε την τεκμηρίωση",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για σωστή λειτουργία. Παρακαλώ {linkstart} ενεργοποιήστε τη JavaScrip {linkend} και επαναφορτώστε τη σελίδα.",
-    "Log out" : "Αποσύνδεση",
     "Search" : "Αναζήτηση",
+    "Log out" : "Αποσύνδεση",
     "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
     "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
     "An internal error occurred." : "Παρουσιάστηκε ένα εσωτερικό σφάλμα.",
@@ -274,7 +276,7 @@ OC.L10N.register(
     "Oct." : "Οκτ.",
     "Nov." : "Νοε.",
     "Dec." : "Δεκ.",
-    "Allow editing" : "Επιτρέπεται η επεξεργασία",
+    "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?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
     "Sending ..." : "Αποστολή...",
     "Email sent" : "Το Email απεστάλη ",
     "Send link via email" : "Αποστολή συνδέσμου μέσω email",
@@ -290,7 +292,6 @@ OC.L10N.register(
     "Error while sending notification" : "Σφάλμα κατά την αποστολή ειδοποίησης",
     "Updating to {version}" : "Ενημέρωση στην έκδοση {version}",
     "The update was successful. There were warnings." : "Η ενημέρωση ήταν επιτυχής. Υπάρχουν προειδοποιήσεις.",
-    "No search results in other folders" : "Δεν υπάρχουν αποτελέσματα αναζήτησης σε άλλους φακέλους",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud"
+    "No search results in other folders" : "Δεν υπάρχουν αποτελέσματα αναζήτησης σε άλλους φακέλους"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/el.json b/core/l10n/el.json
index cf36b408be5..cff6d1a7987 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Please select a file." : "Παρακαλώ επιλέξτε αρχείο.",
     "File is too big" : "Το αρχείο είναι πολύ μεγάλο",
+    "The selected file is not an image." : "Το επιλεγμένο αρχείο δεν είναι εικόνας.",
+    "The selected file cannot be read." : "Το επιλεγμένο αρχείο δεν μπορεί να αναγνωσθεί",
     "Invalid file provided" : "Έχει δοθεί μη έγκυρο αρχείο",
     "No image or file provided" : "Δεν δόθηκε εικόνα ή αρχείο",
     "Unknown filetype" : "Άγνωστος τύπος αρχείου",
@@ -45,7 +47,6 @@
     "Cancel" : "Άκυρο",
     "seconds ago" : "δευτερόλεπτα πριν",
     "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." : "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
-    "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?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
     "I know what I'm doing" : "Γνωρίζω τι κάνω",
     "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "No" : "Όχι",
@@ -94,6 +95,7 @@
     "Share link" : "Διαμοιρασμός συνδέσμου",
     "Link" : "Σύνδεσμος",
     "Password protect" : "Προστασία συνθηματικού",
+    "Allow editing" : "Επιτρέπεται η επεξεργασία",
     "Email link to person" : "Αποστολή συνδέσμου με email ",
     "Send" : "Αποστολή",
     "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
@@ -182,8 +184,8 @@
     "Need help?" : "Θέλετε βοήθεια;",
     "See the documentation" : "Δείτε την τεκμηρίωση",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για σωστή λειτουργία. Παρακαλώ {linkstart} ενεργοποιήστε τη JavaScrip {linkend} και επαναφορτώστε τη σελίδα.",
-    "Log out" : "Αποσύνδεση",
     "Search" : "Αναζήτηση",
+    "Log out" : "Αποσύνδεση",
     "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
     "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
     "An internal error occurred." : "Παρουσιάστηκε ένα εσωτερικό σφάλμα.",
@@ -272,7 +274,7 @@
     "Oct." : "Οκτ.",
     "Nov." : "Νοε.",
     "Dec." : "Δεκ.",
-    "Allow editing" : "Επιτρέπεται η επεξεργασία",
+    "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?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
     "Sending ..." : "Αποστολή...",
     "Email sent" : "Το Email απεστάλη ",
     "Send link via email" : "Αποστολή συνδέσμου μέσω email",
@@ -288,7 +290,6 @@
     "Error while sending notification" : "Σφάλμα κατά την αποστολή ειδοποίησης",
     "Updating to {version}" : "Ενημέρωση στην έκδοση {version}",
     "The update was successful. There were warnings." : "Η ενημέρωση ήταν επιτυχής. Υπάρχουν προειδοποιήσεις.",
-    "No search results in other folders" : "Δεν υπάρχουν αποτελέσματα αναζήτησης σε άλλους φακέλους",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Διαμοιρασμός με άτομα σε άλλα ownClouds χρησιμοποιώντας την σύνταξη username@example.com/owncloud"
+    "No search results in other folders" : "Δεν υπάρχουν αποτελέσματα αναζήτησης σε άλλους φακέλους"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index b0d6f1a3098..d78122ce116 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -60,7 +60,6 @@ OC.L10N.register(
     "seconds ago" : "seconds ago",
     "Logging in …" : "Logging in …",
     "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." : "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.",
-    "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?" : "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?",
     "I know what I'm doing" : "I know what I'm doing",
     "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
     "No" : "No",
@@ -117,6 +116,7 @@ OC.L10N.register(
     "Share link" : "Share link",
     "Link" : "Link",
     "Password protect" : "Password protect",
+    "Allow editing" : "Allow editing",
     "Email link to person" : "Email link to person",
     "Send" : "Send",
     "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
@@ -212,8 +212,8 @@ OC.L10N.register(
     "Need help?" : "Need help?",
     "See the documentation" : "See the documentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.",
-    "Log out" : "Log out",
     "Search" : "Search",
+    "Log out" : "Log out",
     "Server side authentication failed!" : "Server side authentication failed!",
     "Please contact your administrator." : "Please contact your administrator.",
     "An internal error occurred." : "An internal error occurred.",
@@ -304,8 +304,8 @@ OC.L10N.register(
     "Oct." : "Oct.",
     "Nov." : "Nov.",
     "Dec." : "Dec.",
+    "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?" : "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?",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
-    "Allow editing" : "Allow editing",
     "Hide file listing" : "Hide file listing",
     "Sending ..." : "Sending ...",
     "Email sent" : "Email sent",
@@ -327,7 +327,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Enhanced security has been enabled for your account. Please authenticate using a second factor.",
     "Cancel login" : "Cancel login",
     "Please authenticate using the selected factor." : "Please authenticate using the selected factor.",
-    "An error occured while verifying the token" : "An error occured while verifying the token",
-    "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"
+    "An error occured while verifying the token" : "An error occured while verifying the token"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index 19e3b8e50cd..64f79a7e768 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -58,7 +58,6 @@
     "seconds ago" : "seconds ago",
     "Logging in …" : "Logging in …",
     "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." : "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.",
-    "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?" : "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?",
     "I know what I'm doing" : "I know what I'm doing",
     "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
     "No" : "No",
@@ -115,6 +114,7 @@
     "Share link" : "Share link",
     "Link" : "Link",
     "Password protect" : "Password protect",
+    "Allow editing" : "Allow editing",
     "Email link to person" : "Email link to person",
     "Send" : "Send",
     "Shared with you and the group {group} by {owner}" : "Shared with you and the group {group} by {owner}",
@@ -210,8 +210,8 @@
     "Need help?" : "Need help?",
     "See the documentation" : "See the documentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.",
-    "Log out" : "Log out",
     "Search" : "Search",
+    "Log out" : "Log out",
     "Server side authentication failed!" : "Server side authentication failed!",
     "Please contact your administrator." : "Please contact your administrator.",
     "An internal error occurred." : "An internal error occurred.",
@@ -302,8 +302,8 @@
     "Oct." : "Oct.",
     "Nov." : "Nov.",
     "Dec." : "Dec.",
+    "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?" : "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?",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
-    "Allow editing" : "Allow editing",
     "Hide file listing" : "Hide file listing",
     "Sending ..." : "Sending ...",
     "Email sent" : "Email sent",
@@ -325,7 +325,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Enhanced security has been enabled for your account. Please authenticate using a second factor.",
     "Cancel login" : "Cancel login",
     "Please authenticate using the selected factor." : "Please authenticate using the selected factor.",
-    "An error occured while verifying the token" : "An error occured while verifying the token",
-    "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"
+    "An error occured while verifying the token" : "An error occured while verifying the token"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/es.js b/core/l10n/es.js
index c9eaf5f22b1..9844386dd2b 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -41,7 +41,7 @@ OC.L10N.register(
     "Reset log level" : "Restablecer el nivel de registro",
     "Starting code integrity check" : "Comenzando comprobación de integridad de código",
     "Finished code integrity check" : "Terminando comprobación de integridad de código",
-    "%s (3rdparty)" : "%s (tercer parte)",
+    "%s (3rdparty)" : "%s (tercero)",
     "%s (incompatible)" : "%s (incompatible)",
     "Following apps have been disabled: %s" : "Siguiendo aplicaciones ha sido deshabilitado: %s",
     "Already up to date" : "Ya actualizado",
@@ -60,7 +60,7 @@ OC.L10N.register(
     "seconds ago" : "hace segundos",
     "Logging in …" : "Iniciando sesión ...",
     "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." : "Se ha enviado un enlace para restablecer su contraseña a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta de spam/chatarra/basura.<br>Si no lo encuentra, consulte a su 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?" : "Sus archivos están cifrados. Si no ha activado la clave de recuperación, no habrá manera de recuperar los datos una vez su contraseña sea restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?",
+    "Your files are encrypted. 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?" : "Sus archivos han sido cifrados. No habrá forma de recuperar sus datos tras resetear la contraseña.<br /> Si no está seguro de qué hacer, contacte con su administrador antes de continuar. ¿Está seguro de qué quiere continuar?",
     "I know what I'm doing" : "Sé lo que estoy haciendo",
     "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
     "No" : "No",
@@ -122,6 +122,7 @@ OC.L10N.register(
     "Link" : "Enlace",
     "Password protect" : "Protección con contraseña",
     "Allow upload and editing" : "Permitir subito y edición",
+    "Allow editing" : "Permitir edición",
     "File drop (upload only)" : "Entrega de archivos (solo subida)",
     "Email link to person" : "Enviar enlace por correo electrónico a una persona",
     "Send" : "Enviar",
@@ -230,6 +231,7 @@ OC.L10N.register(
     "Database name" : "Nombre de la base de datos",
     "Database tablespace" : "Espacio de tablas de la base de datos",
     "Database host" : "Host de la base de datos",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Por favor especifique el numero del puerto junto al nombre del anfitrión (p.e., localhost:5432).",
     "Performance warning" : "Advertencia de rendimiento",
     "SQLite will be used as database." : "Se utilizará SQLite como base de datos.",
     "For larger installations we recommend to choose a different database backend." : "Para grandes instalaciones recomendamos seleccionar una base de datos diferente",
@@ -239,8 +241,8 @@ OC.L10N.register(
     "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",
     "Search" : "Buscar",
+    "Log out" : "Salir",
     "This action requires you to confirm your password:" : "Esta acción requiere que confirme su contraseña:",
     "Confirm your password" : "Confirme su contraseña",
     "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
@@ -338,9 +340,9 @@ OC.L10N.register(
     "Oct." : "Oct.",
     "Nov." : "Nov.",
     "Dec." : "Dic.",
+    "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?" : "Sus archivos están cifrados. Si no ha activado la clave de recuperación, no habrá manera de recuperar los datos una vez su contraseña sea restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?",
     "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 no tiene una conexión a Internet. Esto significa que algunas de las características como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones o instalación de aplicaciones de terceros no funcionarán. Podría no funcionar el acceso a los archivos de forma remota y el envío de correos electrónicos de notificación. Sugerimos habilitar la conexión a Internet de este servidor, si quiere tener todas las funciones.",
     "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 target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentación</a>.",
-    "Allow editing" : "Permitir edición",
     "Hide file listing" : "Ocultar la lista de archivos.",
     "Sending ..." : "Enviando...",
     "Email sent" : "Correo electrónico enviado",
@@ -365,20 +367,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "La seguridad mejorada se ha habilitado para tu cuenta. Por favor, autenticar utilizando un segundo factor.",
     "Cancel login" : "Cancelar inicio de sesión",
     "Please authenticate using the selected factor." : "Por favor, autenticar utilizando el factor seleccionado.",
-    "An error occured while verifying the token" : "Ocurrió un error mientras se verificaba el \"token\".",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Su servido no esta configurada correctamente para resolver \"{url}\". Se pueden encontrar más información en nuestra <a target=\"_blank\" href=\"{docLink}\">documentación</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "La memoria caché no ha sido configurada. Para mejorar su desempeño, por favor, configure la memcache si está disponible. Puede encontrar más información en nuestra  <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom no es legible por PHP que no se recomienda para razones de seguridad. Se puede encontrar más información en nuestra <a target=\"_blank\" href=\"{docLink}\">documentación</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Actualmente utiliza PHP {version}. Le aconsejamos que actualice su versión de PHP para beneficiarse de las <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">mejoras de desempeño y seguridad que aporta el PHP Group</a> en cuanto su distribución lo soporte.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentación</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached está configurado como caché distribuida, pero el módulo erróneo de PHP \"memcache\" está instalado. \\OC\\Memcache\\Memcached solo soporta \"memached\" y no \"memcache\". Vea la <a target=\"_blank\" href=\"{wikiLink}\"> wiki de memcached sobre ambos módulos</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Algunos archivos no han superado la comprobación de integridad. Para más información sobre cómo resolver este inconveniente consulte nuestra <a target=\"_blank\" href=\"{docLink}\">documentación</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista de archivos no válidos…</a> / <a href=\"{rescanEndpoint}\">Rescanear…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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 se describe en <a href=\"{docUrl}\">security tips</a>.",
-    "An error occured. Please try again" : "Ha ocurrido un error. Por favor inténtelo de nuevo",
-    "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",
-    "not assignable" : "No asignable",
-    "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a la versión {version}, esto puede tardar un rato.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar adecuadamente el servidor, por favor revise la <a href=\"%s\" target=\"_blank\">documentación</a>.",
-    "An internal error occured." : "Un error interno ha ocurrido."
+    "An error occured while verifying the token" : "Ocurrió un error mientras se verificaba el \"token\"."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 525b0bd84a6..4be7f957aab 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -39,7 +39,7 @@
     "Reset log level" : "Restablecer el nivel de registro",
     "Starting code integrity check" : "Comenzando comprobación de integridad de código",
     "Finished code integrity check" : "Terminando comprobación de integridad de código",
-    "%s (3rdparty)" : "%s (tercer parte)",
+    "%s (3rdparty)" : "%s (tercero)",
     "%s (incompatible)" : "%s (incompatible)",
     "Following apps have been disabled: %s" : "Siguiendo aplicaciones ha sido deshabilitado: %s",
     "Already up to date" : "Ya actualizado",
@@ -58,7 +58,7 @@
     "seconds ago" : "hace segundos",
     "Logging in …" : "Iniciando sesión ...",
     "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." : "Se ha enviado un enlace para restablecer su contraseña a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta de spam/chatarra/basura.<br>Si no lo encuentra, consulte a su 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?" : "Sus archivos están cifrados. Si no ha activado la clave de recuperación, no habrá manera de recuperar los datos una vez su contraseña sea restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?",
+    "Your files are encrypted. 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?" : "Sus archivos han sido cifrados. No habrá forma de recuperar sus datos tras resetear la contraseña.<br /> Si no está seguro de qué hacer, contacte con su administrador antes de continuar. ¿Está seguro de qué quiere continuar?",
     "I know what I'm doing" : "Sé lo que estoy haciendo",
     "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
     "No" : "No",
@@ -120,6 +120,7 @@
     "Link" : "Enlace",
     "Password protect" : "Protección con contraseña",
     "Allow upload and editing" : "Permitir subito y edición",
+    "Allow editing" : "Permitir edición",
     "File drop (upload only)" : "Entrega de archivos (solo subida)",
     "Email link to person" : "Enviar enlace por correo electrónico a una persona",
     "Send" : "Enviar",
@@ -228,6 +229,7 @@
     "Database name" : "Nombre de la base de datos",
     "Database tablespace" : "Espacio de tablas de la base de datos",
     "Database host" : "Host de la base de datos",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Por favor especifique el numero del puerto junto al nombre del anfitrión (p.e., localhost:5432).",
     "Performance warning" : "Advertencia de rendimiento",
     "SQLite will be used as database." : "Se utilizará SQLite como base de datos.",
     "For larger installations we recommend to choose a different database backend." : "Para grandes instalaciones recomendamos seleccionar una base de datos diferente",
@@ -237,8 +239,8 @@
     "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",
     "Search" : "Buscar",
+    "Log out" : "Salir",
     "This action requires you to confirm your password:" : "Esta acción requiere que confirme su contraseña:",
     "Confirm your password" : "Confirme su contraseña",
     "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
@@ -336,9 +338,9 @@
     "Oct." : "Oct.",
     "Nov." : "Nov.",
     "Dec." : "Dic.",
+    "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?" : "Sus archivos están cifrados. Si no ha activado la clave de recuperación, no habrá manera de recuperar los datos una vez su contraseña sea restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte con su administrador antes de continuar.<br />¿Realmente desea continuar?",
     "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 no tiene una conexión a Internet. Esto significa que algunas de las características como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones o instalación de aplicaciones de terceros no funcionarán. Podría no funcionar el acceso a los archivos de forma remota y el envío de correos electrónicos de notificación. Sugerimos habilitar la conexión a Internet de este servidor, si quiere tener todas las funciones.",
     "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 target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentación</a>.",
-    "Allow editing" : "Permitir edición",
     "Hide file listing" : "Ocultar la lista de archivos.",
     "Sending ..." : "Enviando...",
     "Email sent" : "Correo electrónico enviado",
@@ -363,20 +365,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "La seguridad mejorada se ha habilitado para tu cuenta. Por favor, autenticar utilizando un segundo factor.",
     "Cancel login" : "Cancelar inicio de sesión",
     "Please authenticate using the selected factor." : "Por favor, autenticar utilizando el factor seleccionado.",
-    "An error occured while verifying the token" : "Ocurrió un error mientras se verificaba el \"token\".",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Su servido no esta configurada correctamente para resolver \"{url}\". Se pueden encontrar más información en nuestra <a target=\"_blank\" href=\"{docLink}\">documentación</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "La memoria caché no ha sido configurada. Para mejorar su desempeño, por favor, configure la memcache si está disponible. Puede encontrar más información en nuestra  <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom no es legible por PHP que no se recomienda para razones de seguridad. Se puede encontrar más información en nuestra <a target=\"_blank\" href=\"{docLink}\">documentación</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Actualmente utiliza PHP {version}. Le aconsejamos que actualice su versión de PHP para beneficiarse de las <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">mejoras de desempeño y seguridad que aporta el PHP Group</a> en cuanto su distribución lo soporte.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentación</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached está configurado como caché distribuida, pero el módulo erróneo de PHP \"memcache\" está instalado. \\OC\\Memcache\\Memcached solo soporta \"memached\" y no \"memcache\". Vea la <a target=\"_blank\" href=\"{wikiLink}\"> wiki de memcached sobre ambos módulos</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Algunos archivos no han superado la comprobación de integridad. Para más información sobre cómo resolver este inconveniente consulte nuestra <a target=\"_blank\" href=\"{docLink}\">documentación</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista de archivos no válidos…</a> / <a href=\"{rescanEndpoint}\">Rescanear…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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 se describe en <a href=\"{docUrl}\">security tips</a>.",
-    "An error occured. Please try again" : "Ha ocurrido un error. Por favor inténtelo de nuevo",
-    "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",
-    "not assignable" : "No asignable",
-    "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a la versión {version}, esto puede tardar un rato.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar adecuadamente el servidor, por favor revise la <a href=\"%s\" target=\"_blank\">documentación</a>.",
-    "An internal error occured." : "Un error interno ha ocurrido."
+    "An error occured while verifying the token" : "Ocurrió un error mientras se verificaba el \"token\"."
 },"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 9eadb100ebd..1d0653a51a3 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -53,7 +53,6 @@ OC.L10N.register(
     "Cancel" : "Peru",
     "seconds ago" : "sekunteja sitten",
     "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." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
-    "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?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
     "I know what I'm doing" : "Tiedän mitä teen",
     "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "No" : "Ei",
@@ -111,6 +110,7 @@ OC.L10N.register(
     "Link" : "Linkki",
     "Password protect" : "Suojaa salasanalla",
     "Allow upload and editing" : "Salli lähetys ja muokkaus",
+    "Allow editing" : "Salli muokkaus",
     "Email link to person" : "Lähetä linkki sähköpostitse",
     "Send" : "Lähetä",
     "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
@@ -211,8 +211,8 @@ OC.L10N.register(
     "Need help?" : "Tarvitsetko apua?",
     "See the documentation" : "Tutustu dokumentaatioon",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tämä sovellus vaatii toimiakseen JavaScript-tuen. {linkstart}Ota JavaScript käyttöön{linkend} ja päivitä sivu.",
-    "Log out" : "Kirjaudu ulos",
     "Search" : "Etsi",
+    "Log out" : "Kirjaudu ulos",
     "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!",
     "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
     "An internal error occurred." : "Tapahtui sisäinen virhe",
@@ -308,8 +308,8 @@ OC.L10N.register(
     "Oct." : "Loka",
     "Nov." : "Marras",
     "Dec." : "Joulu",
+    "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?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
     "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." : "Tällä palvelimella ei ole toimivaa internetyhteyttä. Sen seurauksena jotkin ominaisuudet, kuten erillinen tallennustila, ilmoitukset päivityksistä ja kolmansien osapuolten sovellusten asennus eivät toimi. Tiedostojen käyttö etänä tai ilmoitusten lähetys sähköpostitse eivät välttämättä toimi myöskään. Suosittelemme kytkemään palvelimen internetyhteyteen, jos haluat käyttää kaikkia ominaisuuksia.",
-    "Allow editing" : "Salli muokkaus",
     "Hide file listing" : "Piilota tiedostolistaus",
     "Sending ..." : "Lähetetään...",
     "Email sent" : "Sähköposti lähetetty",
@@ -334,17 +334,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Tililläsi on käytössä lisäturvatoimia. Tunnistaudu käyttäen kaksivaiheista vahvistusta.",
     "Cancel login" : "Peru kirjautuminen",
     "Please authenticate using the selected factor." : "Tunnistaudu käyttäen valittua vahvistusta.",
-    "An error occured while verifying the token" : "Valtuutusta tarkistettaessa tapahtui virhe",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "HTTP-palvelinta ei ole määritelty oikein tunnistamaan osoitetta \"{url}\". Lisätietoja löytyy meidän <a target=\"_blank\" href=\"{docLink}\">ohjeissa</a>.",
-    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "dev/urandom ei ole PHP:n luettavissa, mitä ei voi suositella tietoturvasyistä. Lisätietoja löytyy meidän <a target=\"_blank\" href=\"{docLink}\">ohjeista</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Sinulla on käytössä PHP {version}. Suosittelemme päivittämään PHP versiosi saadaksesi <a target=\"_blank\" href=\"{phpLink}\">PHP Group:n suorituskyky ja tietoturvapäivityksiä</a> niin pian kuin jakelusi sitä tukee.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Jotkin tiedostot eivät ole läpäisseet eheystarkistusta. Lisätietoa ongelman korjaamiseksi löytyy meidän <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP otsake ei ole määritelty vähintään \"{seconds}\" sekuntiin. Paremman tietoturvan vuoksi suosittelemme määrittelemään HSTS:n kuten kerrottu <a href=\"{docUrl}\">tietoturvaohjeissa</a>.",
-    "An error occured. Please try again" : "Tapahtui virhe, yritä uudelleen",
-    "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 merkintää käyttäjätunnus@example.com/owncloud",
-    "not assignable" : "ei liitettävissä",
-    "Updating {productName} to version {version}, this may take a while." : "Päivittämässä sovellusta {productName} versioon {version}, tämä voi kestää hetken.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen oikeaoppiseen määritykseen on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiossa</a>.",
-    "An internal error occured." : "Tapahtui sisäinen virhe."
+    "An error occured while verifying the token" : "Valtuutusta tarkistettaessa tapahtui virhe"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 09d5ca099bd..da11bc2635d 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -51,7 +51,6 @@
     "Cancel" : "Peru",
     "seconds ago" : "sekunteja sitten",
     "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." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
-    "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?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
     "I know what I'm doing" : "Tiedän mitä teen",
     "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "No" : "Ei",
@@ -109,6 +108,7 @@
     "Link" : "Linkki",
     "Password protect" : "Suojaa salasanalla",
     "Allow upload and editing" : "Salli lähetys ja muokkaus",
+    "Allow editing" : "Salli muokkaus",
     "Email link to person" : "Lähetä linkki sähköpostitse",
     "Send" : "Lähetä",
     "Shared with you and the group {group} by {owner}" : "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta",
@@ -209,8 +209,8 @@
     "Need help?" : "Tarvitsetko apua?",
     "See the documentation" : "Tutustu dokumentaatioon",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Tämä sovellus vaatii toimiakseen JavaScript-tuen. {linkstart}Ota JavaScript käyttöön{linkend} ja päivitä sivu.",
-    "Log out" : "Kirjaudu ulos",
     "Search" : "Etsi",
+    "Log out" : "Kirjaudu ulos",
     "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!",
     "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
     "An internal error occurred." : "Tapahtui sisäinen virhe",
@@ -306,8 +306,8 @@
     "Oct." : "Loka",
     "Nov." : "Marras",
     "Dec." : "Joulu",
+    "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?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
     "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." : "Tällä palvelimella ei ole toimivaa internetyhteyttä. Sen seurauksena jotkin ominaisuudet, kuten erillinen tallennustila, ilmoitukset päivityksistä ja kolmansien osapuolten sovellusten asennus eivät toimi. Tiedostojen käyttö etänä tai ilmoitusten lähetys sähköpostitse eivät välttämättä toimi myöskään. Suosittelemme kytkemään palvelimen internetyhteyteen, jos haluat käyttää kaikkia ominaisuuksia.",
-    "Allow editing" : "Salli muokkaus",
     "Hide file listing" : "Piilota tiedostolistaus",
     "Sending ..." : "Lähetetään...",
     "Email sent" : "Sähköposti lähetetty",
@@ -332,17 +332,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Tililläsi on käytössä lisäturvatoimia. Tunnistaudu käyttäen kaksivaiheista vahvistusta.",
     "Cancel login" : "Peru kirjautuminen",
     "Please authenticate using the selected factor." : "Tunnistaudu käyttäen valittua vahvistusta.",
-    "An error occured while verifying the token" : "Valtuutusta tarkistettaessa tapahtui virhe",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "HTTP-palvelinta ei ole määritelty oikein tunnistamaan osoitetta \"{url}\". Lisätietoja löytyy meidän <a target=\"_blank\" href=\"{docLink}\">ohjeissa</a>.",
-    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "dev/urandom ei ole PHP:n luettavissa, mitä ei voi suositella tietoturvasyistä. Lisätietoja löytyy meidän <a target=\"_blank\" href=\"{docLink}\">ohjeista</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Sinulla on käytössä PHP {version}. Suosittelemme päivittämään PHP versiosi saadaksesi <a target=\"_blank\" href=\"{phpLink}\">PHP Group:n suorituskyky ja tietoturvapäivityksiä</a> niin pian kuin jakelusi sitä tukee.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Jotkin tiedostot eivät ole läpäisseet eheystarkistusta. Lisätietoa ongelman korjaamiseksi löytyy meidän <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP otsake ei ole määritelty vähintään \"{seconds}\" sekuntiin. Paremman tietoturvan vuoksi suosittelemme määrittelemään HSTS:n kuten kerrottu <a href=\"{docUrl}\">tietoturvaohjeissa</a>.",
-    "An error occured. Please try again" : "Tapahtui virhe, yritä uudelleen",
-    "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 merkintää käyttäjätunnus@example.com/owncloud",
-    "not assignable" : "ei liitettävissä",
-    "Updating {productName} to version {version}, this may take a while." : "Päivittämässä sovellusta {productName} versioon {version}, tämä voi kestää hetken.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen oikeaoppiseen määritykseen on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiossa</a>.",
-    "An internal error occured." : "Tapahtui sisäinen virhe."
+    "An error occured while verifying the token" : "Valtuutusta tarkistettaessa tapahtui virhe"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 07094688525..90e99370f2e 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -60,7 +60,7 @@ OC.L10N.register(
     "seconds ago" : "à l'instant",
     "Logging in …" : "Connexion…",
     "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." : "Un lien permettant de réinitialiser votre mot de passe vient de vous être envoyé par courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!",
-    "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?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clé de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
+    "Your files are encrypted. 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?" : "Vos fichiers sont chiffrés. Il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
     "I know what I'm doing" : "Je sais ce que je fais",
     "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
     "No" : "Non",
@@ -89,25 +89,25 @@ OC.L10N.register(
     "Strong password" : "Mot de passe fort",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour la synchronisation de fichiers : l'interface WebDAV semble ne pas fonctionner.",
     "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "La configuration du serveur web ne permet pas d'atteindre \"{url}\". Consultez la <a target=\"_blank\" ref=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.",
-    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Ce serveur ne peut se connecter à Internet : plusieurs point finaux ne peuvent être atteins. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que l'envoie de notifications par mail peuvent aussi être indisponibles. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Aucun cache mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Ce serveur ne peut se connecter à Internet : plusieurs point finaux ne peuvent être atteints. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que l'envoi de notifications par mail peuvent aussi être indisponibles. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Aucun cache mémoire n'est configuré. Si possible, configurez un \"memcache\" pour améliorer les performances. Pour plus d'informations consultez la <a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom n'est pas lisible par PHP, ce qui est fortement déconseillé pour des raisons de sécurité. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Vous utilisez actuellement PHP {version}. Nous vous encourageons à mettre à jour votre version de PHP afin de tirer avantage des amélioration liées à <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">la performance et la sécurité fournies par le PHP Group</a>, dès que votre distribution le supportera.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Vous utilisez actuellement PHP {version}. Nous vous encourageons à mettre à jour votre version de PHP afin de tirer avantage des améliorations liées à <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">la performance et la sécurité fournies par le PHP Group</a>, dès que votre distribution le supportera.",
     "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "La configuration des entêtes du proxy inverse est incorrecte, ou vous accédez à Nextcloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accéder à Nextcloud depuis un proxy de confiance, ceci est un problème de sécurité qui peut permettre à un attaquant d'usurper l'adresse IP affichée à Nextcloud. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "\"memcached\" est configuré comme cache distribué, mais  le module installé est \"memcache\".  \\OC\\Memcache\\Memcached ne prend en charge que \"memcached\" et non \"memcache\". <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">Consulter le wiki de memcached à propos de ces deux modules.</a>",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Des fichiers n'ont pas réussi à passer la vérification d’intégrité. Plus d'information sur comment résoudre ce problème dans notre <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste des fichiers invalides…</a> / <a href=\"{rescanEndpoint}\">Relancer…</a>)",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "\"memcached\" est configuré comme cache distribué, mais  le mauvais module PHP est installé.  \\OC\\Memcache\\Memcached ne prend en charge que \"memcached\" et non \"memcache\". <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">Consulter le wiki de memcached à propos de ces deux modules.</a>",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Des fichiers n'ont pas passé la vérification d’intégrité. Plus d'information sur comment résoudre ce problème dans notre <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste des fichiers invalides…</a> / <a href=\"{rescanEndpoint}\">Relancer…</a>)",
     "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
     "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.",
     "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 recommandé d'ajuster ce paramètre.",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">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} rel=\"noreferrer\">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>.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à au moins \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans nos <a href=\"{docUrl} rel=\"noreferrer\">conseils de sécurisation</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 nos <a href=\"{docUrl}\">conseils de sécurisation</a>.",
     "Shared" : "Partagé",
     "Shared with {recipients}" : "Partagé avec {recipients}",
     "Error" : "Erreur",
     "Error while sharing" : "Erreur lors de la mise en partage",
     "Error while unsharing" : "Erreur lors de l'annulation du partage",
-    "Error setting expiration date" : "Erreur lors de la spécification de la date d'expiration",
-    "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.",
+    "Error setting expiration date" : "Erreur lors de la configuration de la date d'expiration",
+    "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera dans {days} jours après sa création.",
     "Set expiration date" : "Spécifier une date d'expiration",
     "Expiration" : "Expiration",
     "Expiration date" : "Date d'expiration",
@@ -122,7 +122,8 @@ OC.L10N.register(
     "Link" : "Lien",
     "Password protect" : "Protéger par un mot de passe",
     "Allow upload and editing" : "Autoriser l'envoi et l'édition",
-    "File drop (upload only)" : "Dépôt de fichier (uniquement pour le téléversement)",
+    "Allow editing" : "Permettre la modification",
+    "File drop (upload only)" : "Dépôt de fichier (téléversement uniquement)",
     "Email link to person" : "Envoyer le lien par courriel",
     "Send" : "Envoyer",
     "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
@@ -130,7 +131,7 @@ OC.L10N.register(
     "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} a partagé via un lien",
     "group" : "groupe",
     "remote" : "distant",
-    "email" : "Adresse e-mail",
+    "email" : "Adresse de courriel",
     "Unshare" : "Ne plus partager",
     "can reshare" : "peut repartager",
     "can edit" : "peut modifier",
@@ -147,14 +148,14 @@ OC.L10N.register(
     "{sharee} (remote)" : "{sharee} (distant)",
     "{sharee} (email)" : "{sharee} (email)",
     "Share" : "Partager",
-    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Partager avec des personnes sur d'autres serveurs en utilisant leur identifiant du Cloud Fédéré utilisateur@exemple.com/nextcloud",
-    "Share with users or by mail..." : "Partager avec des utilisateurs ou par mail…",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Partager avec des personnes sur d'autres serveurs en utilisant leur identifiant du Cloud Fédéré (utilisateur@exemple.com/nextcloud)",
+    "Share with users or by mail..." : "Partager avec des utilisateurs ou par courriel…",
     "Share with users or remote users..." : "Partager avec des utilisateurs ou des utilisateurs distants...",
-    "Share with users, remote users or by mail..." : "Partager avec des utilisateurs, des utilisateurs distants ou par mail…",
+    "Share with users, remote users or by mail..." : "Partager avec des utilisateurs, des utilisateurs distants ou par courriel…",
     "Share with users or groups..." : "Partager avec des utilisateurs ou des groupes...",
-    "Share with users, groups or by mail..." : "Partager avec des utilisateurs, des groupes ou par mail…",
+    "Share with users, groups or by mail..." : "Partager avec des utilisateurs, des groupes ou par courriel…",
     "Share with users, groups or remote users..." : "Partager avec des utilisateurs, groupes ou utilisateurs distants...",
-    "Share with users, groups, remote users or by mail..." : "Partager avec des utilisateurs, des groupes, des utilisateurs distants ou par mail…",
+    "Share with users, groups, remote users or by mail..." : "Partager avec des utilisateurs, des groupes, des utilisateurs distants ou par courriel…",
     "Share with users..." : "Partager avec des utilisateurs...",
     "Error removing share" : "Erreur lors de l'arrêt du partage",
     "Non-existing tag #{tag}" : "Étiquette #{tag} inexistante",
@@ -166,7 +167,7 @@ OC.L10N.register(
     "Collaborative tags" : "Étiquettes collaboratives ",
     "No tags found" : "Aucune étiquette n'a été trouvée",
     "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
-    "Enter new" : "Saisir un nouveau",
+    "Enter new" : "Nouvelle étiquette",
     "Add" : "Ajouter",
     "Edit tags" : "Modifier les étiquettes",
     "Error loading dialog template: {error}" : "Erreur lors du chargement du modèle de dialogue : {error}",
@@ -228,26 +229,27 @@ OC.L10N.register(
     "Database user" : "Utilisateur de la base de données",
     "Database password" : "Mot de passe de la base de données",
     "Database name" : "Nom de la base de données",
-    "Database tablespace" : "Tablespace de la base de données",
+    "Database tablespace" : "Espace de stockage de la base de données",
     "Database host" : "Hôte de la base de données",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Veuillez spécifier le numéro du port avec le nom de l'hôte (ex: localhost:5432).",
     "Performance warning" : "Avertissement à propos des performances",
     "SQLite will be used as database." : "SQLite sera utilisé comme gestionnaire de base de données.",
     "For larger installations we recommend to choose a different database backend." : "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." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données, l'utilisation de SQLite est déconseillée.",
     "Finish setup" : "Terminer l'installation",
     "Finishing …" : "Finalisation …",
     "Need help?" : "Besoin d'aide ?",
     "See the documentation" : "Lire la documentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Cette application requiert JavaScript pour fonctionner correctement. Veuillez {linkstart}activer JavaScript{linkend} et recharger la page.",
-    "Log out" : "Se déconnecter",
     "Search" : "Rechercher",
+    "Log out" : "Se déconnecter",
     "This action requires you to confirm your password:" : "Cette action nécessite que vous confirmiez votre mot de passe :",
     "Confirm your password" : "Confirmer votre mot de passe",
     "Server side authentication failed!" : "L'authentification sur le serveur a échoué !",
     "Please contact your administrator." : "Veuillez contacter votre administrateur.",
     "An internal error occurred." : "Une erreur interne est survenue.",
     "Please try again or contact your administrator." : "Veuillez réessayer ou contactez votre administrateur.",
-    "Username or email" : "Nom d'utilisateur ou e-mail",
+    "Username or email" : "Nom d'utilisateur ou adresse de courriel",
     "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?",
     "Wrong password." : "Mot de passe incorrect.",
     "Log in" : "Se connecter",
@@ -281,7 +283,7 @@ OC.L10N.register(
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Afin d'éviter les timeouts avec les installations de volume conséquent, vous pouvez exécuter la commande suivante depuis le répertoire d'installation :",
     "Detailed logs" : "Journaux détaillés",
     "Update needed" : "Mise à jour nécessaire",
-    "Please use the command line updater because you have a big instance." : "Veuillez utiliser la mise à jour en ligne de commande, votre instance est trop volumineuse.",
+    "Please use the command line updater because you have a big instance." : "Veuillez utiliser la mise à jour en ligne de commande car votre instance est volumineuse.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Pour obtenir de l'aide, lisez la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Cette instance de %s est en cours de maintenance, cela peut prendre du temps.",
     "This page will refresh itself when the %s instance is available again." : "Cette page se rafraîchira d'elle-même lorsque l'instance %s sera à nouveau disponible.",
@@ -338,9 +340,9 @@ OC.L10N.register(
     "Oct." : "Oct.",
     "Nov." : "Nov.",
     "Dec." : "Déc.",
-    "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." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mail peuvent aussi être indisponibles. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
+    "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?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clé de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
+    "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." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par courriel peuvent aussi être indisponibles. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "La configuration des entêtes du proxy inverse est incorrecte, ou vous accédez à ownCloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accéder à ownCloud depuis un proxy de confiance, ceci est un problème de sécurité qui peut permettre à un attaquant de masquer sa véritable adresse IP. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.",
-    "Allow editing" : "Permettre la modification",
     "Hide file listing" : "Cacher la liste des fichiers",
     "Sending ..." : "Envoi…",
     "Email sent" : "Courriel envoyé",
@@ -357,7 +359,7 @@ OC.L10N.register(
     "Share with users or remote users…" : "Partager avec des utilisateurs ou des utilisateurs distants...",
     "Warning" : "Attention",
     "Error while sending notification" : "Erreur lors de l'envoi de la notification",
-    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La mise à jour est en cours, quitter la page peux interrompre le processus dans beaucoup d'environnements.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La mise à jour est en cours, quitter la page peux interrompre le processus dans certains d'environnements.",
     "Updating to {version}" : "Mise à jour vers {version}",
     "The update was successful. There were warnings." : "La mise à jour a été faite avec succès. Il y a eu des avertissements.",
     "No search results in other folders" : "Aucun résultat dans d'autres dossiers",
@@ -365,20 +367,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "La sécurité renforcée a été activée pour votre compte. Veuillez vous authentifier en utilisant un second facteur.",
     "Cancel login" : "Annuler la connexion",
     "Please authenticate using the selected factor." : "Veuillez vous authentifier en utilisant le second facteur.",
-    "An error occured while verifying the token" : "Une erreur est survenue lors de la vérification du jeton",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Votre serveur web nest pas configuré correctement pour résoudre \"{url}\".  Plus d'informations peuvent être trouvées sur notre <a target=\"_blank\" href=\"{docLink}\">documentation</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Pas de mémoire cache configuré. Pour améliorer les performance merci ce configurer un memcache si disponible.  Plus d'informations peuvent être trouvées sur notre <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom n'est pas lisible par PHP ce qui est hautement déconseillé pour des raisons de sécurité. Plus d'informations peuvent être trouvées sur notre <a target=\"_blank\" href=\"{docLink}\">documentation</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Vous exécutez actuellement PHP {version}. Nous vous encourageons de mettre a jour votre version de PHP pour avoir les avantages de  <a target=\"_blank\" href=\"{phpLink}\">performance et  sécurités donné par les mise à jours de sécurités par le gourpe PHP</a> tant que votre distribution les supportes.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "La configuration des entêtes du proxy inverse est incorrecte, ou vous accédez à Nextcloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accéder à Nextcloud depuis un proxy de confiance, ceci est un problème de sécurité qui peut permettre à un attaquant d'usurper l'adresse IP affichée à Nextcloud. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached est configuré comme cache distribué, mais le mauvais module PHP \"memcache\" est installé. \\OC\\Memcache\\Memcached est le seul a supporter \"memcached\" et non \"memcache\". Regardez le <a target=\"_blank\" href=\"{wikiLink}\">wiki a propos des modules memcached</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Plusieurs fichiers n'ont pas passé le test d'intégrité. Plus d'informations pour résoudre ce problème peuvent être trouvé sur notre <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste des fichiers invalides.../a> / <a href=\"{rescanEndpoint}\">Réanalyser...</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'entête HTTP \"Strict-Transport-Security\" n'est pas configuré pour les dernières \"{seconds}\" secondes. Pour améliorer votre sécurité nous recommandons d'activer HSTS comme décrit dans notre  <a href=\"{docUrl}\">aide de sécurité</a>.",
-    "An error occured. Please try again" : "Une erreur est survenue. Merci d'essayer à nouveau",
-    "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",
-    "not assignable" : "non assignable",
-    "Updating {productName} to version {version}, this may take a while." : "Mise à jour de {productName} vers la version {version}, cela peut prendre du temps.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "POur des informations sur comment configurer proprement votre serveur, merci de regarder la <a href=\"%s\" target=\"_blank\">documentation</a>.",
-    "An internal error occured." : "Une erreur interne est survenue."
+    "An error occured while verifying the token" : "Une erreur est survenue lors de la vérification du jeton"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index c563d85248d..df5e24efb1d 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -58,7 +58,7 @@
     "seconds ago" : "à l'instant",
     "Logging in …" : "Connexion…",
     "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." : "Un lien permettant de réinitialiser votre mot de passe vient de vous être envoyé par courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, contactez votre administrateur.<br>N'oubliez pas de vérifier dans votre dossier pourriel / spam!",
-    "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?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clé de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
+    "Your files are encrypted. 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?" : "Vos fichiers sont chiffrés. Il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
     "I know what I'm doing" : "Je sais ce que je fais",
     "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
     "No" : "Non",
@@ -87,25 +87,25 @@
     "Strong password" : "Mot de passe fort",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour la synchronisation de fichiers : l'interface WebDAV semble ne pas fonctionner.",
     "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "La configuration du serveur web ne permet pas d'atteindre \"{url}\". Consultez la <a target=\"_blank\" ref=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.",
-    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Ce serveur ne peut se connecter à Internet : plusieurs point finaux ne peuvent être atteins. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que l'envoie de notifications par mail peuvent aussi être indisponibles. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Aucun cache mémoire n'est configuré. Si possible, configurez un \"memcache\" pour augmenter les performances. Pour plus d'information consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Ce serveur ne peut se connecter à Internet : plusieurs point finaux ne peuvent être atteints. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que l'envoi de notifications par mail peuvent aussi être indisponibles. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Aucun cache mémoire n'est configuré. Si possible, configurez un \"memcache\" pour améliorer les performances. Pour plus d'informations consultez la <a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom n'est pas lisible par PHP, ce qui est fortement déconseillé pour des raisons de sécurité. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Vous utilisez actuellement PHP {version}. Nous vous encourageons à mettre à jour votre version de PHP afin de tirer avantage des amélioration liées à <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">la performance et la sécurité fournies par le PHP Group</a>, dès que votre distribution le supportera.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Vous utilisez actuellement PHP {version}. Nous vous encourageons à mettre à jour votre version de PHP afin de tirer avantage des améliorations liées à <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">la performance et la sécurité fournies par le PHP Group</a>, dès que votre distribution le supportera.",
     "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "La configuration des entêtes du proxy inverse est incorrecte, ou vous accédez à Nextcloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accéder à Nextcloud depuis un proxy de confiance, ceci est un problème de sécurité qui peut permettre à un attaquant d'usurper l'adresse IP affichée à Nextcloud. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "\"memcached\" est configuré comme cache distribué, mais  le module installé est \"memcache\".  \\OC\\Memcache\\Memcached ne prend en charge que \"memcached\" et non \"memcache\". <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">Consulter le wiki de memcached à propos de ces deux modules.</a>",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Des fichiers n'ont pas réussi à passer la vérification d’intégrité. Plus d'information sur comment résoudre ce problème dans notre <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste des fichiers invalides…</a> / <a href=\"{rescanEndpoint}\">Relancer…</a>)",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "\"memcached\" est configuré comme cache distribué, mais  le mauvais module PHP est installé.  \\OC\\Memcache\\Memcached ne prend en charge que \"memcached\" et non \"memcache\". <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">Consulter le wiki de memcached à propos de ces deux modules.</a>",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Des fichiers n'ont pas passé la vérification d’intégrité. Plus d'information sur comment résoudre ce problème dans notre <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste des fichiers invalides…</a> / <a href=\"{rescanEndpoint}\">Relancer…</a>)",
     "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
     "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.",
     "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 recommandé d'ajuster ce paramètre.",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">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} rel=\"noreferrer\">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>.",
+    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "L'en-tête HTTP \"Strict-Transport-Security\" n'est pas configurée à au moins \"{seconds}\" secondes. Pour renforcer la sécurité nous recommandons d'activer HSTS comme décrit dans nos <a href=\"{docUrl} rel=\"noreferrer\">conseils de sécurisation</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 nos <a href=\"{docUrl}\">conseils de sécurisation</a>.",
     "Shared" : "Partagé",
     "Shared with {recipients}" : "Partagé avec {recipients}",
     "Error" : "Erreur",
     "Error while sharing" : "Erreur lors de la mise en partage",
     "Error while unsharing" : "Erreur lors de l'annulation du partage",
-    "Error setting expiration date" : "Erreur lors de la spécification de la date d'expiration",
-    "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.",
+    "Error setting expiration date" : "Erreur lors de la configuration de la date d'expiration",
+    "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera dans {days} jours après sa création.",
     "Set expiration date" : "Spécifier une date d'expiration",
     "Expiration" : "Expiration",
     "Expiration date" : "Date d'expiration",
@@ -120,7 +120,8 @@
     "Link" : "Lien",
     "Password protect" : "Protéger par un mot de passe",
     "Allow upload and editing" : "Autoriser l'envoi et l'édition",
-    "File drop (upload only)" : "Dépôt de fichier (uniquement pour le téléversement)",
+    "Allow editing" : "Permettre la modification",
+    "File drop (upload only)" : "Dépôt de fichier (téléversement uniquement)",
     "Email link to person" : "Envoyer le lien par courriel",
     "Send" : "Envoyer",
     "Shared with you and the group {group} by {owner}" : "Partagé avec vous et le groupe {group} par {owner}",
@@ -128,7 +129,7 @@
     "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} a partagé via un lien",
     "group" : "groupe",
     "remote" : "distant",
-    "email" : "Adresse e-mail",
+    "email" : "Adresse de courriel",
     "Unshare" : "Ne plus partager",
     "can reshare" : "peut repartager",
     "can edit" : "peut modifier",
@@ -145,14 +146,14 @@
     "{sharee} (remote)" : "{sharee} (distant)",
     "{sharee} (email)" : "{sharee} (email)",
     "Share" : "Partager",
-    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Partager avec des personnes sur d'autres serveurs en utilisant leur identifiant du Cloud Fédéré utilisateur@exemple.com/nextcloud",
-    "Share with users or by mail..." : "Partager avec des utilisateurs ou par mail…",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Partager avec des personnes sur d'autres serveurs en utilisant leur identifiant du Cloud Fédéré (utilisateur@exemple.com/nextcloud)",
+    "Share with users or by mail..." : "Partager avec des utilisateurs ou par courriel…",
     "Share with users or remote users..." : "Partager avec des utilisateurs ou des utilisateurs distants...",
-    "Share with users, remote users or by mail..." : "Partager avec des utilisateurs, des utilisateurs distants ou par mail…",
+    "Share with users, remote users or by mail..." : "Partager avec des utilisateurs, des utilisateurs distants ou par courriel…",
     "Share with users or groups..." : "Partager avec des utilisateurs ou des groupes...",
-    "Share with users, groups or by mail..." : "Partager avec des utilisateurs, des groupes ou par mail…",
+    "Share with users, groups or by mail..." : "Partager avec des utilisateurs, des groupes ou par courriel…",
     "Share with users, groups or remote users..." : "Partager avec des utilisateurs, groupes ou utilisateurs distants...",
-    "Share with users, groups, remote users or by mail..." : "Partager avec des utilisateurs, des groupes, des utilisateurs distants ou par mail…",
+    "Share with users, groups, remote users or by mail..." : "Partager avec des utilisateurs, des groupes, des utilisateurs distants ou par courriel…",
     "Share with users..." : "Partager avec des utilisateurs...",
     "Error removing share" : "Erreur lors de l'arrêt du partage",
     "Non-existing tag #{tag}" : "Étiquette #{tag} inexistante",
@@ -164,7 +165,7 @@
     "Collaborative tags" : "Étiquettes collaboratives ",
     "No tags found" : "Aucune étiquette n'a été trouvée",
     "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
-    "Enter new" : "Saisir un nouveau",
+    "Enter new" : "Nouvelle étiquette",
     "Add" : "Ajouter",
     "Edit tags" : "Modifier les étiquettes",
     "Error loading dialog template: {error}" : "Erreur lors du chargement du modèle de dialogue : {error}",
@@ -226,26 +227,27 @@
     "Database user" : "Utilisateur de la base de données",
     "Database password" : "Mot de passe de la base de données",
     "Database name" : "Nom de la base de données",
-    "Database tablespace" : "Tablespace de la base de données",
+    "Database tablespace" : "Espace de stockage de la base de données",
     "Database host" : "Hôte de la base de données",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Veuillez spécifier le numéro du port avec le nom de l'hôte (ex: localhost:5432).",
     "Performance warning" : "Avertissement à propos des performances",
     "SQLite will be used as database." : "SQLite sera utilisé comme gestionnaire de base de données.",
     "For larger installations we recommend to choose a different database backend." : "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." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données : l'utilisation de SQLite est alors déconseillée.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "En particulier si vous utilisez le client de bureau pour synchroniser vos données, l'utilisation de SQLite est déconseillée.",
     "Finish setup" : "Terminer l'installation",
     "Finishing …" : "Finalisation …",
     "Need help?" : "Besoin d'aide ?",
     "See the documentation" : "Lire la documentation",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Cette application requiert JavaScript pour fonctionner correctement. Veuillez {linkstart}activer JavaScript{linkend} et recharger la page.",
-    "Log out" : "Se déconnecter",
     "Search" : "Rechercher",
+    "Log out" : "Se déconnecter",
     "This action requires you to confirm your password:" : "Cette action nécessite que vous confirmiez votre mot de passe :",
     "Confirm your password" : "Confirmer votre mot de passe",
     "Server side authentication failed!" : "L'authentification sur le serveur a échoué !",
     "Please contact your administrator." : "Veuillez contacter votre administrateur.",
     "An internal error occurred." : "Une erreur interne est survenue.",
     "Please try again or contact your administrator." : "Veuillez réessayer ou contactez votre administrateur.",
-    "Username or email" : "Nom d'utilisateur ou e-mail",
+    "Username or email" : "Nom d'utilisateur ou adresse de courriel",
     "Wrong password. Reset it?" : "Mot de passe incorrect. Réinitialiser ?",
     "Wrong password." : "Mot de passe incorrect.",
     "Log in" : "Se connecter",
@@ -279,7 +281,7 @@
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Afin d'éviter les timeouts avec les installations de volume conséquent, vous pouvez exécuter la commande suivante depuis le répertoire d'installation :",
     "Detailed logs" : "Journaux détaillés",
     "Update needed" : "Mise à jour nécessaire",
-    "Please use the command line updater because you have a big instance." : "Veuillez utiliser la mise à jour en ligne de commande, votre instance est trop volumineuse.",
+    "Please use the command line updater because you have a big instance." : "Veuillez utiliser la mise à jour en ligne de commande car votre instance est volumineuse.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Pour obtenir de l'aide, lisez la <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Cette instance de %s est en cours de maintenance, cela peut prendre du temps.",
     "This page will refresh itself when the %s instance is available again." : "Cette page se rafraîchira d'elle-même lorsque l'instance %s sera à nouveau disponible.",
@@ -336,9 +338,9 @@
     "Oct." : "Oct.",
     "Nov." : "Nov.",
     "Dec." : "Déc.",
-    "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." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mail peuvent aussi être indisponibles. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
+    "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?" : "Vos fichiers sont chiffrés. Si vous n'avez pas activé la clé de récupération, il n'y aura aucun moyen de récupérer vos données une fois le mot de passe réinitialisé.<br />Si vous n'êtes pas sûr de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
+    "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." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par courriel peuvent aussi être indisponibles. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "La configuration des entêtes du proxy inverse est incorrecte, ou vous accédez à ownCloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accéder à ownCloud depuis un proxy de confiance, ceci est un problème de sécurité qui peut permettre à un attaquant de masquer sa véritable adresse IP. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.",
-    "Allow editing" : "Permettre la modification",
     "Hide file listing" : "Cacher la liste des fichiers",
     "Sending ..." : "Envoi…",
     "Email sent" : "Courriel envoyé",
@@ -355,7 +357,7 @@
     "Share with users or remote users…" : "Partager avec des utilisateurs ou des utilisateurs distants...",
     "Warning" : "Attention",
     "Error while sending notification" : "Erreur lors de l'envoi de la notification",
-    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La mise à jour est en cours, quitter la page peux interrompre le processus dans beaucoup d'environnements.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "La mise à jour est en cours, quitter la page peux interrompre le processus dans certains d'environnements.",
     "Updating to {version}" : "Mise à jour vers {version}",
     "The update was successful. There were warnings." : "La mise à jour a été faite avec succès. Il y a eu des avertissements.",
     "No search results in other folders" : "Aucun résultat dans d'autres dossiers",
@@ -363,20 +365,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "La sécurité renforcée a été activée pour votre compte. Veuillez vous authentifier en utilisant un second facteur.",
     "Cancel login" : "Annuler la connexion",
     "Please authenticate using the selected factor." : "Veuillez vous authentifier en utilisant le second facteur.",
-    "An error occured while verifying the token" : "Une erreur est survenue lors de la vérification du jeton",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Votre serveur web nest pas configuré correctement pour résoudre \"{url}\".  Plus d'informations peuvent être trouvées sur notre <a target=\"_blank\" href=\"{docLink}\">documentation</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Pas de mémoire cache configuré. Pour améliorer les performance merci ce configurer un memcache si disponible.  Plus d'informations peuvent être trouvées sur notre <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom n'est pas lisible par PHP ce qui est hautement déconseillé pour des raisons de sécurité. Plus d'informations peuvent être trouvées sur notre <a target=\"_blank\" href=\"{docLink}\">documentation</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Vous exécutez actuellement PHP {version}. Nous vous encourageons de mettre a jour votre version de PHP pour avoir les avantages de  <a target=\"_blank\" href=\"{phpLink}\">performance et  sécurités donné par les mise à jours de sécurités par le gourpe PHP</a> tant que votre distribution les supportes.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "La configuration des entêtes du proxy inverse est incorrecte, ou vous accédez à Nextcloud depuis un proxy de confiance. Si vous n'êtes pas en train d’accéder à Nextcloud depuis un proxy de confiance, ceci est un problème de sécurité qui peut permettre à un attaquant d'usurper l'adresse IP affichée à Nextcloud. Consultez la <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a> pour avoir plus d'informations à ce sujet.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached est configuré comme cache distribué, mais le mauvais module PHP \"memcache\" est installé. \\OC\\Memcache\\Memcached est le seul a supporter \"memcached\" et non \"memcache\". Regardez le <a target=\"_blank\" href=\"{wikiLink}\">wiki a propos des modules memcached</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Plusieurs fichiers n'ont pas passé le test d'intégrité. Plus d'informations pour résoudre ce problème peuvent être trouvé sur notre <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Liste des fichiers invalides.../a> / <a href=\"{rescanEndpoint}\">Réanalyser...</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "L'entête HTTP \"Strict-Transport-Security\" n'est pas configuré pour les dernières \"{seconds}\" secondes. Pour améliorer votre sécurité nous recommandons d'activer HSTS comme décrit dans notre  <a href=\"{docUrl}\">aide de sécurité</a>.",
-    "An error occured. Please try again" : "Une erreur est survenue. Merci d'essayer à nouveau",
-    "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",
-    "not assignable" : "non assignable",
-    "Updating {productName} to version {version}, this may take a while." : "Mise à jour de {productName} vers la version {version}, cela peut prendre du temps.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "POur des informations sur comment configurer proprement votre serveur, merci de regarder la <a href=\"%s\" target=\"_blank\">documentation</a>.",
-    "An internal error occured." : "Une erreur interne est survenue."
+    "An error occured while verifying the token" : "Une erreur est survenue lors de la vérification du jeton"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/he.js b/core/l10n/he.js
index cd2be37a9e6..8212568973e 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -52,7 +52,6 @@ OC.L10N.register(
     "Cancel" : "ביטול",
     "seconds ago" : "שניות",
     "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." : "הקישור לאיפוס הסיסמא שלך נשלח אליך בדואר אלקטרוני. אם לא קיבלת את הקישור תוך זמן סביר, מוטב לבדוק את תיבת דואר הזבל/ספאם שלך.<br>אם ההודעה אינה שם, יש לשאול את המנהל המקומי שלך .",
-    "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?" : "הקבצים שלך מוצפנים. אם לא הפעלת את מפתח השחזור, לא תהיה דרך לקבל את המידע מחדש אחרי שהסיסמא תאופס.<br />אם אין לך מושג מה לעשות what to do, מוטב לפנות למנהל שלך לפני ההמשך. <br />האם באמת ברצונך להמשיך?",
     "I know what I'm doing" : "אני יודע/ת מה אני עושה",
     "Password can not be changed. Please contact your administrator." : "לא ניתן לשנות את הסיסמא. יש לפנות למנהל שלך.",
     "No" : "לא",
@@ -104,6 +103,7 @@ OC.L10N.register(
     "Share link" : "קישור לשיתוף",
     "Link" : "קישור",
     "Password protect" : "הגנה בססמה",
+    "Allow editing" : "אישור עריכה",
     "Email link to person" : "שליחת קישור בדוא״ל למשתמש",
     "Send" : "שליחה",
     "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
@@ -197,8 +197,8 @@ OC.L10N.register(
     "Need help?" : "עזרה נזקקת?",
     "See the documentation" : "יש לצפות במסמכי התיעוד",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "יישום זה דורש JavaScript לפעולה נכונה. יש {linkstart}לאפשר JavaScript{linkend} ולטעון את העמוד מחדש.",
-    "Log out" : "התנתקות",
     "Search" : "חיפוש",
+    "Log out" : "התנתקות",
     "Server side authentication failed!" : "אימות לצד שרת נכשל!",
     "Please contact your administrator." : "יש ליצור קשר עם המנהל.",
     "An internal error occurred." : "אירעה שגיאה פנימית.",
@@ -289,8 +289,8 @@ OC.L10N.register(
     "Oct." : "אוק׳",
     "Nov." : "נוב׳",
     "Dec." : "דצמ׳",
+    "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?" : "הקבצים שלך מוצפנים. אם לא הפעלת את מפתח השחזור, לא תהיה דרך לקבל את המידע מחדש אחרי שהסיסמא תאופס.<br />אם אין לך מושג מה לעשות what to do, מוטב לפנות למנהל שלך לפני ההמשך. <br />האם באמת ברצונך להמשיך?",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "תצורת כותרות פרוקסי ההפוכה אינה נכונה, או שהגישה ל- ownCloud מתבצעת מ- proxy אמין. אם הגישה ל- ownCloud אינה מ- proxy אמין, מדובר בבעיית אבטחה שמאפשרת לתוקף לזייף את כתובת ה- IP כגלויה ל- ownCloud. מידע נוסף ניתן למצוא ב- <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">מסמכי התיעוד</a> שלנו.",
-    "Allow editing" : "אישור עריכה",
     "Sending ..." : "מתבצעת שליחה ...",
     "Email sent" : "הודעת הדוא״ל נשלחה",
     "Send link via email" : "שליחת קישור באמצעות דואר אלקטרוני",
@@ -311,7 +311,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "אבטחה מורחבת הופעלה בחשבון שלך. יש לאמת באמצעות גורם שני.",
     "Cancel login" : "ביטול התחברות",
     "Please authenticate using the selected factor." : "יש לאמת באמצעות גורם נבחר.",
-    "An error occured while verifying the token" : "שגיאה אירעה בזמן אימות המחרוזת",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "ניתן לשתף עם אנשים אחרים המשתמשים ב- ownClouds בעזרת הפורמט הבא username@example.com/owncloud"
+    "An error occured while verifying the token" : "שגיאה אירעה בזמן אימות המחרוזת"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/he.json b/core/l10n/he.json
index ef5bb2140d5..60e70973ebe 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -50,7 +50,6 @@
     "Cancel" : "ביטול",
     "seconds ago" : "שניות",
     "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." : "הקישור לאיפוס הסיסמא שלך נשלח אליך בדואר אלקטרוני. אם לא קיבלת את הקישור תוך זמן סביר, מוטב לבדוק את תיבת דואר הזבל/ספאם שלך.<br>אם ההודעה אינה שם, יש לשאול את המנהל המקומי שלך .",
-    "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?" : "הקבצים שלך מוצפנים. אם לא הפעלת את מפתח השחזור, לא תהיה דרך לקבל את המידע מחדש אחרי שהסיסמא תאופס.<br />אם אין לך מושג מה לעשות what to do, מוטב לפנות למנהל שלך לפני ההמשך. <br />האם באמת ברצונך להמשיך?",
     "I know what I'm doing" : "אני יודע/ת מה אני עושה",
     "Password can not be changed. Please contact your administrator." : "לא ניתן לשנות את הסיסמא. יש לפנות למנהל שלך.",
     "No" : "לא",
@@ -102,6 +101,7 @@
     "Share link" : "קישור לשיתוף",
     "Link" : "קישור",
     "Password protect" : "הגנה בססמה",
+    "Allow editing" : "אישור עריכה",
     "Email link to person" : "שליחת קישור בדוא״ל למשתמש",
     "Send" : "שליחה",
     "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
@@ -195,8 +195,8 @@
     "Need help?" : "עזרה נזקקת?",
     "See the documentation" : "יש לצפות במסמכי התיעוד",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "יישום זה דורש JavaScript לפעולה נכונה. יש {linkstart}לאפשר JavaScript{linkend} ולטעון את העמוד מחדש.",
-    "Log out" : "התנתקות",
     "Search" : "חיפוש",
+    "Log out" : "התנתקות",
     "Server side authentication failed!" : "אימות לצד שרת נכשל!",
     "Please contact your administrator." : "יש ליצור קשר עם המנהל.",
     "An internal error occurred." : "אירעה שגיאה פנימית.",
@@ -287,8 +287,8 @@
     "Oct." : "אוק׳",
     "Nov." : "נוב׳",
     "Dec." : "דצמ׳",
+    "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?" : "הקבצים שלך מוצפנים. אם לא הפעלת את מפתח השחזור, לא תהיה דרך לקבל את המידע מחדש אחרי שהסיסמא תאופס.<br />אם אין לך מושג מה לעשות what to do, מוטב לפנות למנהל שלך לפני ההמשך. <br />האם באמת ברצונך להמשיך?",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "תצורת כותרות פרוקסי ההפוכה אינה נכונה, או שהגישה ל- ownCloud מתבצעת מ- proxy אמין. אם הגישה ל- ownCloud אינה מ- proxy אמין, מדובר בבעיית אבטחה שמאפשרת לתוקף לזייף את כתובת ה- IP כגלויה ל- ownCloud. מידע נוסף ניתן למצוא ב- <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">מסמכי התיעוד</a> שלנו.",
-    "Allow editing" : "אישור עריכה",
     "Sending ..." : "מתבצעת שליחה ...",
     "Email sent" : "הודעת הדוא״ל נשלחה",
     "Send link via email" : "שליחת קישור באמצעות דואר אלקטרוני",
@@ -309,7 +309,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "אבטחה מורחבת הופעלה בחשבון שלך. יש לאמת באמצעות גורם שני.",
     "Cancel login" : "ביטול התחברות",
     "Please authenticate using the selected factor." : "יש לאמת באמצעות גורם נבחר.",
-    "An error occured while verifying the token" : "שגיאה אירעה בזמן אימות המחרוזת",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "ניתן לשתף עם אנשים אחרים המשתמשים ב- ownClouds בעזרת הפורמט הבא username@example.com/owncloud"
+    "An error occured while verifying the token" : "שגיאה אירעה בזמן אימות המחרוזת"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index a0059ea4d62..5a8251eb0bb 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -60,7 +60,6 @@ OC.L10N.register(
     "seconds ago" : "pár másodperce",
     "Logging in …" : "Bejelentkezés ...",
     "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 jelszó visszaállításához a hivatkozást e-mailben elküldtük. Ha a levél elfogadható időn belül nem érkezik meg, ellenőrizze a spam/levélszemét mappát.<br>Ha nincs ott, kérdezze meg a helyi rendszergazdát.",
-    "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?" : "Az Ön fájljai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne.<br />Biztos, hogy folytatni kívánja?",
     "I know what I'm doing" : "Tudom mit csinálok.",
     "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
     "No" : "Nem",
@@ -122,6 +121,7 @@ OC.L10N.register(
     "Link" : "Hivatkozás",
     "Password protect" : "Jelszóval védett",
     "Allow upload and editing" : "Feltöltés és szerkesztés engedélyezése",
+    "Allow editing" : "Szerkesztés engedélyezése",
     "File drop (upload only)" : "Fájl ejtés (csak feltöltés)",
     "Email link to person" : "Hivatkozás elküldése e-mail címre",
     "Send" : "Küldés",
@@ -230,6 +230,7 @@ OC.L10N.register(
     "Database name" : "Az adatbázis neve",
     "Database tablespace" : "Az adatbázis táblázattér (tablespace)",
     "Database host" : "Adatbázis szerver",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Kérlek add meg a port számát a kiszolgáló neve után (pl: localhost:5432).",
     "Performance warning" : "Teljesítménybeli figyelmeztetés",
     "SQLite will be used as database." : "SQLite lesz adatbázisként használva.",
     "For larger installations we recommend to choose a different database backend." : "Nagyobb telepítésekhez ajánlott egy másik adatbázis háttérkiszolgáló használata.",
@@ -239,8 +240,8 @@ OC.L10N.register(
     "Need help?" : "Segítségre van szüksége?",
     "See the documentation" : "Nézze meg a dokumentációt",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Az alkalmazás megfelelő működéséhez JavaScript szükséges. Kérjük, {linkstart}engedélyezze a JavaScript-et{linkend} és frissítse a lapot.",
-    "Log out" : "Kijelentkezés",
     "Search" : "Keresés",
+    "Log out" : "Kijelentkezés",
     "This action requires you to confirm your password:" : "A művelethez szükség van a jelszavad megerősítésére:",
     "Confirm your password" : "Erősítsd meg a jelszavad:",
     "Server side authentication failed!" : "A szerveroldali hitelesítés sikertelen!",
@@ -338,9 +339,9 @@ OC.L10N.register(
     "Oct." : "okt.",
     "Nov." : "nov.",
     "Dec." : "dec.",
+    "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?" : "Az Ön fájljai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne.<br />Biztos, hogy folytatni kívánja?",
     "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." : "Ennek a szervernek nincs működő internet kapcsolata. Ez azt jelenti, hogy néhány funkció, mint pl. külső tárolók csatolása, frissítési értesítések, vagy a harmadik féltől származó alkalmazások telepítése nem fog működni. A fájlok távoli elérése és az e-mail értesítések is lehet, hogy nem működnek. Ajánlott az internet kapcsolat engedélyezése a szerveren, ha minden funkciót használni szeretnél.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "A fordított proxy fejlécek konfigurációs beállításai helytelenek, vagy egy megbízható proxy-ból próbálja az ownCloud-ot elérni. Ha nem megbízható proxy-ból próbálja elérni az ownCloud-ot, akkor ez egy biztonsági probléma, a támadó az ownCloud számára látható IP cím csalást tud végrehajtani. Bővebb információt a <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentációban</a> találhat.",
-    "Allow editing" : "Szerkesztés engedélyezése",
     "Hide file listing" : "Fájl lista elrejtése",
     "Sending ..." : "Küldés ...",
     "Email sent" : "Az e-mailt elküldtük!",
@@ -365,20 +366,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "A fokozott biztonság engedélyezve lett a fiókod számára. Kérlek hitelesítsd egy második faktor használatával.",
     "Cancel login" : "Bejelentkezés megszakítása",
     "Please authenticate using the selected factor." : "Kérlek hitelesítsd a kiválasztott faktor használatával.",
-    "An error occured while verifying the token" : "Hiba történt a token ellenőrzése közben",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "A webszer nincs megfelelően beállítva a következő feloldására: \"{url}\". További információkat  a <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a> találsz.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Nincs memória gyorsítótár beállítva. A teljesítmény növelése érdekében kérlek állítd be a memcache-t, ha elérhető. Bővebb információt a <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a> találsz.",
-    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom nem olvasható a PHP számára, ami biztonsági okokból nem javasolt.. Bővebb információt a <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a> találsz.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Jelenleg {version} PHP verziót futtatsz. Javasoljuk, hogy amilyen hamar a disztribúciód támogatja, frissítsd a PHP verziót, hogy kihasználhasd a <a target=\"_blank\" href=\"{phpLink}\">teljesítménybeli és a biztonságbeli előnyöket, amiket a PHP Group kínál</a>.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "A fordított proxy fejlécek konfigurációs beállításai helytelenek, vagy egy megbízható proxy-ból próbálod a Nextcloudot elérni. Ha nem megbízható proxy-ból próbálod elérni az Nextcloudot, akkor ez egy biztonsági probléma, a támadó az Nextcloud számára látható IP cím csalást tud végrehajtani. Bővebb információt a  <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a> találhatsz.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "A memcached be van konfigurálva gyorsítótárnak, de rossz \"memcache\" PHP modul van telepítve. \\OC\\Memcache\\Memcached csak a \"memcached\"-t támogatja,  és nem a \"memcache\"-t. Kérlek, nézd meg a <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki oldalt a modulokkal kapcsolatban</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Néhány fájl nem felelt meg az integritás ellenőrzésen. Bővebb információt a <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a> találhatsz. (<a href=\"{codeIntegrityDownloadEndpoint}\">Érvénytelen fájlok listája…</a> / <a href=\"{rescanEndpoint}\">Újra ellenőrzés…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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élyezd a HSTS, ahogyan ezt részletezzük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban.",
-    "An error occured. Please try again" : "Hiba történt. Kérjük, próbálja újra!",
-    "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 felhasználó@példa.hu/owncloud",
-    "not assignable" : "nem hozzárendelhető",
-    "Updating {productName} to version {version}, this may take a while." : "{productName} frissítése erre a verzióra: {version}, ez eltarthat egy ideig.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A szerver megfelelő beállításához kérjük olvasd el a <a href=\"%s\" target=\"_blank\">dokumentációt</a>.",
-    "An internal error occured." : "Belső hiba történt."
+    "An error occured while verifying the token" : "Hiba történt a token ellenőrzése közben"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 22cafb988d4..a3c1cab9276 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -58,7 +58,6 @@
     "seconds ago" : "pár másodperce",
     "Logging in …" : "Bejelentkezés ...",
     "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 jelszó visszaállításához a hivatkozást e-mailben elküldtük. Ha a levél elfogadható időn belül nem érkezik meg, ellenőrizze a spam/levélszemét mappát.<br>Ha nincs ott, kérdezze meg a helyi rendszergazdát.",
-    "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?" : "Az Ön fájljai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne.<br />Biztos, hogy folytatni kívánja?",
     "I know what I'm doing" : "Tudom mit csinálok.",
     "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
     "No" : "Nem",
@@ -120,6 +119,7 @@
     "Link" : "Hivatkozás",
     "Password protect" : "Jelszóval védett",
     "Allow upload and editing" : "Feltöltés és szerkesztés engedélyezése",
+    "Allow editing" : "Szerkesztés engedélyezése",
     "File drop (upload only)" : "Fájl ejtés (csak feltöltés)",
     "Email link to person" : "Hivatkozás elküldése e-mail címre",
     "Send" : "Küldés",
@@ -228,6 +228,7 @@
     "Database name" : "Az adatbázis neve",
     "Database tablespace" : "Az adatbázis táblázattér (tablespace)",
     "Database host" : "Adatbázis szerver",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Kérlek add meg a port számát a kiszolgáló neve után (pl: localhost:5432).",
     "Performance warning" : "Teljesítménybeli figyelmeztetés",
     "SQLite will be used as database." : "SQLite lesz adatbázisként használva.",
     "For larger installations we recommend to choose a different database backend." : "Nagyobb telepítésekhez ajánlott egy másik adatbázis háttérkiszolgáló használata.",
@@ -237,8 +238,8 @@
     "Need help?" : "Segítségre van szüksége?",
     "See the documentation" : "Nézze meg a dokumentációt",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Az alkalmazás megfelelő működéséhez JavaScript szükséges. Kérjük, {linkstart}engedélyezze a JavaScript-et{linkend} és frissítse a lapot.",
-    "Log out" : "Kijelentkezés",
     "Search" : "Keresés",
+    "Log out" : "Kijelentkezés",
     "This action requires you to confirm your password:" : "A művelethez szükség van a jelszavad megerősítésére:",
     "Confirm your password" : "Erősítsd meg a jelszavad:",
     "Server side authentication failed!" : "A szerveroldali hitelesítés sikertelen!",
@@ -336,9 +337,9 @@
     "Oct." : "okt.",
     "Nov." : "nov.",
     "Dec." : "dec.",
+    "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?" : "Az Ön fájljai titkosítva vannak. Ha nem engedélyezte korábban az adatok visszanyeréséhez szükséges kulcs használatát, akkor a jelszó megváltoztatását követően nem fog hozzáférni az adataihoz. Ha nem biztos abban, hogy mit kellene tennie, akkor kérdezze meg a rendszergazdát, mielőtt továbbmenne.<br />Biztos, hogy folytatni kívánja?",
     "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." : "Ennek a szervernek nincs működő internet kapcsolata. Ez azt jelenti, hogy néhány funkció, mint pl. külső tárolók csatolása, frissítési értesítések, vagy a harmadik féltől származó alkalmazások telepítése nem fog működni. A fájlok távoli elérése és az e-mail értesítések is lehet, hogy nem működnek. Ajánlott az internet kapcsolat engedélyezése a szerveren, ha minden funkciót használni szeretnél.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "A fordított proxy fejlécek konfigurációs beállításai helytelenek, vagy egy megbízható proxy-ból próbálja az ownCloud-ot elérni. Ha nem megbízható proxy-ból próbálja elérni az ownCloud-ot, akkor ez egy biztonsági probléma, a támadó az ownCloud számára látható IP cím csalást tud végrehajtani. Bővebb információt a <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentációban</a> találhat.",
-    "Allow editing" : "Szerkesztés engedélyezése",
     "Hide file listing" : "Fájl lista elrejtése",
     "Sending ..." : "Küldés ...",
     "Email sent" : "Az e-mailt elküldtük!",
@@ -363,20 +364,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "A fokozott biztonság engedélyezve lett a fiókod számára. Kérlek hitelesítsd egy második faktor használatával.",
     "Cancel login" : "Bejelentkezés megszakítása",
     "Please authenticate using the selected factor." : "Kérlek hitelesítsd a kiválasztott faktor használatával.",
-    "An error occured while verifying the token" : "Hiba történt a token ellenőrzése közben",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "A webszer nincs megfelelően beállítva a következő feloldására: \"{url}\". További információkat  a <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a> találsz.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Nincs memória gyorsítótár beállítva. A teljesítmény növelése érdekében kérlek állítd be a memcache-t, ha elérhető. Bővebb információt a <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a> találsz.",
-    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom nem olvasható a PHP számára, ami biztonsági okokból nem javasolt.. Bővebb információt a <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a> találsz.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Jelenleg {version} PHP verziót futtatsz. Javasoljuk, hogy amilyen hamar a disztribúciód támogatja, frissítsd a PHP verziót, hogy kihasználhasd a <a target=\"_blank\" href=\"{phpLink}\">teljesítménybeli és a biztonságbeli előnyöket, amiket a PHP Group kínál</a>.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "A fordított proxy fejlécek konfigurációs beállításai helytelenek, vagy egy megbízható proxy-ból próbálod a Nextcloudot elérni. Ha nem megbízható proxy-ból próbálod elérni az Nextcloudot, akkor ez egy biztonsági probléma, a támadó az Nextcloud számára látható IP cím csalást tud végrehajtani. Bővebb információt a  <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a> találhatsz.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "A memcached be van konfigurálva gyorsítótárnak, de rossz \"memcache\" PHP modul van telepítve. \\OC\\Memcache\\Memcached csak a \"memcached\"-t támogatja,  és nem a \"memcache\"-t. Kérlek, nézd meg a <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki oldalt a modulokkal kapcsolatban</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Néhány fájl nem felelt meg az integritás ellenőrzésen. Bővebb információt a <a target=\"_blank\" href=\"{docLink}\">dokumentációban</a> találhatsz. (<a href=\"{codeIntegrityDownloadEndpoint}\">Érvénytelen fájlok listája…</a> / <a href=\"{rescanEndpoint}\">Újra ellenőrzés…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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élyezd a HSTS, ahogyan ezt részletezzük a <a href=\"{docUrl}\">biztonsági tippek</a> dokumentációban.",
-    "An error occured. Please try again" : "Hiba történt. Kérjük, próbálja újra!",
-    "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 felhasználó@példa.hu/owncloud",
-    "not assignable" : "nem hozzárendelhető",
-    "Updating {productName} to version {version}, this may take a while." : "{productName} frissítése erre a verzióra: {version}, ez eltarthat egy ideig.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A szerver megfelelő beállításához kérjük olvasd el a <a href=\"%s\" target=\"_blank\">dokumentációt</a>.",
-    "An internal error occured." : "Belső hiba történt."
+    "An error occured while verifying the token" : "Hiba történt a token ellenőrzése közben"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/id.js b/core/l10n/id.js
index ff07a789159..2ed3768d6a4 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Please select a file." : "Pilih berkas",
     "File is too big" : "Berkas terlalu besar",
+    "The selected file is not an image." : "Berkas yang dipilih bukanlah sebuah gambar.",
+    "The selected file cannot be read." : "Berkas yang dipilih tidak bisa dibaca.",
     "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",
@@ -45,18 +47,24 @@ OC.L10N.register(
     "Already up to date" : "Sudah yang terbaru",
     "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Ada permasalahan dengan pengecekan integrasi kode. Informasi selanjutnya…</a>",
     "Settings" : "Pengaturan",
+    "Connection to server lost" : "Koneksi ke server gagal",
     "Problem loading page, reloading in 5 seconds" : "Terjadi masalah dalam memuat laman, mencoba lagi dalam 5 detik",
     "Saving..." : "Menyimpan...",
     "Dismiss" : "Buang",
+    "This action requires you to confirm your password" : "Aksi ini membutuhkan konfirmasi kata sandi Anda",
+    "Authentication required" : "Diperlukan otentikasi",
     "Password" : "Sandi",
     "Cancel" : "Batal",
+    "Confirm" : "Konfirmasi",
+    "Failed to authenticate, try again" : "Gagal mengotentikasi, coba lagi",
     "seconds ago" : "beberapa detik yang lalu",
+    "Logging in …" : "Log masuk...",
     "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." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.",
-    "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?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
     "I know what I'm doing" : "Saya tahu apa yang saya lakukan",
     "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
     "No" : "Tidak",
     "Yes" : "Ya",
+    "No files in here" : "Tidak ada berkas disini",
     "Choose" : "Pilih",
     "Error loading file picker template: {error}" : "Kesalahan saat memuat templat berkas pemilih: {error}",
     "Ok" : "Oke",
@@ -72,6 +80,7 @@ OC.L10N.register(
     "(all selected)" : "(semua terpilih)",
     "({count} selected)" : "({count} terpilih)",
     "Error loading file exists template" : "Kesalahan memuat templat berkas yang sudah ada",
+    "Pending" : "Terutnda",
     "Very weak password" : "Sandi sangat lemah",
     "Weak password" : "Sandi lemah",
     "So-so password" : "Sandi lumayan",
@@ -83,6 +92,7 @@ OC.L10N.register(
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Tidak ada memory cache telah dikonfigurasi. Untuk meningkatkan kinerja, mohon mengkonfigurasi memcache jika tersedia. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom tidak bisa dibaca oleh PHP dan sangat tidak disarankan untuk alasan keamanan. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasi</a> kami.",
     "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Anda sekarang menjalankan PHP {version}. Kami menyarankan Anda untuk perbarui versi PHP Anda untuk memanfaatkan <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performa dan pembaruan keamanan yang disediakan oleh PHP Group</a> saat distribusi Anda mendukungnya.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurasi proxy header terbalik salah, atau Anda mengakses Nextcloud dari proxy terpercaya. Apabila Anda tidak mengakses Nextcloud dari proxy terpercaya, ini adalah masalah keamanan dan penyerang dapat memalsukan alamat IP mereka ke Nextcloud. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasi</a> kami.",
     "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached terkonfigurasi sebagai cache terdistribusi, tetapi modul PHP \"memcache\" yang salah terpasang. \\OC\\Memcache\\Memcached hanya mendukung \"memcached\" dan bukan \"memcache\". Lihat <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">wiki memcached tentang kedua modul</a>.",
     "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Beberapa berkas tidak lulus cek integritas. Informasi lebih lanjut tentang cara mengatasi masalah ini dapat ditemukan di <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasi</a> kami. (<a href=\"{codeIntegrityDownloadEndpoint}\">Daftar berkas yang tidak valid…</a> / <a href=\"{rescanEndpoint}\">Pindai ulang…</a>)",
     "Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
@@ -102,6 +112,7 @@ OC.L10N.register(
     "Expiration date" : "Tanggal kedaluwarsa",
     "Choose a password for the public link" : "Tetapkan sandi untuk tautan publik",
     "Copied!" : "Tersalin!",
+    "Copy" : "Salin",
     "Not supported!" : "Tidak didukung!",
     "Press ⌘-C to copy." : "Tekan ⌘-C untuk menyalin.",
     "Press Ctrl-C to copy." : "Tekan Ctrl-C untuk menyalin.",
@@ -109,6 +120,8 @@ OC.L10N.register(
     "Share link" : "Bagikan tautan",
     "Link" : "Tautan",
     "Password protect" : "Lindungi dengan sandi",
+    "Allow upload and editing" : "Izinkan pengunggahan dan penyuntingan",
+    "Allow editing" : "Izinkan penyuntingan",
     "Email link to person" : "Emailkan tautan ini ke orang",
     "Send" : "Kirim",
     "Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
@@ -207,8 +220,8 @@ OC.L10N.register(
     "Need help?" : "Butuh bantuan?",
     "See the documentation" : "Lihat dokumentasi",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Aplikasi ini memerlukan JavaScript untuk dapat beroperasi dengan benar. Mohon {linkstart}aktifkan JavaScript{linkend} dan muat ulang halaman ini.",
-    "Log out" : "Keluar",
     "Search" : "Cari",
+    "Log out" : "Keluar",
     "Server side authentication failed!" : "Otentikasi dari sisi server gagal!",
     "Please contact your administrator." : "Silahkan hubungi administrator anda.",
     "An internal error occurred." : "Terjadi kesalahan internal.",
@@ -299,9 +312,9 @@ OC.L10N.register(
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Des.",
+    "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?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
     "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." : "Server ini tidak tersambung ke internet. Ini berarti beberapa fitur seperti me-mount penyimpanan eksternal, notifikasi pembaruan atau instalasi aplikasi pihak ketiga tidak akan bekerja. Mengakses berkas secara remote dan mengirim notifikasi email juga tidak bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda ingin memiliki fitur ini.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurasi proxy header terbalik salah, atau Anda mengakses ownCloud dari proxy terpercaya. Apabila Anda tidak mengakses ownCloud dari proxy terpercaya, ini adalah masalah keamanan dan penyerang dapat memalsukan alamat IP mereka ke ownCloud. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasi</a> kami.",
-    "Allow editing" : "Izinkan penyuntingan",
     "Hide file listing" : "Sembunyikan pendaftaran berkas",
     "Sending ..." : "Mengirim ...",
     "Email sent" : "Email terkirim",
@@ -326,20 +339,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Peningkatan keamanan delah diaktifkan untuk akun Anda. Mohon otentikasi menggunakan faktor kedua.",
     "Cancel login" : "Batalkan log masuk",
     "Please authenticate using the selected factor." : "Mohon lakukan otentikasi dengan faktor ke dua.",
-    "An error occured while verifying the token" : "Terjadi kesalahan saat memverifikasi token",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Server web Anda tidak diatur secara baik untuk menyelesaikan \"{url}\". Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Tidak ada memory cache telah dikonfigurasi. Untuk meningkatkan kinerja, mohon mengkonfigurasi memcache jika tersedia. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom tidak bisa dibaca oleh PHP dan sangat tidak disarankan untuk alasan keamanan. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Anda sekarang menjalankan PHP {version}. Kami menyarankan Anda untuk perbarui versi PHP Anda untuk memanfaatkan <a target=\"_blank\" href=\"{phpLink}\">performa dan pembaruan keamanan yang disediakan oleh PHP Group</a> saat distribusi Anda mendukungnya.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Konfigurasi proxy header terbalik salah, atau Anda mengakses Nextcloud dari proxy terpercaya. Apabila Anda tidak mengakses Nextcloud dari proxy terpercaya, ini adalah masalah keamanan dan penyerang dapat memalsukan alamat IP mereka ke Nextcloud. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached terkonfigurasi sebagai cache terdistribusi, tetapi modul PHP \"memcache\" yang salah terpasang. \\OC\\Memcache\\Memcached hanya mendukung \"memcached\" dan bukan \"memcache\". Lihat <a target=\"_blank\" href=\"{wikiLink}\">wiki memcached tentang kedua modul</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Beberapa berkas tidak lulus cek integritas. Informasi lebih lanjut tentang cara mengatasi masalah ini dapat ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami. (<a href=\"{codeIntegrityDownloadEndpoint}\">Daftar berkas yang tidak valid…</a> / <a href=\"{rescanEndpoint}\">Pindai ulang…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Header \"Strict-Transport-Security\" HTTP tidak terkonfigurasi ke setidaknya \"{seconds}\" detik. Untuk meningkatkan kemanan kami merekomendasikan mengaktifkan HSTS seperti yang dijelaskan di <a href=\"{docUrl}\">saran keamanan</a> kami.",
-    "An error occured. Please try again" : "Terjadi kesalahan. Silakan coba lagi",
-    "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",
-    "not assignable" : "tidak dapat disematkan",
-    "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini dapat memakan waktu.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi bagaimana menkonfigurasi server Anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
-    "An internal error occured." : "Terjadi kesalahan internal."
+    "An error occured while verifying the token" : "Terjadi kesalahan saat memverifikasi token"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/id.json b/core/l10n/id.json
index 5ad2ce37327..dd562e7d9b1 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Please select a file." : "Pilih berkas",
     "File is too big" : "Berkas terlalu besar",
+    "The selected file is not an image." : "Berkas yang dipilih bukanlah sebuah gambar.",
+    "The selected file cannot be read." : "Berkas yang dipilih tidak bisa dibaca.",
     "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",
@@ -43,18 +45,24 @@
     "Already up to date" : "Sudah yang terbaru",
     "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Ada permasalahan dengan pengecekan integrasi kode. Informasi selanjutnya…</a>",
     "Settings" : "Pengaturan",
+    "Connection to server lost" : "Koneksi ke server gagal",
     "Problem loading page, reloading in 5 seconds" : "Terjadi masalah dalam memuat laman, mencoba lagi dalam 5 detik",
     "Saving..." : "Menyimpan...",
     "Dismiss" : "Buang",
+    "This action requires you to confirm your password" : "Aksi ini membutuhkan konfirmasi kata sandi Anda",
+    "Authentication required" : "Diperlukan otentikasi",
     "Password" : "Sandi",
     "Cancel" : "Batal",
+    "Confirm" : "Konfirmasi",
+    "Failed to authenticate, try again" : "Gagal mengotentikasi, coba lagi",
     "seconds ago" : "beberapa detik yang lalu",
+    "Logging in …" : "Log masuk...",
     "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." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.",
-    "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?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
     "I know what I'm doing" : "Saya tahu apa yang saya lakukan",
     "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
     "No" : "Tidak",
     "Yes" : "Ya",
+    "No files in here" : "Tidak ada berkas disini",
     "Choose" : "Pilih",
     "Error loading file picker template: {error}" : "Kesalahan saat memuat templat berkas pemilih: {error}",
     "Ok" : "Oke",
@@ -70,6 +78,7 @@
     "(all selected)" : "(semua terpilih)",
     "({count} selected)" : "({count} terpilih)",
     "Error loading file exists template" : "Kesalahan memuat templat berkas yang sudah ada",
+    "Pending" : "Terutnda",
     "Very weak password" : "Sandi sangat lemah",
     "Weak password" : "Sandi lemah",
     "So-so password" : "Sandi lumayan",
@@ -81,6 +90,7 @@
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Tidak ada memory cache telah dikonfigurasi. Untuk meningkatkan kinerja, mohon mengkonfigurasi memcache jika tersedia. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom tidak bisa dibaca oleh PHP dan sangat tidak disarankan untuk alasan keamanan. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasi</a> kami.",
     "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Anda sekarang menjalankan PHP {version}. Kami menyarankan Anda untuk perbarui versi PHP Anda untuk memanfaatkan <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performa dan pembaruan keamanan yang disediakan oleh PHP Group</a> saat distribusi Anda mendukungnya.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurasi proxy header terbalik salah, atau Anda mengakses Nextcloud dari proxy terpercaya. Apabila Anda tidak mengakses Nextcloud dari proxy terpercaya, ini adalah masalah keamanan dan penyerang dapat memalsukan alamat IP mereka ke Nextcloud. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasi</a> kami.",
     "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached terkonfigurasi sebagai cache terdistribusi, tetapi modul PHP \"memcache\" yang salah terpasang. \\OC\\Memcache\\Memcached hanya mendukung \"memcached\" dan bukan \"memcache\". Lihat <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">wiki memcached tentang kedua modul</a>.",
     "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Beberapa berkas tidak lulus cek integritas. Informasi lebih lanjut tentang cara mengatasi masalah ini dapat ditemukan di <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasi</a> kami. (<a href=\"{codeIntegrityDownloadEndpoint}\">Daftar berkas yang tidak valid…</a> / <a href=\"{rescanEndpoint}\">Pindai ulang…</a>)",
     "Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
@@ -100,6 +110,7 @@
     "Expiration date" : "Tanggal kedaluwarsa",
     "Choose a password for the public link" : "Tetapkan sandi untuk tautan publik",
     "Copied!" : "Tersalin!",
+    "Copy" : "Salin",
     "Not supported!" : "Tidak didukung!",
     "Press ⌘-C to copy." : "Tekan ⌘-C untuk menyalin.",
     "Press Ctrl-C to copy." : "Tekan Ctrl-C untuk menyalin.",
@@ -107,6 +118,8 @@
     "Share link" : "Bagikan tautan",
     "Link" : "Tautan",
     "Password protect" : "Lindungi dengan sandi",
+    "Allow upload and editing" : "Izinkan pengunggahan dan penyuntingan",
+    "Allow editing" : "Izinkan penyuntingan",
     "Email link to person" : "Emailkan tautan ini ke orang",
     "Send" : "Kirim",
     "Shared with you and the group {group} by {owner}" : "Dibagikan dengan anda dan grup {group} oleh {owner}",
@@ -205,8 +218,8 @@
     "Need help?" : "Butuh bantuan?",
     "See the documentation" : "Lihat dokumentasi",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Aplikasi ini memerlukan JavaScript untuk dapat beroperasi dengan benar. Mohon {linkstart}aktifkan JavaScript{linkend} dan muat ulang halaman ini.",
-    "Log out" : "Keluar",
     "Search" : "Cari",
+    "Log out" : "Keluar",
     "Server side authentication failed!" : "Otentikasi dari sisi server gagal!",
     "Please contact your administrator." : "Silahkan hubungi administrator anda.",
     "An internal error occurred." : "Terjadi kesalahan internal.",
@@ -297,9 +310,9 @@
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Des.",
+    "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?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
     "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." : "Server ini tidak tersambung ke internet. Ini berarti beberapa fitur seperti me-mount penyimpanan eksternal, notifikasi pembaruan atau instalasi aplikasi pihak ketiga tidak akan bekerja. Mengakses berkas secara remote dan mengirim notifikasi email juga tidak bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda ingin memiliki fitur ini.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurasi proxy header terbalik salah, atau Anda mengakses ownCloud dari proxy terpercaya. Apabila Anda tidak mengakses ownCloud dari proxy terpercaya, ini adalah masalah keamanan dan penyerang dapat memalsukan alamat IP mereka ke ownCloud. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasi</a> kami.",
-    "Allow editing" : "Izinkan penyuntingan",
     "Hide file listing" : "Sembunyikan pendaftaran berkas",
     "Sending ..." : "Mengirim ...",
     "Email sent" : "Email terkirim",
@@ -324,20 +337,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Peningkatan keamanan delah diaktifkan untuk akun Anda. Mohon otentikasi menggunakan faktor kedua.",
     "Cancel login" : "Batalkan log masuk",
     "Please authenticate using the selected factor." : "Mohon lakukan otentikasi dengan faktor ke dua.",
-    "An error occured while verifying the token" : "Terjadi kesalahan saat memverifikasi token",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Server web Anda tidak diatur secara baik untuk menyelesaikan \"{url}\". Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Tidak ada memory cache telah dikonfigurasi. Untuk meningkatkan kinerja, mohon mengkonfigurasi memcache jika tersedia. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom tidak bisa dibaca oleh PHP dan sangat tidak disarankan untuk alasan keamanan. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Anda sekarang menjalankan PHP {version}. Kami menyarankan Anda untuk perbarui versi PHP Anda untuk memanfaatkan <a target=\"_blank\" href=\"{phpLink}\">performa dan pembaruan keamanan yang disediakan oleh PHP Group</a> saat distribusi Anda mendukungnya.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Konfigurasi proxy header terbalik salah, atau Anda mengakses Nextcloud dari proxy terpercaya. Apabila Anda tidak mengakses Nextcloud dari proxy terpercaya, ini adalah masalah keamanan dan penyerang dapat memalsukan alamat IP mereka ke Nextcloud. Informasi selanjutnya bisa ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached terkonfigurasi sebagai cache terdistribusi, tetapi modul PHP \"memcache\" yang salah terpasang. \\OC\\Memcache\\Memcached hanya mendukung \"memcached\" dan bukan \"memcache\". Lihat <a target=\"_blank\" href=\"{wikiLink}\">wiki memcached tentang kedua modul</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Beberapa berkas tidak lulus cek integritas. Informasi lebih lanjut tentang cara mengatasi masalah ini dapat ditemukan di <a target=\"_blank\" href=\"{docLink}\">dokumentasi</a> kami. (<a href=\"{codeIntegrityDownloadEndpoint}\">Daftar berkas yang tidak valid…</a> / <a href=\"{rescanEndpoint}\">Pindai ulang…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "Header \"Strict-Transport-Security\" HTTP tidak terkonfigurasi ke setidaknya \"{seconds}\" detik. Untuk meningkatkan kemanan kami merekomendasikan mengaktifkan HSTS seperti yang dijelaskan di <a href=\"{docUrl}\">saran keamanan</a> kami.",
-    "An error occured. Please try again" : "Terjadi kesalahan. Silakan coba lagi",
-    "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",
-    "not assignable" : "tidak dapat disematkan",
-    "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini dapat memakan waktu.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi bagaimana menkonfigurasi server Anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
-    "An internal error occured." : "Terjadi kesalahan internal."
+    "An error occured while verifying the token" : "Terjadi kesalahan saat memverifikasi token"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 648a2b77e4b..ac8414d4cf8 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -52,7 +52,6 @@ OC.L10N.register(
     "Cancel" : "Hætta við",
     "seconds ago" : "sekúndum síðan",
     "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." : "Tengillinn til að endurstilla lykilorðið þitt hefur verið sendur á netfangið þitt. Ef þú færð ekki póstinn innan hæfilegs tíma, athugaðu þá ruslpóstmöppuna.<br>Ef hann 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 dulritaðar. Ef þú hefur ekki virkjað endurheimtingarlykilinn, þá verður engin leið til að fá gögnin þín til baka eftir lykilorðið þitt er endurstillt.<br />Ef þú ert ekki viss hvað eigi 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 er hægt að breyta lykilorði. Hafðu samband við kerfisstjóra.",
     "No" : "Nei",
@@ -110,6 +109,7 @@ OC.L10N.register(
     "Link" : "Tengill",
     "Password protect" : "Verja með lykilorði",
     "Allow upload and editing" : "Leyfa innsendingu og breytingar",
+    "Allow editing" : "Leyfa breytingar",
     "Email link to person" : "Senda veftengil í tölvupósti til notanda",
     "Send" : "Senda",
     "Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
@@ -208,8 +208,8 @@ OC.L10N.register(
     "Need help?" : "Þarftu hjálp?",
     "See the documentation" : "Sjá hjálparskjölin",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Þetta forrit krefst JavaScript fyrir rétta virkni. {linkstart} virkjaðu JavaScript {linkend} og endurlestu síðan síðuna.",
-    "Log out" : "Skrá út",
     "Search" : "Leita",
+    "Log out" : "Skrá út",
     "Server side authentication failed!" : "Auðkenning af hálfu þjóns tókst ekki!",
     "Please contact your administrator." : "Hafðu samband við kerfisstjóra.",
     "An internal error occurred." : "Innri villa kom upp.",
@@ -305,9 +305,9 @@ OC.L10N.register(
     "Oct." : "Okt.",
     "Nov." : "Nóv.",
     "Dec." : "Des.",
+    "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 dulritaðar. Ef þú hefur ekki virkjað endurheimtingarlykilinn, þá verður engin leið til að fá gögnin þín til baka eftir lykilorðið þitt er endurstillt.<br />Ef þú ert ekki viss hvað eigi að gera, skaltu hafa samband við kerfisstjórann áður en þú heldur áfram. <br />Viltu halda áfram?",
     "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 þjónn er ekki með virka nettengingu. Þetta þýðir að sumir eiginleikar eins og að virkja ytri gagnageymslu, tilkynningar um uppfærslur eða uppsetningu á forritum þriðja aðila, mun ekki virka. Fjartengdur aðgangur að skrám og sending tilkynninga í tölvupósti virka líklega ekki heldur. Við leggjum til að internettenging sé virkjuð fyrir þennan vefþjón ef þú vilt hafa alla eiginleika tiltæka.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Uppsetning gagnstæðs milliþjónshauss (reverse proxy header) er röng, eða að þú ert að tengjast Nextcloud frá treystum milliþjóni. Ef þú ert ekki að tengjast Nextcloud frá treystum milliþjóni, þá er þetta er öryggisvandamál og getur leyft árásaraðilum að dulbúa IP-vistfang þeirra sem sýnilegt Nextcloud. Nánari upplýsingar má finna í <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
-    "Allow editing" : "Leyfa breytingar",
     "Hide file listing" : "Fela skráalista",
     "Sending ..." : "Sendi ...",
     "Email sent" : "Tölvupóstur sendur",
@@ -332,20 +332,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Aukið öryggi var virkjað fyrir aðganginn þinn. Auðkenndu þig með aukaþrepi.",
     "Cancel login" : "Hætta við innskráningu",
     "Please authenticate using the selected factor." : "Auðkenndu þig með völdu þrepi.",
-    "An error occured while verifying the token" : "Villa kom upp við að sannreyna teiknið",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Vefþjónninn þinn er ekki uppsettur þannig að hann geti leyst \"{url}\". Frekari upplýsingar er að finna í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ekkert skyndiminni (cache) hefur verið stillt. Til að auka afköst ættirðu að setja upp skyndiminni (með memcache) ef það er tiltækt. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
-    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom er ekki lesanlegt af PHP sem er mjög óráðlegt af öryggisástæðum. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Þú ert að keyra PHP {version}. Við hvetjum þig til að uppfæra PHP útgáfuna til að njóta <a target=\"_blank\" href=\"{phpLink}\">afkastaaukningar og öryggisuppfærslna frá PHP Group</a> um leið og dreifingin þín styður það.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Uppsetning gagnstæðs milliþjónshauss (reverse proxy header) er röng, eða að þú ert að tengjast Nextcloud frá treystum milliþjóni Ef þú ert ekki að tengjast Nextcloud frá treystum milliþjóni, þá er þetta er öryggisvandamál og getur leyft árásaraðilum að dulbúa IP-vistfang þeirra sem sýnilegt Nextcloud. Nánari upplýsingar má finna í <a target=\"_blank\"  href=\"{docLink}\">hjálparskjölum</a> okkar.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er sett upp sem dreift skyndiminni, en hinsvegar er ranga PHP-einingin \"memcache\" uppsett. \\OC\\Memcache\\Memcached styður einungis \"memcached\" en ekki \"memcache\". Skoðaðu <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki-síðurnar um báðar einingarnar</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sumar skrár hafa ekki staðist áreiðanleikaprófun. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listi yfir ógildar skrár…</a> / <a href=\"{rescanEndpoint}\">Endurskanna…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP-hausinn er ekki stilltur á að minnsa kosti \"{seconds}\" sekúndur. Fyrir aukið öryggi mælum við með því að virkja HSTS eins og lýst er í <a href=\"{docUrl}\">öryggisleiðbeiningum</a>.",
-    "An error occured. Please try again" : "Villa kom upp. Endilega reyndu aftur",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Deila með fólki í öðrum Nextcloud-skýjum með skipuninni notandanafn@dæmi.is/nextcloud",
-    "not assignable" : "ekki úthlutanlegt",
-    "Updating {productName} to version {version}, this may take a while." : "Uppfæri {productName} í útgáfu {version}, þetta getur tekið smá stund.",
-    "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\">hjálparskjölin</a>.",
-    "An internal error occured." : "Innri villa kom upp."
+    "An error occured while verifying the token" : "Villa kom upp við að sannreyna teiknið"
 },
 "nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/core/l10n/is.json b/core/l10n/is.json
index 7cbd412daac..a389453cfc7 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -50,7 +50,6 @@
     "Cancel" : "Hætta við",
     "seconds ago" : "sekúndum síðan",
     "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." : "Tengillinn til að endurstilla lykilorðið þitt hefur verið sendur á netfangið þitt. Ef þú færð ekki póstinn innan hæfilegs tíma, athugaðu þá ruslpóstmöppuna.<br>Ef hann 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 dulritaðar. Ef þú hefur ekki virkjað endurheimtingarlykilinn, þá verður engin leið til að fá gögnin þín til baka eftir lykilorðið þitt er endurstillt.<br />Ef þú ert ekki viss hvað eigi 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 er hægt að breyta lykilorði. Hafðu samband við kerfisstjóra.",
     "No" : "Nei",
@@ -108,6 +107,7 @@
     "Link" : "Tengill",
     "Password protect" : "Verja með lykilorði",
     "Allow upload and editing" : "Leyfa innsendingu og breytingar",
+    "Allow editing" : "Leyfa breytingar",
     "Email link to person" : "Senda veftengil í tölvupósti til notanda",
     "Send" : "Senda",
     "Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
@@ -206,8 +206,8 @@
     "Need help?" : "Þarftu hjálp?",
     "See the documentation" : "Sjá hjálparskjölin",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Þetta forrit krefst JavaScript fyrir rétta virkni. {linkstart} virkjaðu JavaScript {linkend} og endurlestu síðan síðuna.",
-    "Log out" : "Skrá út",
     "Search" : "Leita",
+    "Log out" : "Skrá út",
     "Server side authentication failed!" : "Auðkenning af hálfu þjóns tókst ekki!",
     "Please contact your administrator." : "Hafðu samband við kerfisstjóra.",
     "An internal error occurred." : "Innri villa kom upp.",
@@ -303,9 +303,9 @@
     "Oct." : "Okt.",
     "Nov." : "Nóv.",
     "Dec." : "Des.",
+    "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 dulritaðar. Ef þú hefur ekki virkjað endurheimtingarlykilinn, þá verður engin leið til að fá gögnin þín til baka eftir lykilorðið þitt er endurstillt.<br />Ef þú ert ekki viss hvað eigi að gera, skaltu hafa samband við kerfisstjórann áður en þú heldur áfram. <br />Viltu halda áfram?",
     "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 þjónn er ekki með virka nettengingu. Þetta þýðir að sumir eiginleikar eins og að virkja ytri gagnageymslu, tilkynningar um uppfærslur eða uppsetningu á forritum þriðja aðila, mun ekki virka. Fjartengdur aðgangur að skrám og sending tilkynninga í tölvupósti virka líklega ekki heldur. Við leggjum til að internettenging sé virkjuð fyrir þennan vefþjón ef þú vilt hafa alla eiginleika tiltæka.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Uppsetning gagnstæðs milliþjónshauss (reverse proxy header) er röng, eða að þú ert að tengjast Nextcloud frá treystum milliþjóni. Ef þú ert ekki að tengjast Nextcloud frá treystum milliþjóni, þá er þetta er öryggisvandamál og getur leyft árásaraðilum að dulbúa IP-vistfang þeirra sem sýnilegt Nextcloud. Nánari upplýsingar má finna í <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
-    "Allow editing" : "Leyfa breytingar",
     "Hide file listing" : "Fela skráalista",
     "Sending ..." : "Sendi ...",
     "Email sent" : "Tölvupóstur sendur",
@@ -330,20 +330,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Aukið öryggi var virkjað fyrir aðganginn þinn. Auðkenndu þig með aukaþrepi.",
     "Cancel login" : "Hætta við innskráningu",
     "Please authenticate using the selected factor." : "Auðkenndu þig með völdu þrepi.",
-    "An error occured while verifying the token" : "Villa kom upp við að sannreyna teiknið",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Vefþjónninn þinn er ekki uppsettur þannig að hann geti leyst \"{url}\". Frekari upplýsingar er að finna í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ekkert skyndiminni (cache) hefur verið stillt. Til að auka afköst ættirðu að setja upp skyndiminni (með memcache) ef það er tiltækt. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
-    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom er ekki lesanlegt af PHP sem er mjög óráðlegt af öryggisástæðum. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Þú ert að keyra PHP {version}. Við hvetjum þig til að uppfæra PHP útgáfuna til að njóta <a target=\"_blank\" href=\"{phpLink}\">afkastaaukningar og öryggisuppfærslna frá PHP Group</a> um leið og dreifingin þín styður það.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Uppsetning gagnstæðs milliþjónshauss (reverse proxy header) er röng, eða að þú ert að tengjast Nextcloud frá treystum milliþjóni Ef þú ert ekki að tengjast Nextcloud frá treystum milliþjóni, þá er þetta er öryggisvandamál og getur leyft árásaraðilum að dulbúa IP-vistfang þeirra sem sýnilegt Nextcloud. Nánari upplýsingar má finna í <a target=\"_blank\"  href=\"{docLink}\">hjálparskjölum</a> okkar.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached er sett upp sem dreift skyndiminni, en hinsvegar er ranga PHP-einingin \"memcache\" uppsett. \\OC\\Memcache\\Memcached styður einungis \"memcached\" en ekki \"memcache\". Skoðaðu <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki-síðurnar um báðar einingarnar</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sumar skrár hafa ekki staðist áreiðanleikaprófun. Hægt er að finna nánari upplýsingar um þetta í <a target=\"_blank\" href=\"{docLink}\">hjálparskjölum</a> okkar. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listi yfir ógildar skrár…</a> / <a href=\"{rescanEndpoint}\">Endurskanna…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP-hausinn er ekki stilltur á að minnsa kosti \"{seconds}\" sekúndur. Fyrir aukið öryggi mælum við með því að virkja HSTS eins og lýst er í <a href=\"{docUrl}\">öryggisleiðbeiningum</a>.",
-    "An error occured. Please try again" : "Villa kom upp. Endilega reyndu aftur",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Deila með fólki í öðrum Nextcloud-skýjum með skipuninni notandanafn@dæmi.is/nextcloud",
-    "not assignable" : "ekki úthlutanlegt",
-    "Updating {productName} to version {version}, this may take a while." : "Uppfæri {productName} í útgáfu {version}, þetta getur tekið smá stund.",
-    "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\">hjálparskjölin</a>.",
-    "An internal error occured." : "Innri villa kom upp."
+    "An error occured while verifying the token" : "Villa kom upp við að sannreyna teiknið"
 },"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 4c1dc68688d..b37eb695a1f 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -60,7 +60,7 @@ OC.L10N.register(
     "seconds ago" : "secondi fa",
     "Logging in …" : "Accesso in corso...",
     "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." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
-    "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?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di ripristino, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
+    "Your files are encrypted. 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?" : "I tuoi file sono cifrati. Non sarà più possibile recuperare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
     "I know what I'm doing" : "So cosa sto facendo",
     "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
     "No" : "No",
@@ -122,6 +122,7 @@ OC.L10N.register(
     "Link" : "Collegamento",
     "Password protect" : "Proteggi con password",
     "Allow upload and editing" : "Consenti il caricamento e la modifica",
+    "Allow editing" : "Consenti la modifica",
     "File drop (upload only)" : "Rilascia file (solo caricamento)",
     "Email link to person" : "Invia collegamento via email",
     "Send" : "Invia",
@@ -230,6 +231,7 @@ OC.L10N.register(
     "Database name" : "Nome del database",
     "Database tablespace" : "Spazio delle tabelle del database",
     "Database host" : "Host del database",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Specifica il numero della porta insieme al nome host (ad es. localhost:5432).",
     "Performance warning" : "Avviso di prestazioni",
     "SQLite will be used as database." : "SQLite sarà utilizzato come database.",
     "For larger installations we recommend to choose a different database backend." : "Per installazioni più grandi consigliamo di scegliere un motore di database diverso.",
@@ -239,8 +241,8 @@ OC.L10N.register(
     "Need help?" : "Ti serve aiuto?",
     "See the documentation" : "Leggi la documentazione",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Questa applicazione richiede JavaScript per un corretto funzionamento. {linkstart}Abilita JavaScript{linkend} e ricarica la pagina.",
-    "Log out" : "Esci",
     "Search" : "Cerca",
+    "Log out" : "Esci",
     "This action requires you to confirm your password:" : "Questa azione richiede la conferma della tua password:",
     "Confirm your password" : "Conferma la tua password",
     "Server side authentication failed!" : "Autenticazione lato server non riuscita!",
@@ -338,9 +340,9 @@ OC.L10N.register(
     "Oct." : "Ott.",
     "Nov." : "Nov.",
     "Dec." : "Dic.",
+    "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?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di ripristino, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
     "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." : "Questo server non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
     "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 target=\"_blank\" rel=\"noreferrer\" 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, rendendolo visibile a ownCloud. Ulteriori informazioni sono disponibili nella nostra <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentazione</a>.",
-    "Allow editing" : "Consenti la modifica",
     "Hide file listing" : "Nascondi elenco dei file",
     "Sending ..." : "Invio in corso...",
     "Email sent" : "Messaggio inviato",
@@ -365,20 +367,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Una sicurezza più efficace è stata abilitata sul tuo account. Autenticati utilizzando un secondo fattore.",
     "Cancel login" : "Annulla l'accesso",
     "Please authenticate using the selected factor." : "Autentica utilizzando il fattore selezionato.",
-    "An error occured while verifying the token" : "Si è verificato un errore durante la verifica del token",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Il tuo server web non è configurato correttamente per risolvere \"{url}\". Ulteriori informazioni sono disponibili nella nostra <a target=\"_blank\" href=\"{docLink}\">documentazione</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" 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 target=\"_blank\" 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 target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentazione</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Stai eseguendo attualmente PHP {version}. Ti esortiamo ad aggiornare la tua versione di PHP per trarre vantaggio dagli aggiornamenti in termini di <a target=\"_blank\" ref=\"{phpLink}\">prestazioni e sicurezza forniti dal PHP Group</a> non appena la tua distribuzione la supporta.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "La configurazione delle intestazioni del proxy inverso non è corretta, o stai effettuando l'accesso a Nextcloud 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, rendendolo visibile a Nextcloud. Ulteriori informazioni sono disponibili nella nostra <a target=\"_blank\" href=\"{docLink}\">documentazione</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached è configurato come cache distribuita, ma è installato il modulo \"memcache\" errato. \\OC\\Memcache\\Memcached supporta solo \"memcached\" e non \"memcache\". Vedi il  <a target=\"_blank\" href=\"{wikiLink}\">wiki di memcached per informazioni su entrambi i moduli</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Alcuni file non hanno superato il controllo di integrità. Ulteriori informazioni su come risolvere questo problema sono disponibili nella nostra <a target=\"_blank\" href=\"{docLink}\">documentazione</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Elenco dei file non validi…</a> / <a href=\"{rescanEndpoint}\">Nuova scansione…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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 di almeno \"{seconds}\" secondi. Per migliorare la sicurezza, consigliamo di abilitare HSTS come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.",
-    "An error occured. Please try again" : "Si è verificato un errore. Prova di nuovo",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone di altri server NextCloud utilizzando la sintassi nomeutente@esempio.com/nextcloud",
-    "not assignable" : "non assegnabile",
-    "Updating {productName} to version {version}, this may take a while." : "L'aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
-    "An internal error occured." : "Si è verificato un errore interno."
+    "An error occured while verifying the token" : "Si è verificato un errore durante la verifica del token"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 0c92a505e14..877972e78f7 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -58,7 +58,7 @@
     "seconds ago" : "secondi fa",
     "Logging in …" : "Accesso in corso...",
     "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." : "Il collegamento per reimpostare la password è stato inviato al tuo indirizzo di posta. Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
-    "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?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di ripristino, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
+    "Your files are encrypted. 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?" : "I tuoi file sono cifrati. Non sarà più possibile recuperare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
     "I know what I'm doing" : "So cosa sto facendo",
     "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
     "No" : "No",
@@ -120,6 +120,7 @@
     "Link" : "Collegamento",
     "Password protect" : "Proteggi con password",
     "Allow upload and editing" : "Consenti il caricamento e la modifica",
+    "Allow editing" : "Consenti la modifica",
     "File drop (upload only)" : "Rilascia file (solo caricamento)",
     "Email link to person" : "Invia collegamento via email",
     "Send" : "Invia",
@@ -228,6 +229,7 @@
     "Database name" : "Nome del database",
     "Database tablespace" : "Spazio delle tabelle del database",
     "Database host" : "Host del database",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Specifica il numero della porta insieme al nome host (ad es. localhost:5432).",
     "Performance warning" : "Avviso di prestazioni",
     "SQLite will be used as database." : "SQLite sarà utilizzato come database.",
     "For larger installations we recommend to choose a different database backend." : "Per installazioni più grandi consigliamo di scegliere un motore di database diverso.",
@@ -237,8 +239,8 @@
     "Need help?" : "Ti serve aiuto?",
     "See the documentation" : "Leggi la documentazione",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Questa applicazione richiede JavaScript per un corretto funzionamento. {linkstart}Abilita JavaScript{linkend} e ricarica la pagina.",
-    "Log out" : "Esci",
     "Search" : "Cerca",
+    "Log out" : "Esci",
     "This action requires you to confirm your password:" : "Questa azione richiede la conferma della tua password:",
     "Confirm your password" : "Conferma la tua password",
     "Server side authentication failed!" : "Autenticazione lato server non riuscita!",
@@ -336,9 +338,9 @@
     "Oct." : "Ott.",
     "Nov." : "Nov.",
     "Dec." : "Dic.",
+    "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?" : "I tuoi file sono cifrati. Se non hai precedentemente abilitato la chiave di ripristino, non sarà più possibile ritrovare i tuoi dati una volta che la password sarà reimpostata.<br />Se non sei sicuro, contatta l'amministratore prima di proseguire.<br />Vuoi davvero continuare?",
     "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." : "Questo server non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
     "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 target=\"_blank\" rel=\"noreferrer\" 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, rendendolo visibile a ownCloud. Ulteriori informazioni sono disponibili nella nostra <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentazione</a>.",
-    "Allow editing" : "Consenti la modifica",
     "Hide file listing" : "Nascondi elenco dei file",
     "Sending ..." : "Invio in corso...",
     "Email sent" : "Messaggio inviato",
@@ -363,20 +365,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Una sicurezza più efficace è stata abilitata sul tuo account. Autenticati utilizzando un secondo fattore.",
     "Cancel login" : "Annulla l'accesso",
     "Please authenticate using the selected factor." : "Autentica utilizzando il fattore selezionato.",
-    "An error occured while verifying the token" : "Si è verificato un errore durante la verifica del token",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Il tuo server web non è configurato correttamente per risolvere \"{url}\". Ulteriori informazioni sono disponibili nella nostra <a target=\"_blank\" href=\"{docLink}\">documentazione</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" 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 target=\"_blank\" 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 target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentazione</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Stai eseguendo attualmente PHP {version}. Ti esortiamo ad aggiornare la tua versione di PHP per trarre vantaggio dagli aggiornamenti in termini di <a target=\"_blank\" ref=\"{phpLink}\">prestazioni e sicurezza forniti dal PHP Group</a> non appena la tua distribuzione la supporta.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "La configurazione delle intestazioni del proxy inverso non è corretta, o stai effettuando l'accesso a Nextcloud 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, rendendolo visibile a Nextcloud. Ulteriori informazioni sono disponibili nella nostra <a target=\"_blank\" href=\"{docLink}\">documentazione</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached è configurato come cache distribuita, ma è installato il modulo \"memcache\" errato. \\OC\\Memcache\\Memcached supporta solo \"memcached\" e non \"memcache\". Vedi il  <a target=\"_blank\" href=\"{wikiLink}\">wiki di memcached per informazioni su entrambi i moduli</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Alcuni file non hanno superato il controllo di integrità. Ulteriori informazioni su come risolvere questo problema sono disponibili nella nostra <a target=\"_blank\" href=\"{docLink}\">documentazione</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Elenco dei file non validi…</a> / <a href=\"{rescanEndpoint}\">Nuova scansione…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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 di almeno \"{seconds}\" secondi. Per migliorare la sicurezza, consigliamo di abilitare HSTS come descritto nei nostri <a href=\"{docUrl}\">consigli sulla sicurezza</a>.",
-    "An error occured. Please try again" : "Si è verificato un errore. Prova di nuovo",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Condividi con persone di altri server NextCloud utilizzando la sintassi nomeutente@esempio.com/nextcloud",
-    "not assignable" : "non assegnabile",
-    "Updating {productName} to version {version}, this may take a while." : "L'aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
-    "An internal error occured." : "Si è verificato un errore interno."
+    "An error occured while verifying the token" : "Si è verificato un errore durante la verifica del token"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 286116bbe67..8b411db8077 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -60,7 +60,7 @@ OC.L10N.register(
     "seconds ago" : "数秒前",
     "Logging in …" : "ログイン中...",
     "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." : "パスワードをリセットするリンクをクリックしたので、メールを送信しました。しばらくたってもメールが届かなかった場合は、スパム/ジャンクフォルダーを確認してください。<br>それでも見つからなかった場合は、管理者に問合わせてください。",
-    "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?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に問い合わせてください。<br />続けてよろしいでしょうか?",
+    "Your files are encrypted. 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?" : "ファイルが暗号化されています。パスワードをリセットした場合、データを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に問い合わせてください。<br />続けてよろしいでしょうか?",
     "I know what I'm doing" : "どういう操作をしているか理解しています",
     "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
     "No" : "いいえ",
@@ -122,6 +122,7 @@ OC.L10N.register(
     "Link" : "リンク",
     "Password protect" : "パスワード保護を有効化",
     "Allow upload and editing" : "アップロードと編集を許可する",
+    "Allow editing" : "編集を許可",
     "File drop (upload only)" : "ファイルドロップ(アップロードのみ)",
     "Email link to person" : "メールリンク",
     "Send" : "送信",
@@ -230,6 +231,7 @@ OC.L10N.register(
     "Database name" : "データベース名",
     "Database tablespace" : "データベースの表領域",
     "Database host" : "データベースのホスト名",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "ポート番号をホスト名とともに指定してください(例：localhost：5432)。",
     "Performance warning" : "パフォーマンス警告",
     "SQLite will be used as database." : "SQLiteをデータベースとして使用しています。",
     "For larger installations we recommend to choose a different database backend." : "大規模な運用では別のデータベースを選択することをお勧めします。",
@@ -239,8 +241,8 @@ OC.L10N.register(
     "Need help?" : "ヘルプが必要ですか？",
     "See the documentation" : "ドキュメントを確認してください",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "このアプリケーションの動作にはJavaScriptが必要です。\n {linkstart}JavaScriptを有効にし{linkend} 、ページを更新してください。 ",
-    "Log out" : "ログアウト",
     "Search" : "検索",
+    "Log out" : "ログアウト",
     "This action requires you to confirm your password:" : "この操作では、パスワードを確認する必要があります:",
     "Confirm your password" : "パスワードを確認",
     "Server side authentication failed!" : "サーバーサイドの認証に失敗しました！",
@@ -338,9 +340,9 @@ OC.L10N.register(
     "Oct." : "10月",
     "Nov." : "11月",
     "Dec." : "12月",
+    "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?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に問い合わせてください。<br />続けてよろしいでしょうか?",
     "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." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティ製のアプリ、といった一部の機能が利用できません。また、リモート接続でのファイルアクセス、通知メールの送信のような機能も利用できないことがあります。すべての機能を利用するには、このサーバーのインターネット接続を有効にすることをお勧めします。",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "リバースプロキシのヘッダー設定が間違っているか、または信頼されたプロキシからownCloudにアクセスしていません。もし、信頼されたプロキシからアクセスされているのでないなら、攻撃者の詐称されたIPアドレスから ownCloudを見ることができるように許可されていて、セキュリティに問題があります。詳細な情報は、 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">ドキュメント</a>を確認してください。",
-    "Allow editing" : "編集を許可",
     "Hide file listing" : "ファイルリストを隠す",
     "Sending ..." : "送信中...",
     "Email sent" : "メールを送信しました",
@@ -365,20 +367,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "あなたのアカウントではセキュリティ拡張が有効になっています。2要素認証を使って認証してください。",
     "Cancel login" : "ログインをキャンセル",
     "Please authenticate using the selected factor." : "選択したデバイスを利用して認証してください。",
-    "An error occured while verifying the token" : "トークンの整合性チェックでエラーが発生",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Webサーバーは適切にホスト名 \"{url}\" が引けるように設定されていません。詳細については、<a target=\"_blank\" href=\"{docLink}\">ドキュメント</a>を参照してください。",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "メモリキャッシュが設定されていません。パフォーマンスを向上させるには、使用可能な場合はmemcacheを設定してください。詳細については、<a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandomがPHPから読み込みできません。これはセキュリティの理由から非常に推奨されていません。詳細については、<a target=\"_blank\" href=\"{docLink}\">ドキュメント</a>を参照してください。",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "あなたは現在PHP {version}を実行しています。ディストリビューションでサポートされたら、すぐにPHPのバージョンをアップグレードして<a target=\"_blank\" href=\"{phpLink}\"> PHPグループが提供するパフォーマンスとセキュリティのアップデート</a>を利用することをお勧めします。",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "リバースプロキシヘッダーの設定が正しくないか、信頼できるプロキシからNextcloudにアクセスしています。信頼できるプロキシからNextcloudにアクセスしていない場合、これはセキュリティ上の問題があり、攻撃者が自分のIPアドレスを偽装してNextcloudに見えるようにしている可能性があります。詳細については、<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">ドキュメント</a>をご覧ください。",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached は分散キャッシュとして設定されています。しかし、PHPモジュール \"memcache\"が間違ってインストールされています。  \\OC\\Memcache\\Memcached は、\"memcached\" のみをサポートしています。\"memcache\" ではありません。<a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki で両方のモジュールの情報</a> について確認してください。",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "一部のファイルが整合性チェックに合格していません。この問題の解決方法の詳細については、<a target=\"_blank\" href=\"{docLink}\">ドキュメント</a>をご覧ください。 (<a href=\"{codeIntegrityDownloadEndpoint}\">無効なファイルのリスト... </a> / <a href=\"{rescanEndpoint}\">再スキャン... </a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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}\" rel=\"noreferrer\">セキュリティTips</a>を参照して、HSTS を有効にすることをおすすめします。",
-    "An error occured. Please try again" : "エラーが発生しました。再度試行してください。",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "次の形式で指定して他のownCloudのユーザーと、共有",
-    "not assignable" : "割り当て不可",
-    "Updating {productName} to version {version}, this may take a while." : "{productName} をバージョン{version} に更新するには、しばらく時間がかかることがあります。",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを正しく設定する方法については、<a href=\"%s\" target=\"_blank\">ドキュメント</a>をご覧ください。",
-    "An internal error occured." : "内部エラーが発生しました"
+    "An error occured while verifying the token" : "トークンの整合性チェックでエラーが発生"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index f8e188506e7..03bfcd2173e 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -58,7 +58,7 @@
     "seconds ago" : "数秒前",
     "Logging in …" : "ログイン中...",
     "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." : "パスワードをリセットするリンクをクリックしたので、メールを送信しました。しばらくたってもメールが届かなかった場合は、スパム/ジャンクフォルダーを確認してください。<br>それでも見つからなかった場合は、管理者に問合わせてください。",
-    "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?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に問い合わせてください。<br />続けてよろしいでしょうか?",
+    "Your files are encrypted. 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?" : "ファイルが暗号化されています。パスワードをリセットした場合、データを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に問い合わせてください。<br />続けてよろしいでしょうか?",
     "I know what I'm doing" : "どういう操作をしているか理解しています",
     "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
     "No" : "いいえ",
@@ -120,6 +120,7 @@
     "Link" : "リンク",
     "Password protect" : "パスワード保護を有効化",
     "Allow upload and editing" : "アップロードと編集を許可する",
+    "Allow editing" : "編集を許可",
     "File drop (upload only)" : "ファイルドロップ(アップロードのみ)",
     "Email link to person" : "メールリンク",
     "Send" : "送信",
@@ -228,6 +229,7 @@
     "Database name" : "データベース名",
     "Database tablespace" : "データベースの表領域",
     "Database host" : "データベースのホスト名",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "ポート番号をホスト名とともに指定してください(例：localhost：5432)。",
     "Performance warning" : "パフォーマンス警告",
     "SQLite will be used as database." : "SQLiteをデータベースとして使用しています。",
     "For larger installations we recommend to choose a different database backend." : "大規模な運用では別のデータベースを選択することをお勧めします。",
@@ -237,8 +239,8 @@
     "Need help?" : "ヘルプが必要ですか？",
     "See the documentation" : "ドキュメントを確認してください",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "このアプリケーションの動作にはJavaScriptが必要です。\n {linkstart}JavaScriptを有効にし{linkend} 、ページを更新してください。 ",
-    "Log out" : "ログアウト",
     "Search" : "検索",
+    "Log out" : "ログアウト",
     "This action requires you to confirm your password:" : "この操作では、パスワードを確認する必要があります:",
     "Confirm your password" : "パスワードを確認",
     "Server side authentication failed!" : "サーバーサイドの認証に失敗しました！",
@@ -336,9 +338,9 @@
     "Oct." : "10月",
     "Nov." : "11月",
     "Dec." : "12月",
+    "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?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に問い合わせてください。<br />続けてよろしいでしょうか?",
     "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." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティ製のアプリ、といった一部の機能が利用できません。また、リモート接続でのファイルアクセス、通知メールの送信のような機能も利用できないことがあります。すべての機能を利用するには、このサーバーのインターネット接続を有効にすることをお勧めします。",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "リバースプロキシのヘッダー設定が間違っているか、または信頼されたプロキシからownCloudにアクセスしていません。もし、信頼されたプロキシからアクセスされているのでないなら、攻撃者の詐称されたIPアドレスから ownCloudを見ることができるように許可されていて、セキュリティに問題があります。詳細な情報は、 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">ドキュメント</a>を確認してください。",
-    "Allow editing" : "編集を許可",
     "Hide file listing" : "ファイルリストを隠す",
     "Sending ..." : "送信中...",
     "Email sent" : "メールを送信しました",
@@ -363,20 +365,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "あなたのアカウントではセキュリティ拡張が有効になっています。2要素認証を使って認証してください。",
     "Cancel login" : "ログインをキャンセル",
     "Please authenticate using the selected factor." : "選択したデバイスを利用して認証してください。",
-    "An error occured while verifying the token" : "トークンの整合性チェックでエラーが発生",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Webサーバーは適切にホスト名 \"{url}\" が引けるように設定されていません。詳細については、<a target=\"_blank\" href=\"{docLink}\">ドキュメント</a>を参照してください。",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "メモリキャッシュが設定されていません。パフォーマンスを向上させるには、使用可能な場合はmemcacheを設定してください。詳細については、<a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandomがPHPから読み込みできません。これはセキュリティの理由から非常に推奨されていません。詳細については、<a target=\"_blank\" href=\"{docLink}\">ドキュメント</a>を参照してください。",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "あなたは現在PHP {version}を実行しています。ディストリビューションでサポートされたら、すぐにPHPのバージョンをアップグレードして<a target=\"_blank\" href=\"{phpLink}\"> PHPグループが提供するパフォーマンスとセキュリティのアップデート</a>を利用することをお勧めします。",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "リバースプロキシヘッダーの設定が正しくないか、信頼できるプロキシからNextcloudにアクセスしています。信頼できるプロキシからNextcloudにアクセスしていない場合、これはセキュリティ上の問題があり、攻撃者が自分のIPアドレスを偽装してNextcloudに見えるようにしている可能性があります。詳細については、<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">ドキュメント</a>をご覧ください。",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached は分散キャッシュとして設定されています。しかし、PHPモジュール \"memcache\"が間違ってインストールされています。  \\OC\\Memcache\\Memcached は、\"memcached\" のみをサポートしています。\"memcache\" ではありません。<a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki で両方のモジュールの情報</a> について確認してください。",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "一部のファイルが整合性チェックに合格していません。この問題の解決方法の詳細については、<a target=\"_blank\" href=\"{docLink}\">ドキュメント</a>をご覧ください。 (<a href=\"{codeIntegrityDownloadEndpoint}\">無効なファイルのリスト... </a> / <a href=\"{rescanEndpoint}\">再スキャン... </a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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}\" rel=\"noreferrer\">セキュリティTips</a>を参照して、HSTS を有効にすることをおすすめします。",
-    "An error occured. Please try again" : "エラーが発生しました。再度試行してください。",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "次の形式で指定して他のownCloudのユーザーと、共有",
-    "not assignable" : "割り当て不可",
-    "Updating {productName} to version {version}, this may take a while." : "{productName} をバージョン{version} に更新するには、しばらく時間がかかることがあります。",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを正しく設定する方法については、<a href=\"%s\" target=\"_blank\">ドキュメント</a>をご覧ください。",
-    "An internal error occured." : "内部エラーが発生しました"
+    "An error occured while verifying the token" : "トークンの整合性チェックでエラーが発生"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index b6655225a27..11ec45f71a9 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -51,12 +51,15 @@ OC.L10N.register(
     "Problem loading page, reloading in 5 seconds" : "페이지 로딩에 문제가 있습니다. 5초 후 다시로드 하십시오.",
     "Saving..." : "저장 중...",
     "Dismiss" : "닫기",
+    "This action requires you to confirm your password" : "이 작업을 수행하려면 암호를 입력해야 합니다",
+    "Authentication required" : "인증 필요",
     "Password" : "암호",
     "Cancel" : "취소",
+    "Confirm" : "확인",
+    "Failed to authenticate, try again" : "인증할 수 없습니다. 다시 시도하십시오.",
     "seconds ago" : "초 지남",
     "Logging in …" : "로그인 ...",
     "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." : "암호 재설정 링크를 포함하고 있는 이메일을 보냈습니다. 이메일이 도착하지 않은 경우 스팸함을 확인해 보십시오.<br>스팸함에도 없는 경우 로컬 관리자에게 문의하십시오.",
-    "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?" : "파일이 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다.<br />무엇을 해야 할 지 잘 모르겠으면 계속하기 전에 관리자에게 연락하십시오.<br />그래도 계속 진행하시겠습니까?",
     "I know what I'm doing" : "지금 하려는 것을 알고 있습니다",
     "Password can not be changed. Please contact your administrator." : "암호를 변경할 수 없습니다. 관리자에게 문의하십시오.",
     "No" : "아니요",
@@ -84,6 +87,12 @@ 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 서비스가 올바르게 작동하지 않아서 웹 서버에서 파일 동기화를 사용할 수 없습니다.",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "웹 서버가 \"{url}\"을 처리할 수 있도록 구성되어있지 않습니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">설명서</a>를 참고하십시오.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "서버에서 인터넷 연결을 사용할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 기능을 사용할 수 없습니다. 원격에서 파일에 접근하거나, 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "메모리 캐시가 구성되지 않았습니다. 가능한 경우 memcache를 구성하여 성능을 향상시킬 수 있습니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP가 안전한 난수 발생기(/dev/urandom)를 사용할 수 없어 보안에 취약합니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">사용 설명서</a>를 참고하십시오.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "역방향 프록시 헤더 설정이 올바르지 않거나 Trusted Proxy를 통해 ownCloud에 접근하고 있을 수 있습니다. 만약 ownCloud를 Trusted Proxy를 통해 접근하고 있지 않다면 이는 보안 문제이며 공격자가 IP 주소를 속이고 있을 수 있습니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">사용 설명서</a>를 참고하십시오.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached가 분산 캐시로 구성되어 있지만 잘못된 PHP 모듈 \"memcache\"가 설치되어 있습니다. \\OC\\Memcache\\Memcached는 \"memcache\"가 아닌 \"memcached\"만 지원합니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">이 두 모듈에 대한 memcached 위키</a>를 참고하십시오.",
     "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "일부 파일에 대한 무결성 검사를 통과하지 않았습니다. 이 문제를 해결하는 방법에 대한 자세한 내용은 우리의 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">문서</a>에서 찾을 수 있습니다. (<a href=\"{codeIntegrityDownloadEndpoint}\">잘못된 파일 목록...</a> / <a href=\"{rescanEndpoint}\">재검색...</a>)",
     "Error occurred while checking server setup" : "서버 설정을 확인하는 중 오류 발생",
     "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 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 직접 접근할 수 없도록 하거나, 데이터 디렉터리를 웹 서버 문서 경로 바깥에 두십시오.",
@@ -110,6 +119,7 @@ OC.L10N.register(
     "Link" : "링크",
     "Password protect" : "암호 보호",
     "Allow upload and editing" : "업로드 및 편집 허용",
+    "Allow editing" : "편집 허용",
     "Email link to person" : "이메일 주소",
     "Send" : "전송",
     "Shared with you and the group {group} by {owner}" : "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
@@ -150,10 +160,12 @@ OC.L10N.register(
     "Hello {name}" : "{name} 님 안녕하세요",
     "new" : "새로운 항목",
     "_download %n file_::_download %n files_" : ["파일 %n개 다운로드"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "업데이트 중입니다. 일부 환경에서 이 페이지를 닫을 경우 작업이 중단될 수 있습니다.",
     "Update to {version}" : "{version}(으)로 업데이트",
     "An error occurred." : "오류가 발생했습니다.",
     "Please reload the page." : "페이지를 새로 고치십시오.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "업데이트에 실패했습니다. 더 많은 정보를 보려면 이 문제를 다루은 <a href=\"{url}\">포럼 글</a>을 참조하십시오.",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "업데이트가 실패했습니다. 이 문제를 <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud 커뮤니티</a>에 보고하여 주십시오.",
     "Continue to Nextcloud" : "Nextcloud 계속",
     "The update was successful. Redirecting you to Nextcloud now." : "업데이트가 성공했습니다. 지금 Nextcloud로 리디렉션합니다.",
     "Searching other places" : "다른 장소 찾는 중",
@@ -209,8 +221,10 @@ OC.L10N.register(
     "Need help?" : "도움이 필요한가요?",
     "See the documentation" : "문서 보기",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "이 프로그램이 올바르게 작동하려면 JavaScript가 필요합니다. {linkstart}JavaScript를 활성화{linkend}한 다음 페이지를 새로 고치십시오.",
-    "Log out" : "로그아웃",
     "Search" : "검색",
+    "Log out" : "로그아웃",
+    "This action requires you to confirm your password:" : "이 작업을 수행하려면 암호를 입력해야 합니다:",
+    "Confirm your password" : "암호를 입력하십시오",
     "Server side authentication failed!" : "서버 인증 실패!",
     "Please contact your administrator." : "관리자에게 문의하십시오.",
     "An internal error occurred." : "내부 오류가 발생했습니다.",
@@ -234,6 +248,7 @@ OC.L10N.register(
     "Enhanced security is enabled for your account. Please authenticate using a second factor." : "강화 된 보안 계정을 사용할 수 있습니다. 두 번째 인자를 사용하여 인증하시기 바랍니다.",
     "Cancel log in" : "로그인 취소",
     "Use backup code" : "백업 코드 사용",
+    "Error while validating your second factor" : "이중 인증을 검증하는 중 오류가 발생했습니다.",
     "You are accessing the server from an untrusted domain." : "신뢰할 수 없는 도메인으로 서버에 접근하고 있습니다.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "시스템 관리자에게 연락하십시오. 만약 이 인스턴스의 관리자라면 config/config.php에서 \"trusted_domains\" 설정을 편집하십시오. 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." : "설정에 따라서 관리자 권한으로 아래 단추를 눌러서 이 도메인을 신뢰하도록 설정할 수 있습니다.",
@@ -305,8 +320,9 @@ OC.L10N.register(
     "Oct." : "10월",
     "Nov." : "11월",
     "Dec." : "12월",
+    "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?" : "파일이 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다.<br />무엇을 해야 할 지 잘 모르겠으면 계속하기 전에 관리자에게 연락하십시오.<br />그래도 계속 진행하시겠습니까?",
     "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." : "서버에서 인터넷 연결을 사용할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 기능을 사용할 수 없습니다. 원격에서 파일에 접근하거나, 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.",
-    "Allow editing" : "편집 허용",
+    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "역방향 프록시 헤더 설정이 올바르지 않거나 Trusted Proxy를 통해 ownCloud에 접근하고 있을 수 있습니다. 만약 ownCloud를 Trusted Proxy를 통해 접근하고 있지 않다면 이는 보안 문제이며 공격자가 IP 주소를 속이고 있을 수 있습니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">사용 설명서</a>를 참고하십시오.",
     "Hide file listing" : "숨김 파일 목록",
     "Sending ..." : "전송 중...",
     "Email sent" : "이메일 발송됨",
@@ -323,7 +339,7 @@ OC.L10N.register(
     "Share with users or remote users…" : "원격 사용자에 대한 사용자와 공유 ...",
     "Warning" : "경고",
     "Error while sending notification" : "알림을 보내는 중 오류 발생",
-    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "업그레이드 중입니다. 이 페이지를 열어 두면 일부 환경에서 진행 과정을 중단시킬 수 있습니다.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "업그레이드 중입니다. 일부 환경에서 이 페이지를 닫을 경우 작업이 중단될 수 있습니다.",
     "Updating to {version}" : "{version}(으)로 업데이트 중",
     "The update was successful. There were warnings." : "업데이트가 성공했습니다. 일부 경고가 있습니다.",
     "No search results in other folders" : "다른 폴더에 검색 결과 없음",
@@ -331,14 +347,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "강화된 보안 계정을 사용할 수 있습니다. 두 번째 인자를 사용하여 인증하시기 바랍니다.",
     "Cancel login" : "로그인 취소",
     "Please authenticate using the selected factor." : "선택한 요소를 사용하여 인증하시기 바랍니다.",
-    "An error occured while verifying the token" : "토큰을 확인하는 중 오류 발생",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "일부 파일에 대한 무결성 검사를 통과하지 않았습니다. 이 문제를 해결하는 방법에 대한 자세한 내용은 우리의 <a target=\"_blank\" href=\"{docLink}\">문서</a>에서 찾을 수 있습니다. (<a href=\"{codeIntegrityDownloadEndpoint}\">잘못된 파일 목록...</a> / <a href=\"{rescanEndpoint}\">재검색...</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"엄격한 - 전송 보안\" HTTP 헤더에 적어도 \"{seconds}\"초로 설정되어 있지 않습니다. <a href=\"{docUrl}\">보안 팁</a>에 언급 된 바와 같이 보안을 강화하기 위해, HSTS를 사용하는 것이 좋습니다.",
-    "An error occured. Please try again" : "오류가 발생했습니다. 다시 시도하십시오.",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/nextcloud 형식으로 다른 nextcloud 사용자와 공유할 수 있습니다",
-    "not assignable" : "할당할 수 없음",
-    "Updating {productName} to version {version}, this may take a while." : "{productName} 버전 {version}(으)로 업데이트 중 입니다. 시간이 다소 걸릴 수 있습니다.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "서버를 올바르게 구성하는 방법에 대한 자세한 내용은 <a href=\"%s\" target=\"_blank\">설명서</a>를 참조하시기 바랍니다.",
-    "An internal error occured." : "내부 오류가 발생했습니다."
+    "An error occured while verifying the token" : "토큰을 확인하는 중 오류 발생"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index 77d9df02ca3..c36e174afb3 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -49,12 +49,15 @@
     "Problem loading page, reloading in 5 seconds" : "페이지 로딩에 문제가 있습니다. 5초 후 다시로드 하십시오.",
     "Saving..." : "저장 중...",
     "Dismiss" : "닫기",
+    "This action requires you to confirm your password" : "이 작업을 수행하려면 암호를 입력해야 합니다",
+    "Authentication required" : "인증 필요",
     "Password" : "암호",
     "Cancel" : "취소",
+    "Confirm" : "확인",
+    "Failed to authenticate, try again" : "인증할 수 없습니다. 다시 시도하십시오.",
     "seconds ago" : "초 지남",
     "Logging in …" : "로그인 ...",
     "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." : "암호 재설정 링크를 포함하고 있는 이메일을 보냈습니다. 이메일이 도착하지 않은 경우 스팸함을 확인해 보십시오.<br>스팸함에도 없는 경우 로컬 관리자에게 문의하십시오.",
-    "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?" : "파일이 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다.<br />무엇을 해야 할 지 잘 모르겠으면 계속하기 전에 관리자에게 연락하십시오.<br />그래도 계속 진행하시겠습니까?",
     "I know what I'm doing" : "지금 하려는 것을 알고 있습니다",
     "Password can not be changed. Please contact your administrator." : "암호를 변경할 수 없습니다. 관리자에게 문의하십시오.",
     "No" : "아니요",
@@ -82,6 +85,12 @@
     "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 set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "웹 서버가 \"{url}\"을 처리할 수 있도록 구성되어있지 않습니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">설명서</a>를 참고하십시오.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "서버에서 인터넷 연결을 사용할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 기능을 사용할 수 없습니다. 원격에서 파일에 접근하거나, 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "메모리 캐시가 구성되지 않았습니다. 가능한 경우 memcache를 구성하여 성능을 향상시킬 수 있습니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP가 안전한 난수 발생기(/dev/urandom)를 사용할 수 없어 보안에 취약합니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">사용 설명서</a>를 참고하십시오.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "역방향 프록시 헤더 설정이 올바르지 않거나 Trusted Proxy를 통해 ownCloud에 접근하고 있을 수 있습니다. 만약 ownCloud를 Trusted Proxy를 통해 접근하고 있지 않다면 이는 보안 문제이며 공격자가 IP 주소를 속이고 있을 수 있습니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">사용 설명서</a>를 참고하십시오.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached가 분산 캐시로 구성되어 있지만 잘못된 PHP 모듈 \"memcache\"가 설치되어 있습니다. \\OC\\Memcache\\Memcached는 \"memcache\"가 아닌 \"memcached\"만 지원합니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">이 두 모듈에 대한 memcached 위키</a>를 참고하십시오.",
     "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "일부 파일에 대한 무결성 검사를 통과하지 않았습니다. 이 문제를 해결하는 방법에 대한 자세한 내용은 우리의 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">문서</a>에서 찾을 수 있습니다. (<a href=\"{codeIntegrityDownloadEndpoint}\">잘못된 파일 목록...</a> / <a href=\"{rescanEndpoint}\">재검색...</a>)",
     "Error occurred while checking server setup" : "서버 설정을 확인하는 중 오류 발생",
     "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 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 직접 접근할 수 없도록 하거나, 데이터 디렉터리를 웹 서버 문서 경로 바깥에 두십시오.",
@@ -108,6 +117,7 @@
     "Link" : "링크",
     "Password protect" : "암호 보호",
     "Allow upload and editing" : "업로드 및 편집 허용",
+    "Allow editing" : "편집 허용",
     "Email link to person" : "이메일 주소",
     "Send" : "전송",
     "Shared with you and the group {group} by {owner}" : "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
@@ -148,10 +158,12 @@
     "Hello {name}" : "{name} 님 안녕하세요",
     "new" : "새로운 항목",
     "_download %n file_::_download %n files_" : ["파일 %n개 다운로드"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "업데이트 중입니다. 일부 환경에서 이 페이지를 닫을 경우 작업이 중단될 수 있습니다.",
     "Update to {version}" : "{version}(으)로 업데이트",
     "An error occurred." : "오류가 발생했습니다.",
     "Please reload the page." : "페이지를 새로 고치십시오.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "업데이트에 실패했습니다. 더 많은 정보를 보려면 이 문제를 다루은 <a href=\"{url}\">포럼 글</a>을 참조하십시오.",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "업데이트가 실패했습니다. 이 문제를 <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud 커뮤니티</a>에 보고하여 주십시오.",
     "Continue to Nextcloud" : "Nextcloud 계속",
     "The update was successful. Redirecting you to Nextcloud now." : "업데이트가 성공했습니다. 지금 Nextcloud로 리디렉션합니다.",
     "Searching other places" : "다른 장소 찾는 중",
@@ -207,8 +219,10 @@
     "Need help?" : "도움이 필요한가요?",
     "See the documentation" : "문서 보기",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "이 프로그램이 올바르게 작동하려면 JavaScript가 필요합니다. {linkstart}JavaScript를 활성화{linkend}한 다음 페이지를 새로 고치십시오.",
-    "Log out" : "로그아웃",
     "Search" : "검색",
+    "Log out" : "로그아웃",
+    "This action requires you to confirm your password:" : "이 작업을 수행하려면 암호를 입력해야 합니다:",
+    "Confirm your password" : "암호를 입력하십시오",
     "Server side authentication failed!" : "서버 인증 실패!",
     "Please contact your administrator." : "관리자에게 문의하십시오.",
     "An internal error occurred." : "내부 오류가 발생했습니다.",
@@ -232,6 +246,7 @@
     "Enhanced security is enabled for your account. Please authenticate using a second factor." : "강화 된 보안 계정을 사용할 수 있습니다. 두 번째 인자를 사용하여 인증하시기 바랍니다.",
     "Cancel log in" : "로그인 취소",
     "Use backup code" : "백업 코드 사용",
+    "Error while validating your second factor" : "이중 인증을 검증하는 중 오류가 발생했습니다.",
     "You are accessing the server from an untrusted domain." : "신뢰할 수 없는 도메인으로 서버에 접근하고 있습니다.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "시스템 관리자에게 연락하십시오. 만약 이 인스턴스의 관리자라면 config/config.php에서 \"trusted_domains\" 설정을 편집하십시오. 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." : "설정에 따라서 관리자 권한으로 아래 단추를 눌러서 이 도메인을 신뢰하도록 설정할 수 있습니다.",
@@ -303,8 +318,9 @@
     "Oct." : "10월",
     "Nov." : "11월",
     "Dec." : "12월",
+    "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?" : "파일이 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다.<br />무엇을 해야 할 지 잘 모르겠으면 계속하기 전에 관리자에게 연락하십시오.<br />그래도 계속 진행하시겠습니까?",
     "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." : "서버에서 인터넷 연결을 사용할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 기능을 사용할 수 없습니다. 원격에서 파일에 접근하거나, 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.",
-    "Allow editing" : "편집 허용",
+    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "역방향 프록시 헤더 설정이 올바르지 않거나 Trusted Proxy를 통해 ownCloud에 접근하고 있을 수 있습니다. 만약 ownCloud를 Trusted Proxy를 통해 접근하고 있지 않다면 이는 보안 문제이며 공격자가 IP 주소를 속이고 있을 수 있습니다. 자세한 내용은 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">사용 설명서</a>를 참고하십시오.",
     "Hide file listing" : "숨김 파일 목록",
     "Sending ..." : "전송 중...",
     "Email sent" : "이메일 발송됨",
@@ -321,7 +337,7 @@
     "Share with users or remote users…" : "원격 사용자에 대한 사용자와 공유 ...",
     "Warning" : "경고",
     "Error while sending notification" : "알림을 보내는 중 오류 발생",
-    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "업그레이드 중입니다. 이 페이지를 열어 두면 일부 환경에서 진행 과정을 중단시킬 수 있습니다.",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "업그레이드 중입니다. 일부 환경에서 이 페이지를 닫을 경우 작업이 중단될 수 있습니다.",
     "Updating to {version}" : "{version}(으)로 업데이트 중",
     "The update was successful. There were warnings." : "업데이트가 성공했습니다. 일부 경고가 있습니다.",
     "No search results in other folders" : "다른 폴더에 검색 결과 없음",
@@ -329,14 +345,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "강화된 보안 계정을 사용할 수 있습니다. 두 번째 인자를 사용하여 인증하시기 바랍니다.",
     "Cancel login" : "로그인 취소",
     "Please authenticate using the selected factor." : "선택한 요소를 사용하여 인증하시기 바랍니다.",
-    "An error occured while verifying the token" : "토큰을 확인하는 중 오류 발생",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "일부 파일에 대한 무결성 검사를 통과하지 않았습니다. 이 문제를 해결하는 방법에 대한 자세한 내용은 우리의 <a target=\"_blank\" href=\"{docLink}\">문서</a>에서 찾을 수 있습니다. (<a href=\"{codeIntegrityDownloadEndpoint}\">잘못된 파일 목록...</a> / <a href=\"{rescanEndpoint}\">재검색...</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"엄격한 - 전송 보안\" HTTP 헤더에 적어도 \"{seconds}\"초로 설정되어 있지 않습니다. <a href=\"{docUrl}\">보안 팁</a>에 언급 된 바와 같이 보안을 강화하기 위해, HSTS를 사용하는 것이 좋습니다.",
-    "An error occured. Please try again" : "오류가 발생했습니다. 다시 시도하십시오.",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "username@example.com/nextcloud 형식으로 다른 nextcloud 사용자와 공유할 수 있습니다",
-    "not assignable" : "할당할 수 없음",
-    "Updating {productName} to version {version}, this may take a while." : "{productName} 버전 {version}(으)로 업데이트 중 입니다. 시간이 다소 걸릴 수 있습니다.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "서버를 올바르게 구성하는 방법에 대한 자세한 내용은 <a href=\"%s\" target=\"_blank\">설명서</a>를 참조하시기 바랍니다.",
-    "An internal error occured." : "내부 오류가 발생했습니다."
+    "An error occured while verifying the token" : "토큰을 확인하는 중 오류 발생"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
new file mode 100644
index 00000000000..4f8b57c08b3
--- /dev/null
+++ b/core/l10n/lv.js
@@ -0,0 +1,303 @@
+OC.L10N.register(
+    "core",
+    {
+    "Please select a file." : "Lūdzu izvēlies failu.",
+    "File is too big" : "Datne ir par lielu",
+    "The selected file is not an image." : "Atlasītais fails nav attēls.",
+    "The selected file cannot be read." : "Atlasīto failu nevar nolasīt.",
+    "Invalid file provided" : "Norādīta nederīga datne",
+    "No image or file provided" : "Nav norādīts attēls vai datne",
+    "Unknown filetype" : "Nezināms datnes tips",
+    "Invalid image" : "Nederīgs attēls",
+    "An error occurred. Please contact your admin." : "Notika kļūda. Lūdzu sazinies ar savu administratoru.",
+    "No temporary profile picture available, try again" : "Profila pagaidu attēls nav pieejams, mēģini vēlreiz",
+    "No crop data provided" : "Nav norādīti apgriešanas dati",
+    "No valid crop data provided" : "Nav norādīti derīgi apgriešanas dati",
+    "Crop is not square" : "Griezums nav kvadrāts",
+    "Couldn't reset password because the token is invalid" : "Nevarēja nomainīt paroli, jo pazīšanās zīme ir nederīga",
+    "Couldn't reset password because the token is expired" : "Nevarēja nomainīt paroli, jo pazīšanās zīmei beidzies derīguma termiņš",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nevarēja nosūtīt paroles maiņas e-pastu. Pārliecinies, ka tavs lietotājvārds ir pareizs.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Nevarēja nosūtīt paroles maiņas e-pastu, jo lietotājam nav norādīts e-pasts. Lūdzu sazinies ar savu administratoru.",
+    "%s password reset" : "%s paroles maiņa",
+    "Couldn't send reset email. Please contact your administrator." : "Nevarēja nosūtīt maiņas e-pastu. Lūdzu sazinies ar savu administratoru.",
+    "Preparing update" : "Sagatavo atjauninājumu",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "Labošanas brīdinājums:",
+    "Repair error: " : "Labošanas  kļūda:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Lūdzu izmanto komandrindas atjaunināšanu, jo automātiskā atjaunināšana ir atspējota konfigurācijas datnē config.php.",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Pārbauda tabulu %s",
+    "Turned on maintenance mode" : "Ieslēgts uzturēšanas režīms",
+    "Turned off maintenance mode" : "Izslēgts uzturēšanas režīms",
+    "Maintenance mode is kept active" : "Uzturēšanas režīms ir paturēts aktīvs",
+    "Updating database schema" : "Atjaunina datu bāzes shēmu",
+    "Updated database" : "Atjaunināta datu bāze",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Pārbauda vai datu bāzes shēma var būt atjaunināma (tas var prasīt laiku atkarībā no datu bāzes izmēriem)",
+    "Checked database schema update" : "Pārbaudīts datu bāzes shēmas atjauninājums",
+    "Checking updates of apps" : "Pārbauda programmu atjauninājumus",
+    "Updated \"%s\" to %s" : "Atjaunināts \"%s\" uz %s",
+    "Starting code integrity check" : "Uzsākta koda integritātes pārbaude",
+    "Finished code integrity check" : "Pabeigta  koda integritātes pārbaude",
+    "%s (3rdparty)" : "%s (citu izstrādātāju)",
+    "%s (incompatible)" : "%s (nesaderīgs)",
+    "Following apps have been disabled: %s" : "Sekojošas programmas tika atslēgtas: %s",
+    "Already up to date" : "Jau ir jaunākā",
+    "Settings" : "Iestatījumi",
+    "Connection to server lost" : "Zaudēts savienojums ar serveri",
+    "Problem loading page, reloading in 5 seconds" : "Problēma ielādējot lapu, pārlādēšana pēc 5 sekundēm",
+    "Saving..." : "Saglabā...",
+    "Dismiss" : "Atmest",
+    "Authentication required" : "Nepieciešama autentifikācija",
+    "Password" : "Parole",
+    "Cancel" : "Atcelt",
+    "Confirm" : "Apstiprināt",
+    "Failed to authenticate, try again" : "Neizdevās autentificēt, mēģiniet vēlreiz",
+    "seconds ago" : "sekundes atpakaļ",
+    "Logging in …" : "Notiek pieteikšanās …",
+    "I know what I'm doing" : "Es zinu ko es daru",
+    "Password can not be changed. Please contact your administrator." : "Paroli, nevar nomainīt. Lūdzu kontaktēties ar savu administratoru.",
+    "No" : "Nē",
+    "Yes" : "Jā",
+    "No files in here" : "Šeit nav datņu",
+    "Choose" : "Izvēlieties",
+    "Error loading file picker template: {error}" : "Kļūda ielādējot izvēlēto veidni: {error}",
+    "Ok" : "Labi",
+    "Error loading message template: {error}" : "Kļūda ielādējot ziņojuma veidni: {error}",
+    "read-only" : "tikai-skatīt",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} datnes konflikts","{count} datnes konflikts","{count} datņu konflikti"],
+    "One file conflict" : "Vienas datnes konflikts",
+    "New Files" : "Jaunas datnes",
+    "Already existing files" : "Jau esošas datnes",
+    "Which files do you want to keep?" : "Kuras datnes vēlies paturēt?",
+    "Continue" : "Turpināt",
+    "(all selected)" : "(visus iezīmētos)",
+    "({count} selected)" : "({count} iezīmēti)",
+    "Very weak password" : "Ļoti vāja parole",
+    "Weak password" : "Vāja parole",
+    "So-so password" : "Normāla parole",
+    "Good password" : "Laba parole",
+    "Strong password" : "Lieliska parole",
+    "Shared" : "Koplietots",
+    "Shared with {recipients}" : "Koplietots ar {recipients}",
+    "Error" : "Kļūda",
+    "Error while sharing" : "Kļūda, daloties",
+    "Error while unsharing" : "Kļūda, beidzot dalīties",
+    "Error setting expiration date" : "Kļūda, iestatot termiņa datumu",
+    "Set expiration date" : "Iestatiet termiņa datumu",
+    "Expiration" : "Termiņš",
+    "Expiration date" : "Termiņa datums",
+    "Choose a password for the public link" : "Izvēlies paroli publiskai saitei",
+    "Copied!" : "Nokopēts!",
+    "Copy" : "Kopēt",
+    "Not supported!" : "Nav atbalstīts!",
+    "Press ⌘-C to copy." : "Spiet ⌘-C lai kopētu.",
+    "Press Ctrl-C to copy." : "Spiet Ctrl-C lai kopētu.",
+    "Resharing is not allowed" : "Atkārtota dalīšanās nav atļauta",
+    "Share link" : "Koplietot saiti",
+    "Link" : "Saite",
+    "Password protect" : "Aizsargāt ar paroli",
+    "Allow upload and editing" : "Atļaut augšupielādi un rediģēšanu",
+    "Allow editing" : "Atļaut rediģēt",
+    "Email link to person" : "Sūtīt saiti personai pa e-pastu",
+    "Send" : "Sūtīt",
+    "Shared with you and the group {group} by {owner}" : "{owner} koplietoja ar jums un grupu {group}",
+    "Shared with you by {owner}" : "{owner} koplietoja ar jums",
+    "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} koplietots ar saiti",
+    "group" : "grupa",
+    "remote" : "attālināti",
+    "email" : "e-pasts",
+    "Unshare" : "Pārtraukt koplietošanu",
+    "can edit" : "var rediģēt",
+    "can create" : "var izveidot",
+    "can change" : "var mainīt",
+    "can delete" : "var dzēst",
+    "access control" : "piekļuves vadība",
+    "Could not unshare" : "Nevarēja pārtraukt koplietošanu",
+    "Share details could not be loaded for this item." : "Šim nevarēja ielādēt koplietošanas detaļas.",
+    "No users or groups found for {search}" : "Pēc  {search} netika atrasts neviens lietotājs vai grupa",
+    "No users found for {search}" : "Pēc  {search} netika atrasts neviens lietotājs",
+    "An error occurred. Please try again" : "Notika kļūda. Mēģini vēlreiz.",
+    "{sharee} (group)" : "{sharee} (grupa)",
+    "{sharee} (remote)" : "{sharee} (attālināti)",
+    "{sharee} (email)" : "{sharee} (e-pasts)",
+    "Share" : "Koplietot",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Koplietot ar personām, kas atrodas citos serveros, izmantojot Federated Cloud ID username@example.com/nextcloud",
+    "Share with users or by mail..." : "Koplietot ar lietotājiem vai izmantojot e-pastu...",
+    "Share with users or groups..." : "Koplietot ar lietotājiem vai grupām...",
+    "Share with users, groups or by mail..." : "Koplietot ar lietotājiem, grupām vai izmantojot e-pastu...",
+    "Share with users..." : "Koplietots ar lietotājiem...",
+    "Error removing share" : "Kļūda, noņemot koplietošanu",
+    "restricted" : "ierobežots",
+    "invisible" : "Neredzams",
+    "({scope})" : "({scope})",
+    "Delete" : "Dzēst",
+    "Rename" : "Pārsaukt",
+    "Collaborative tags" : "Sadarbības atzīmes",
+    "No tags found" : "Netika atrasta neviena atzīme",
+    "The object type is not specified." : "Nav norādīts objekta tips.",
+    "Enter new" : "Ievadīt jaunu",
+    "Add" : "Pievienot",
+    "Edit tags" : "Rediģēt atzīmes",
+    "unknown text" : "nezināms teksts",
+    "Hello world!" : "Sveika, pasaule!",
+    "sunny" : "saulains",
+    "Hello {name}, the weather is {weather}" : "Sveiks {name}, laiks ir {weather}",
+    "Hello {name}" : "Sveiks {name}",
+    "new" : "jauns",
+    "Update to {version}" : "Atjaunināts uz {version}",
+    "An error occurred." : "Radās kļūda.",
+    "Please reload the page." : "Lūdzu, atkārtoti ielādējiet lapu.",
+    "Continue to Nextcloud" : "Turpināt ar Nextcloud",
+    "The update was successful. Redirecting you to Nextcloud now." : "Atjaunināšana ir bijusi veiksmīga. Tagad novirzīsim jūs uz Nextcloud.",
+    "Searching other places" : "Meklēt citās vietās",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} meklēšanas rezultāti citās mapēs","{count} meklēšanas rezultāti citās mapēs","{count} meklēšanas rezultāti citās mapēs"],
+    "Personal" : "Personīgi",
+    "Users" : "Lietotāji",
+    "Apps" : "Programmas",
+    "Admin" : "Administratori",
+    "Help" : "Palīdzība",
+    "Access forbidden" : "Pieeja ir liegta",
+    "File not found" : "Fails nav atrasts",
+    "The specified document has not been found on the server." : "Norādītais dokuments nav atrasts serverī.",
+    "You can click here to return to %s." : "Jūs varat noklikšķināt šeit, lai atgrieztos uz %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Sveiki,\n\ninformējam, ka %s koplietoja ar jums %s.\nApskati to: %s\n",
+    "Cheers!" : "Priekā!",
+    "Internal Server Error" : "Iekšēja servera kļūda",
+    "The server encountered an internal error and was unable to complete your request." : "Serverī radās iekšēja kļūda, un tas nevarēja pabeigt jūsu pieprasījumu.",
+    "More details can be found in the server log." : "Sīkāka informācija atrodama servera žurnāl failā.",
+    "Technical details" : "Tehniskās detaļas",
+    "Remote Address: %s" : "Attālinātā adrese: %s",
+    "Request ID: %s" : "Pieprasījuma ID: %s",
+    "Type: %s" : "Tips: %s",
+    "Code: %s" : "Kods: %s",
+    "Message: %s" : "Ziņojums: %s",
+    "File: %s" : "Fails: %s",
+    "Line: %s" : "Līnija: %s",
+    "Trace" : "Izsekot",
+    "Security warning" : "Drošības brīdinājums",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
+    "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
+    "Username" : "Lietotājvārds",
+    "Storage & database" : "Krātuve & datubāze",
+    "Data folder" : "Datu mape",
+    "Configure the database" : "Konfigurēt datubāzi",
+    "Only %s is available." : "Tikai %s ir pieejams.",
+    "Database user" : "Datubāzes lietotājs",
+    "Database password" : "Datubāzes parole",
+    "Database name" : "Datubāzes nosaukums",
+    "Database tablespace" : "Datubāzes tabulas telpa",
+    "Database host" : "Datubāzes serveris",
+    "Performance warning" : "Veiktspējas brīdinājums",
+    "SQLite will be used as database." : "SQLite tiks izmantota kā datu bāze.",
+    "Finish setup" : "Pabeigt iestatīšanu",
+    "Finishing …" : "Pabeidz ...",
+    "Need help?" : "Vajadzīga palīdzība?",
+    "See the documentation" : "Skatiet dokumentāciju",
+    "Search" : "Meklēt",
+    "Log out" : "Izrakstīties",
+    "This action requires you to confirm your password:" : "Šī darbība ir nepieciešama, lai apstiprinātu jūsu paroli:",
+    "Confirm your password" : "Apstipriniet paroli",
+    "Server side authentication failed!" : "Servera autentifikācija neizdevās!",
+    "Please contact your administrator." : "Lūdzu, sazinieties ar administratoru.",
+    "An internal error occurred." : "Radās iekšēja kļūda.",
+    "Please try again or contact your administrator." : "Lūdzu, mēģiniet vēlreiz vai sazinieties ar administratoru.",
+    "Username or email" : "Lietotājvārds vai e-pasts",
+    "Wrong password. Reset it?" : "Nepareiza parole. Nodzēst to?",
+    "Wrong password." : "Nepareiza parole.",
+    "Log in" : "Ierakstīties",
+    "Stay logged in" : "Palikt ierakstītam",
+    "Alternative Logins" : "Alternatīvās pieteikšanās",
+    "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
+    "New password" : "Jauna parole",
+    "New Password" : "Jauna parole",
+    "Reset password" : "Mainīt paroli",
+    "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>" : "Sveiki,<br><br>informējam, ka %s koplietoja ar jums <strong>%s</strong>.<br><a href=\"%s\">Apskati to!</a><br><br>",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Sazinieties ar sistēmas administratoru, ja šis ziņojums tiek rādīts.. vai parādījās negaidīti",
+    "Thank you for your patience." : "Paldies par jūsu pacietību.",
+    "Two-factor authentication" : "Divpakāpju autentifikācija",
+    "Cancel log in" : "Atcelt pierakstīšanos",
+    "Use backup code" : "Izmantojiet dublēšanas kodu",
+    "You are accessing the server from an untrusted domain." : "Jums ir piekļuve serverim no neuzticama domēna.",
+    "Add \"%s\" as trusted domain" : "Pievienot \"%s\" kā uzticamu domēnu",
+    "App update required" : "Programmai nepieciešama atjaunināšana",
+    "%s will be updated to version %s" : "%s tiks atjaunināts uz versiju %s",
+    "These apps will be updated:" : "Šīs programmas tiks atjauninātas:",
+    "The theme %s has been disabled." : "Tēma %s ir atspējota.",
+    "Start update" : "Sākt atjaunināšanu",
+    "Detailed logs" : "Detalizētas informācijas žurnālfaili",
+    "Update needed" : "Nepieciešama atjaunināšana",
+    "Please use the command line updater because you have a big instance." : "Lūdzu, izmantojiet komandrindas atjauninātāju, jo jums ir liels datu apjoms.",
+    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Lai saņemtu palīdzību, skatiet  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentāciju</a>.",
+    "This %s instance is currently in maintenance mode, which may take a while." : "Šis %s serveris pašlaik darbojas uzturēšanas režīmā, tas var ilgt kādu laiku.",
+    "Error tagging" : "Kļūda atzīmējot",
+    "Error untagging" : "Kļūda noņemot atzīmi",
+    "Couldn't send mail to following users: %s " : "Nevarēja nosūtīt e-pastu sekojošiem lietotājiem: %s",
+    "Sunday" : "Svētdiena",
+    "Monday" : "Pirmdiena",
+    "Tuesday" : "Otrdiena",
+    "Wednesday" : "Trešdiena",
+    "Thursday" : "Ceturtdiena",
+    "Friday" : "Piektdiena",
+    "Saturday" : "Sestdiena",
+    "Sun." : "Sv.",
+    "Mon." : "Pr.",
+    "Tue." : "Ot.",
+    "Wed." : "Tr.",
+    "Thu." : "Ce.",
+    "Fri." : "Pk.",
+    "Sat." : "Se.",
+    "Su" : "Sv",
+    "Mo" : "Pr",
+    "Tu" : "Ot",
+    "We" : "Tr",
+    "Th" : "Ce",
+    "Fr" : "Pi",
+    "Sa" : "Se",
+    "January" : "Janvāris",
+    "February" : "Februāris",
+    "March" : "Marts",
+    "April" : "Aprīlis",
+    "May" : "Maijs",
+    "June" : "Jūnijs",
+    "July" : "Jūlijs",
+    "August" : "Augusts",
+    "September" : "Septembris",
+    "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.",
+    "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." : "Šim serverim nav interneta savienojuma. Tas nozīmē, ka daži līdzekļi, piemēram, ārējo atmiņas montāžas vai trešās puses lietojumprogrammu paziņojumi par atjauninājumiem nedarbosies. Attāli piekļūt failiem un nosūtīt paziņojumu uz e-pastu, iespējams nedarbosies. Mēs ierosinām, izveidot interneta savienojumu ar šo serveri, ja vēlaties, lai visas funkcijas darbotos.",
+    "Hide file listing" : "Paslēpt datņu sarakstu",
+    "Sending ..." : "Sūta...",
+    "Email sent" : "Vēstule nosūtīta",
+    "Send link via email" : "Sūtīt saiti e-pastā",
+    "notify by email" : "ziņot e-pastā",
+    "can share" : "Var koplietot",
+    "create" : "izveidot",
+    "change" : "mainīt",
+    "delete" : "dzēst",
+    "{sharee} (at {server})" : "{sharee} ({server})",
+    "Share with users…" : "Koplietots ar lietotājiem...",
+    "Share with users or groups…" : "Koplietot ar lietotājiem vai grupām ...",
+    "Warning" : "Brīdinājums",
+    "Error while sending notification" : "Kļūda, nosūtot paziņojumu",
+    "Updating to {version}" : "Jaunināt uz {version}",
+    "The update was successful. There were warnings." : "Atjaunināšana ir bijusi veiksmīga. Bija brīdinājumi.",
+    "No search results in other folders" : "Nav nekas atrasts citā mapēs",
+    "Two-step verification" : "Divpakāpju verifikācija",
+    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Uzlabota drošība ir iespējota jūsu kontam. Lūdzu autentificējies izmantojot otru faktoru.",
+    "Cancel login" : "Atcelt pieteikšanos",
+    "Please authenticate using the selected factor." : "Lūdzu autentifikācija, izmantojot atlasīto faktoru.",
+    "An error occured while verifying the token" : "Radusies kļūda, pārbaudot pilnvaru"
+},
+"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
new file mode 100644
index 00000000000..2e1cd5877cf
--- /dev/null
+++ b/core/l10n/lv.json
@@ -0,0 +1,301 @@
+{ "translations": {
+    "Please select a file." : "Lūdzu izvēlies failu.",
+    "File is too big" : "Datne ir par lielu",
+    "The selected file is not an image." : "Atlasītais fails nav attēls.",
+    "The selected file cannot be read." : "Atlasīto failu nevar nolasīt.",
+    "Invalid file provided" : "Norādīta nederīga datne",
+    "No image or file provided" : "Nav norādīts attēls vai datne",
+    "Unknown filetype" : "Nezināms datnes tips",
+    "Invalid image" : "Nederīgs attēls",
+    "An error occurred. Please contact your admin." : "Notika kļūda. Lūdzu sazinies ar savu administratoru.",
+    "No temporary profile picture available, try again" : "Profila pagaidu attēls nav pieejams, mēģini vēlreiz",
+    "No crop data provided" : "Nav norādīti apgriešanas dati",
+    "No valid crop data provided" : "Nav norādīti derīgi apgriešanas dati",
+    "Crop is not square" : "Griezums nav kvadrāts",
+    "Couldn't reset password because the token is invalid" : "Nevarēja nomainīt paroli, jo pazīšanās zīme ir nederīga",
+    "Couldn't reset password because the token is expired" : "Nevarēja nomainīt paroli, jo pazīšanās zīmei beidzies derīguma termiņš",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nevarēja nosūtīt paroles maiņas e-pastu. Pārliecinies, ka tavs lietotājvārds ir pareizs.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Nevarēja nosūtīt paroles maiņas e-pastu, jo lietotājam nav norādīts e-pasts. Lūdzu sazinies ar savu administratoru.",
+    "%s password reset" : "%s paroles maiņa",
+    "Couldn't send reset email. Please contact your administrator." : "Nevarēja nosūtīt maiņas e-pastu. Lūdzu sazinies ar savu administratoru.",
+    "Preparing update" : "Sagatavo atjauninājumu",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "Labošanas brīdinājums:",
+    "Repair error: " : "Labošanas  kļūda:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Lūdzu izmanto komandrindas atjaunināšanu, jo automātiskā atjaunināšana ir atspējota konfigurācijas datnē config.php.",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Pārbauda tabulu %s",
+    "Turned on maintenance mode" : "Ieslēgts uzturēšanas režīms",
+    "Turned off maintenance mode" : "Izslēgts uzturēšanas režīms",
+    "Maintenance mode is kept active" : "Uzturēšanas režīms ir paturēts aktīvs",
+    "Updating database schema" : "Atjaunina datu bāzes shēmu",
+    "Updated database" : "Atjaunināta datu bāze",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Pārbauda vai datu bāzes shēma var būt atjaunināma (tas var prasīt laiku atkarībā no datu bāzes izmēriem)",
+    "Checked database schema update" : "Pārbaudīts datu bāzes shēmas atjauninājums",
+    "Checking updates of apps" : "Pārbauda programmu atjauninājumus",
+    "Updated \"%s\" to %s" : "Atjaunināts \"%s\" uz %s",
+    "Starting code integrity check" : "Uzsākta koda integritātes pārbaude",
+    "Finished code integrity check" : "Pabeigta  koda integritātes pārbaude",
+    "%s (3rdparty)" : "%s (citu izstrādātāju)",
+    "%s (incompatible)" : "%s (nesaderīgs)",
+    "Following apps have been disabled: %s" : "Sekojošas programmas tika atslēgtas: %s",
+    "Already up to date" : "Jau ir jaunākā",
+    "Settings" : "Iestatījumi",
+    "Connection to server lost" : "Zaudēts savienojums ar serveri",
+    "Problem loading page, reloading in 5 seconds" : "Problēma ielādējot lapu, pārlādēšana pēc 5 sekundēm",
+    "Saving..." : "Saglabā...",
+    "Dismiss" : "Atmest",
+    "Authentication required" : "Nepieciešama autentifikācija",
+    "Password" : "Parole",
+    "Cancel" : "Atcelt",
+    "Confirm" : "Apstiprināt",
+    "Failed to authenticate, try again" : "Neizdevās autentificēt, mēģiniet vēlreiz",
+    "seconds ago" : "sekundes atpakaļ",
+    "Logging in …" : "Notiek pieteikšanās …",
+    "I know what I'm doing" : "Es zinu ko es daru",
+    "Password can not be changed. Please contact your administrator." : "Paroli, nevar nomainīt. Lūdzu kontaktēties ar savu administratoru.",
+    "No" : "Nē",
+    "Yes" : "Jā",
+    "No files in here" : "Šeit nav datņu",
+    "Choose" : "Izvēlieties",
+    "Error loading file picker template: {error}" : "Kļūda ielādējot izvēlēto veidni: {error}",
+    "Ok" : "Labi",
+    "Error loading message template: {error}" : "Kļūda ielādējot ziņojuma veidni: {error}",
+    "read-only" : "tikai-skatīt",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} datnes konflikts","{count} datnes konflikts","{count} datņu konflikti"],
+    "One file conflict" : "Vienas datnes konflikts",
+    "New Files" : "Jaunas datnes",
+    "Already existing files" : "Jau esošas datnes",
+    "Which files do you want to keep?" : "Kuras datnes vēlies paturēt?",
+    "Continue" : "Turpināt",
+    "(all selected)" : "(visus iezīmētos)",
+    "({count} selected)" : "({count} iezīmēti)",
+    "Very weak password" : "Ļoti vāja parole",
+    "Weak password" : "Vāja parole",
+    "So-so password" : "Normāla parole",
+    "Good password" : "Laba parole",
+    "Strong password" : "Lieliska parole",
+    "Shared" : "Koplietots",
+    "Shared with {recipients}" : "Koplietots ar {recipients}",
+    "Error" : "Kļūda",
+    "Error while sharing" : "Kļūda, daloties",
+    "Error while unsharing" : "Kļūda, beidzot dalīties",
+    "Error setting expiration date" : "Kļūda, iestatot termiņa datumu",
+    "Set expiration date" : "Iestatiet termiņa datumu",
+    "Expiration" : "Termiņš",
+    "Expiration date" : "Termiņa datums",
+    "Choose a password for the public link" : "Izvēlies paroli publiskai saitei",
+    "Copied!" : "Nokopēts!",
+    "Copy" : "Kopēt",
+    "Not supported!" : "Nav atbalstīts!",
+    "Press ⌘-C to copy." : "Spiet ⌘-C lai kopētu.",
+    "Press Ctrl-C to copy." : "Spiet Ctrl-C lai kopētu.",
+    "Resharing is not allowed" : "Atkārtota dalīšanās nav atļauta",
+    "Share link" : "Koplietot saiti",
+    "Link" : "Saite",
+    "Password protect" : "Aizsargāt ar paroli",
+    "Allow upload and editing" : "Atļaut augšupielādi un rediģēšanu",
+    "Allow editing" : "Atļaut rediģēt",
+    "Email link to person" : "Sūtīt saiti personai pa e-pastu",
+    "Send" : "Sūtīt",
+    "Shared with you and the group {group} by {owner}" : "{owner} koplietoja ar jums un grupu {group}",
+    "Shared with you by {owner}" : "{owner} koplietoja ar jums",
+    "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} koplietots ar saiti",
+    "group" : "grupa",
+    "remote" : "attālināti",
+    "email" : "e-pasts",
+    "Unshare" : "Pārtraukt koplietošanu",
+    "can edit" : "var rediģēt",
+    "can create" : "var izveidot",
+    "can change" : "var mainīt",
+    "can delete" : "var dzēst",
+    "access control" : "piekļuves vadība",
+    "Could not unshare" : "Nevarēja pārtraukt koplietošanu",
+    "Share details could not be loaded for this item." : "Šim nevarēja ielādēt koplietošanas detaļas.",
+    "No users or groups found for {search}" : "Pēc  {search} netika atrasts neviens lietotājs vai grupa",
+    "No users found for {search}" : "Pēc  {search} netika atrasts neviens lietotājs",
+    "An error occurred. Please try again" : "Notika kļūda. Mēģini vēlreiz.",
+    "{sharee} (group)" : "{sharee} (grupa)",
+    "{sharee} (remote)" : "{sharee} (attālināti)",
+    "{sharee} (email)" : "{sharee} (e-pasts)",
+    "Share" : "Koplietot",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Koplietot ar personām, kas atrodas citos serveros, izmantojot Federated Cloud ID username@example.com/nextcloud",
+    "Share with users or by mail..." : "Koplietot ar lietotājiem vai izmantojot e-pastu...",
+    "Share with users or groups..." : "Koplietot ar lietotājiem vai grupām...",
+    "Share with users, groups or by mail..." : "Koplietot ar lietotājiem, grupām vai izmantojot e-pastu...",
+    "Share with users..." : "Koplietots ar lietotājiem...",
+    "Error removing share" : "Kļūda, noņemot koplietošanu",
+    "restricted" : "ierobežots",
+    "invisible" : "Neredzams",
+    "({scope})" : "({scope})",
+    "Delete" : "Dzēst",
+    "Rename" : "Pārsaukt",
+    "Collaborative tags" : "Sadarbības atzīmes",
+    "No tags found" : "Netika atrasta neviena atzīme",
+    "The object type is not specified." : "Nav norādīts objekta tips.",
+    "Enter new" : "Ievadīt jaunu",
+    "Add" : "Pievienot",
+    "Edit tags" : "Rediģēt atzīmes",
+    "unknown text" : "nezināms teksts",
+    "Hello world!" : "Sveika, pasaule!",
+    "sunny" : "saulains",
+    "Hello {name}, the weather is {weather}" : "Sveiks {name}, laiks ir {weather}",
+    "Hello {name}" : "Sveiks {name}",
+    "new" : "jauns",
+    "Update to {version}" : "Atjaunināts uz {version}",
+    "An error occurred." : "Radās kļūda.",
+    "Please reload the page." : "Lūdzu, atkārtoti ielādējiet lapu.",
+    "Continue to Nextcloud" : "Turpināt ar Nextcloud",
+    "The update was successful. Redirecting you to Nextcloud now." : "Atjaunināšana ir bijusi veiksmīga. Tagad novirzīsim jūs uz Nextcloud.",
+    "Searching other places" : "Meklēt citās vietās",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} meklēšanas rezultāti citās mapēs","{count} meklēšanas rezultāti citās mapēs","{count} meklēšanas rezultāti citās mapēs"],
+    "Personal" : "Personīgi",
+    "Users" : "Lietotāji",
+    "Apps" : "Programmas",
+    "Admin" : "Administratori",
+    "Help" : "Palīdzība",
+    "Access forbidden" : "Pieeja ir liegta",
+    "File not found" : "Fails nav atrasts",
+    "The specified document has not been found on the server." : "Norādītais dokuments nav atrasts serverī.",
+    "You can click here to return to %s." : "Jūs varat noklikšķināt šeit, lai atgrieztos uz %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Sveiki,\n\ninformējam, ka %s koplietoja ar jums %s.\nApskati to: %s\n",
+    "Cheers!" : "Priekā!",
+    "Internal Server Error" : "Iekšēja servera kļūda",
+    "The server encountered an internal error and was unable to complete your request." : "Serverī radās iekšēja kļūda, un tas nevarēja pabeigt jūsu pieprasījumu.",
+    "More details can be found in the server log." : "Sīkāka informācija atrodama servera žurnāl failā.",
+    "Technical details" : "Tehniskās detaļas",
+    "Remote Address: %s" : "Attālinātā adrese: %s",
+    "Request ID: %s" : "Pieprasījuma ID: %s",
+    "Type: %s" : "Tips: %s",
+    "Code: %s" : "Kods: %s",
+    "Message: %s" : "Ziņojums: %s",
+    "File: %s" : "Fails: %s",
+    "Line: %s" : "Līnija: %s",
+    "Trace" : "Izsekot",
+    "Security warning" : "Drošības brīdinājums",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
+    "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
+    "Username" : "Lietotājvārds",
+    "Storage & database" : "Krātuve & datubāze",
+    "Data folder" : "Datu mape",
+    "Configure the database" : "Konfigurēt datubāzi",
+    "Only %s is available." : "Tikai %s ir pieejams.",
+    "Database user" : "Datubāzes lietotājs",
+    "Database password" : "Datubāzes parole",
+    "Database name" : "Datubāzes nosaukums",
+    "Database tablespace" : "Datubāzes tabulas telpa",
+    "Database host" : "Datubāzes serveris",
+    "Performance warning" : "Veiktspējas brīdinājums",
+    "SQLite will be used as database." : "SQLite tiks izmantota kā datu bāze.",
+    "Finish setup" : "Pabeigt iestatīšanu",
+    "Finishing …" : "Pabeidz ...",
+    "Need help?" : "Vajadzīga palīdzība?",
+    "See the documentation" : "Skatiet dokumentāciju",
+    "Search" : "Meklēt",
+    "Log out" : "Izrakstīties",
+    "This action requires you to confirm your password:" : "Šī darbība ir nepieciešama, lai apstiprinātu jūsu paroli:",
+    "Confirm your password" : "Apstipriniet paroli",
+    "Server side authentication failed!" : "Servera autentifikācija neizdevās!",
+    "Please contact your administrator." : "Lūdzu, sazinieties ar administratoru.",
+    "An internal error occurred." : "Radās iekšēja kļūda.",
+    "Please try again or contact your administrator." : "Lūdzu, mēģiniet vēlreiz vai sazinieties ar administratoru.",
+    "Username or email" : "Lietotājvārds vai e-pasts",
+    "Wrong password. Reset it?" : "Nepareiza parole. Nodzēst to?",
+    "Wrong password." : "Nepareiza parole.",
+    "Log in" : "Ierakstīties",
+    "Stay logged in" : "Palikt ierakstītam",
+    "Alternative Logins" : "Alternatīvās pieteikšanās",
+    "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
+    "New password" : "Jauna parole",
+    "New Password" : "Jauna parole",
+    "Reset password" : "Mainīt paroli",
+    "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>" : "Sveiki,<br><br>informējam, ka %s koplietoja ar jums <strong>%s</strong>.<br><a href=\"%s\">Apskati to!</a><br><br>",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Sazinieties ar sistēmas administratoru, ja šis ziņojums tiek rādīts.. vai parādījās negaidīti",
+    "Thank you for your patience." : "Paldies par jūsu pacietību.",
+    "Two-factor authentication" : "Divpakāpju autentifikācija",
+    "Cancel log in" : "Atcelt pierakstīšanos",
+    "Use backup code" : "Izmantojiet dublēšanas kodu",
+    "You are accessing the server from an untrusted domain." : "Jums ir piekļuve serverim no neuzticama domēna.",
+    "Add \"%s\" as trusted domain" : "Pievienot \"%s\" kā uzticamu domēnu",
+    "App update required" : "Programmai nepieciešama atjaunināšana",
+    "%s will be updated to version %s" : "%s tiks atjaunināts uz versiju %s",
+    "These apps will be updated:" : "Šīs programmas tiks atjauninātas:",
+    "The theme %s has been disabled." : "Tēma %s ir atspējota.",
+    "Start update" : "Sākt atjaunināšanu",
+    "Detailed logs" : "Detalizētas informācijas žurnālfaili",
+    "Update needed" : "Nepieciešama atjaunināšana",
+    "Please use the command line updater because you have a big instance." : "Lūdzu, izmantojiet komandrindas atjauninātāju, jo jums ir liels datu apjoms.",
+    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Lai saņemtu palīdzību, skatiet  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentāciju</a>.",
+    "This %s instance is currently in maintenance mode, which may take a while." : "Šis %s serveris pašlaik darbojas uzturēšanas režīmā, tas var ilgt kādu laiku.",
+    "Error tagging" : "Kļūda atzīmējot",
+    "Error untagging" : "Kļūda noņemot atzīmi",
+    "Couldn't send mail to following users: %s " : "Nevarēja nosūtīt e-pastu sekojošiem lietotājiem: %s",
+    "Sunday" : "Svētdiena",
+    "Monday" : "Pirmdiena",
+    "Tuesday" : "Otrdiena",
+    "Wednesday" : "Trešdiena",
+    "Thursday" : "Ceturtdiena",
+    "Friday" : "Piektdiena",
+    "Saturday" : "Sestdiena",
+    "Sun." : "Sv.",
+    "Mon." : "Pr.",
+    "Tue." : "Ot.",
+    "Wed." : "Tr.",
+    "Thu." : "Ce.",
+    "Fri." : "Pk.",
+    "Sat." : "Se.",
+    "Su" : "Sv",
+    "Mo" : "Pr",
+    "Tu" : "Ot",
+    "We" : "Tr",
+    "Th" : "Ce",
+    "Fr" : "Pi",
+    "Sa" : "Se",
+    "January" : "Janvāris",
+    "February" : "Februāris",
+    "March" : "Marts",
+    "April" : "Aprīlis",
+    "May" : "Maijs",
+    "June" : "Jūnijs",
+    "July" : "Jūlijs",
+    "August" : "Augusts",
+    "September" : "Septembris",
+    "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.",
+    "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." : "Šim serverim nav interneta savienojuma. Tas nozīmē, ka daži līdzekļi, piemēram, ārējo atmiņas montāžas vai trešās puses lietojumprogrammu paziņojumi par atjauninājumiem nedarbosies. Attāli piekļūt failiem un nosūtīt paziņojumu uz e-pastu, iespējams nedarbosies. Mēs ierosinām, izveidot interneta savienojumu ar šo serveri, ja vēlaties, lai visas funkcijas darbotos.",
+    "Hide file listing" : "Paslēpt datņu sarakstu",
+    "Sending ..." : "Sūta...",
+    "Email sent" : "Vēstule nosūtīta",
+    "Send link via email" : "Sūtīt saiti e-pastā",
+    "notify by email" : "ziņot e-pastā",
+    "can share" : "Var koplietot",
+    "create" : "izveidot",
+    "change" : "mainīt",
+    "delete" : "dzēst",
+    "{sharee} (at {server})" : "{sharee} ({server})",
+    "Share with users…" : "Koplietots ar lietotājiem...",
+    "Share with users or groups…" : "Koplietot ar lietotājiem vai grupām ...",
+    "Warning" : "Brīdinājums",
+    "Error while sending notification" : "Kļūda, nosūtot paziņojumu",
+    "Updating to {version}" : "Jaunināt uz {version}",
+    "The update was successful. There were warnings." : "Atjaunināšana ir bijusi veiksmīga. Bija brīdinājumi.",
+    "No search results in other folders" : "Nav nekas atrasts citā mapēs",
+    "Two-step verification" : "Divpakāpju verifikācija",
+    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Uzlabota drošība ir iespējota jūsu kontam. Lūdzu autentificējies izmantojot otru faktoru.",
+    "Cancel login" : "Atcelt pieteikšanos",
+    "Please authenticate using the selected factor." : "Lūdzu autentifikācija, izmantojot atlasīto faktoru.",
+    "An error occured while verifying the token" : "Radusies kļūda, pārbaudot pilnvaru"
+},"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/nb_NO.js b/core/l10n/nb_NO.js
index f7b81bf882b..4a34917025b 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -51,12 +51,15 @@ OC.L10N.register(
     "Problem loading page, reloading in 5 seconds" : "Det oppstod et problem ved lasting av side, laster på nytt om 5 sekunder",
     "Saving..." : "Lagrer...",
     "Dismiss" : "Forkast",
+    "This action requires you to confirm your password" : "Denne handlingen krever at du bekrefter ditt passord",
+    "Authentication required" : "Autentisering påkrevd",
     "Password" : "Passord",
     "Cancel" : "Avbryt",
+    "Confirm" : "Bekreft",
+    "Failed to authenticate, try again" : "Autentisering mislyktes, prøv igjen",
     "seconds ago" : "for få sekunder siden",
     "Logging in …" : "Logger inn...",
     "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." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.",
-    "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?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
     "I know what I'm doing" : "Jeg vet hva jeg gjør",
     "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.",
     "No" : "Nei",
@@ -105,6 +108,7 @@ OC.L10N.register(
     "Expiration date" : "Utløpsdato",
     "Choose a password for the public link" : "Velg et passord for den offentlige lenken",
     "Copied!" : "Kopiert!",
+    "Copy" : "Kopier",
     "Not supported!" : "Ikke støttet!",
     "Press ⌘-C to copy." : "Trykk ⌘-C for å kopiere",
     "Press Ctrl-C to copy." : "Trykk Ctrl-C for å kopiere",
@@ -113,6 +117,8 @@ OC.L10N.register(
     "Link" : "Lenke",
     "Password protect" : "Passordbeskyttet",
     "Allow upload and editing" : "Tillatt opplasting og redigering",
+    "Allow editing" : "Tillat redigering",
+    "File drop (upload only)" : "Filkasse (kun opplasting)",
     "Email link to person" : "Email lenke til person",
     "Send" : "Send",
     "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
@@ -137,6 +143,7 @@ OC.L10N.register(
     "{sharee} (remote)" : "{sharee} (ekstern)",
     "{sharee} (email)" : "{sharee} (email)",
     "Share" : "Del",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Del med andre brukere på andre tjenere ved å bruke «Federated Cloud ID» brukernavn@eksempel.com/nextcloud",
     "Share with users or by mail..." : "Del med brukere eller på e-post...",
     "Share with users or remote users..." : "Del med brukere eller eksterne brukere...",
     "Share with users, remote users or by mail..." : "Del med brukere, eksterne brukere eller på e-post...",
@@ -153,6 +160,7 @@ OC.L10N.register(
     "Delete" : "Slett",
     "Rename" : "Gi nytt navn",
     "Collaborative tags" : "Felles merkelapper",
+    "No tags found" : "Ingen emneknagger funnet",
     "The object type is not specified." : "Objekttypen er ikke spesifisert.",
     "Enter new" : "Oppgi ny",
     "Add" : "Legg til",
@@ -218,6 +226,7 @@ OC.L10N.register(
     "Database name" : "Databasenavn",
     "Database tablespace" : "Database tabellområde",
     "Database host" : "Databasevert",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Vennligst spesifiser portnr. sammen med tjenernavnet (eks., localhost:5432).",
     "Performance warning" : "Ytelsesadvarsel",
     "SQLite will be used as database." : "SQLite vil bli brukt som database.",
     "For larger installations we recommend to choose a different database backend." : "For større installasjoner anbefaler vi å velge en annen database.",
@@ -227,8 +236,10 @@ OC.L10N.register(
     "Need help?" : "Trenger du hjelp?",
     "See the documentation" : "Se dokumentasjonen",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst {linkstart}aktiver JavaScript{linkend} og last siden på nytt.",
-    "Log out" : "Logg ut",
     "Search" : "Søk",
+    "Log out" : "Logg ut",
+    "This action requires you to confirm your password:" : "Denne handlingen krever at du bekrefter ditt passord:",
+    "Confirm your password" : "Bekreft ditt passord",
     "Server side authentication failed!" : "Autentisering feilet på tjeneren!",
     "Please contact your administrator." : "Vennligst kontakt administratoren din.",
     "An internal error occurred." : "En intern feil oppstod",
@@ -324,8 +335,8 @@ OC.L10N.register(
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Des.",
+    "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?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
     "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." : "Denne serveren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne serveren hvis du vil ha full funksjonalitet.",
-    "Allow editing" : "Tillat redigering",
     "Hide file listing" : "Skjul filliste",
     "Sending ..." : "Sender...",
     "Email sent" : "E-post sendt",
@@ -350,13 +361,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Utvidet sikkerhet har blitt aktivert for din konto. Vennligst autentiser med en andre faktor.",
     "Cancel login" : "Avbryt innlogging",
     "Please authenticate using the selected factor." : "Vennligst autentiser ved hjelp av den valgte faktoren.",
-    "An error occured while verifying the token" : "En feil oppstod under verifisering av nøkkelen",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Din webtjener er ikke satt opp korrekt for å hente \"{url}\". Mer informasjon finner du i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjon</a>.",
-    "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen",
-    "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",
-    "not assignable" : "ikke overdras",
-    "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}, dette kan ta en stund.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du skal konfigurere tjeneren skikkelig, vennligst se i <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dokumentasjonen</a>.",
-    "An internal error occured." : "En intern feil oppstod"
+    "An error occured while verifying the token" : "En feil oppstod under verifisering av nøkkelen"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index d46d5e6c20a..a7504ffb97f 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -49,12 +49,15 @@
     "Problem loading page, reloading in 5 seconds" : "Det oppstod et problem ved lasting av side, laster på nytt om 5 sekunder",
     "Saving..." : "Lagrer...",
     "Dismiss" : "Forkast",
+    "This action requires you to confirm your password" : "Denne handlingen krever at du bekrefter ditt passord",
+    "Authentication required" : "Autentisering påkrevd",
     "Password" : "Passord",
     "Cancel" : "Avbryt",
+    "Confirm" : "Bekreft",
+    "Failed to authenticate, try again" : "Autentisering mislyktes, prøv igjen",
     "seconds ago" : "for få sekunder siden",
     "Logging in …" : "Logger inn...",
     "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." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.",
-    "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?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
     "I know what I'm doing" : "Jeg vet hva jeg gjør",
     "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.",
     "No" : "Nei",
@@ -103,6 +106,7 @@
     "Expiration date" : "Utløpsdato",
     "Choose a password for the public link" : "Velg et passord for den offentlige lenken",
     "Copied!" : "Kopiert!",
+    "Copy" : "Kopier",
     "Not supported!" : "Ikke støttet!",
     "Press ⌘-C to copy." : "Trykk ⌘-C for å kopiere",
     "Press Ctrl-C to copy." : "Trykk Ctrl-C for å kopiere",
@@ -111,6 +115,8 @@
     "Link" : "Lenke",
     "Password protect" : "Passordbeskyttet",
     "Allow upload and editing" : "Tillatt opplasting og redigering",
+    "Allow editing" : "Tillat redigering",
+    "File drop (upload only)" : "Filkasse (kun opplasting)",
     "Email link to person" : "Email lenke til person",
     "Send" : "Send",
     "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppen {group} av {owner}",
@@ -135,6 +141,7 @@
     "{sharee} (remote)" : "{sharee} (ekstern)",
     "{sharee} (email)" : "{sharee} (email)",
     "Share" : "Del",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Del med andre brukere på andre tjenere ved å bruke «Federated Cloud ID» brukernavn@eksempel.com/nextcloud",
     "Share with users or by mail..." : "Del med brukere eller på e-post...",
     "Share with users or remote users..." : "Del med brukere eller eksterne brukere...",
     "Share with users, remote users or by mail..." : "Del med brukere, eksterne brukere eller på e-post...",
@@ -151,6 +158,7 @@
     "Delete" : "Slett",
     "Rename" : "Gi nytt navn",
     "Collaborative tags" : "Felles merkelapper",
+    "No tags found" : "Ingen emneknagger funnet",
     "The object type is not specified." : "Objekttypen er ikke spesifisert.",
     "Enter new" : "Oppgi ny",
     "Add" : "Legg til",
@@ -216,6 +224,7 @@
     "Database name" : "Databasenavn",
     "Database tablespace" : "Database tabellområde",
     "Database host" : "Databasevert",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Vennligst spesifiser portnr. sammen med tjenernavnet (eks., localhost:5432).",
     "Performance warning" : "Ytelsesadvarsel",
     "SQLite will be used as database." : "SQLite vil bli brukt som database.",
     "For larger installations we recommend to choose a different database backend." : "For større installasjoner anbefaler vi å velge en annen database.",
@@ -225,8 +234,10 @@
     "Need help?" : "Trenger du hjelp?",
     "See the documentation" : "Se dokumentasjonen",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst {linkstart}aktiver JavaScript{linkend} og last siden på nytt.",
-    "Log out" : "Logg ut",
     "Search" : "Søk",
+    "Log out" : "Logg ut",
+    "This action requires you to confirm your password:" : "Denne handlingen krever at du bekrefter ditt passord:",
+    "Confirm your password" : "Bekreft ditt passord",
     "Server side authentication failed!" : "Autentisering feilet på tjeneren!",
     "Please contact your administrator." : "Vennligst kontakt administratoren din.",
     "An internal error occurred." : "En intern feil oppstod",
@@ -322,8 +333,8 @@
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Des.",
+    "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?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
     "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." : "Denne serveren har ingen fungerende internett-forbindelse. Dette betyr at noen funksjoner, som tilknytning av eksterne lagre, varslinger om oppdateringer eller installering av tredjeparts apper ikke vil virke. Fjerntilgang til filer og utsending av varsler på e-post vil kanskje ikke virke heller. Vi anbefaler å aktivere en internett-forbindelse for denne serveren hvis du vil ha full funksjonalitet.",
-    "Allow editing" : "Tillat redigering",
     "Hide file listing" : "Skjul filliste",
     "Sending ..." : "Sender...",
     "Email sent" : "E-post sendt",
@@ -348,13 +359,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Utvidet sikkerhet har blitt aktivert for din konto. Vennligst autentiser med en andre faktor.",
     "Cancel login" : "Avbryt innlogging",
     "Please authenticate using the selected factor." : "Vennligst autentiser ved hjelp av den valgte faktoren.",
-    "An error occured while verifying the token" : "En feil oppstod under verifisering av nøkkelen",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Din webtjener er ikke satt opp korrekt for å hente \"{url}\". Mer informasjon finner du i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentasjon</a>.",
-    "An error occured. Please try again" : "Det oppstod en feil. Prøv igjen",
-    "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",
-    "not assignable" : "ikke overdras",
-    "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}, dette kan ta en stund.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du skal konfigurere tjeneren skikkelig, vennligst se i <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">dokumentasjonen</a>.",
-    "An internal error occured." : "En intern feil oppstod"
+    "An error occured while verifying the token" : "En feil oppstod under verifisering av nøkkelen"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index e55607265a9..af191be30b1 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -60,7 +60,7 @@ OC.L10N.register(
     "seconds ago" : "seconden geleden",
     "Logging in …" : "Inloggen...",
     "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." : "De link om je wachtwoord te herstellen is per e-mail naar je verstuurd. Als je dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan je spammap. <br>Als het daar niet in zit, neem dan contact op met je beheerder.",
-    "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?" : "Je bestanden zijn versleuteld. Als je de herstelsleutel niet hebt geactiveerd, is het niet mogelijk om je gegevens terug te krijgen nadat je wachtwoord is hersteld. <br>Als je niet weet wat je moet doen, neem dan eerst contact op met je beheerder. <br>Wil je echt verder gaan?",
+    "Your files are encrypted. 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?" : "Je bestanden zijn versleuteld. Het is niet mogelijk om je gegevens terug te krijgen als je wachtwoord wordt gereset.<br />Als je niet zeker weer wat je moet doen, neem dan contact op met je beheerder voordat je verdergaat. <br />Wil je echt verder gaan?",
     "I know what I'm doing" : "Ik weet wat ik doe",
     "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
     "No" : "Nee",
@@ -122,6 +122,7 @@ OC.L10N.register(
     "Link" : "Link",
     "Password protect" : "Wachtwoord beveiligd",
     "Allow upload and editing" : "Toestaan uploaden en bewerken",
+    "Allow editing" : "Toestaan bewerken",
     "File drop (upload only)" : "File drop (alleen uploaden)",
     "Email link to person" : "E-mail link naar persoon",
     "Send" : "Versturen",
@@ -230,6 +231,7 @@ OC.L10N.register(
     "Database name" : "Naam database",
     "Database tablespace" : "Database tablespace",
     "Database host" : "Databaseserver",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Geef het poortnummer en servernaam op (bijv. localhost:5432).",
     "Performance warning" : "Prestatiewaarschuwing",
     "SQLite will be used as database." : "SQLite wordt gebruikt als database.",
     "For larger installations we recommend to choose a different database backend." : "Voor grotere installaties adviseren we een andere database engine te kiezen.",
@@ -239,8 +241,8 @@ OC.L10N.register(
     "Need help?" : "Hulp nodig?",
     "See the documentation" : "Zie de documentatie",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Deze applicatie heeft JavaScript nodig. {linkstart}Activeer JavaScript{linkend} en ververs deze pagina.",
-    "Log out" : "Afmelden",
     "Search" : "Zoeken",
+    "Log out" : "Afmelden",
     "This action requires you to confirm your password:" : "Deze actie vereist dat je je wachtwoord bevestigt:",
     "Confirm your password" : "Bevestig je wachtwoord",
     "Server side authentication failed!" : "Authenticatie bij de server mislukte!",
@@ -338,9 +340,9 @@ OC.L10N.register(
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dec.",
+    "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?" : "Je bestanden zijn versleuteld. Als je de herstelsleutel niet hebt geactiveerd, is het niet mogelijk om je gegevens terug te krijgen nadat je wachtwoord is hersteld. <br>Als je niet weet wat je moet doen, neem dan eerst contact op met je beheerder. <br>Wil je echt verder gaan?",
     "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." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie e-mails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "De reverse proxy headerconfiguratie is onjuist, of je hebt toegang tot Nextcloud via een vertrouwde proxy. Als je Nextcloud niet via een vertrouwde proxy benadert, dan levert dan een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat Nextcloud ziet kan vervalsen. Meer informatie is te vinden in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>.",
-    "Allow editing" : "Toestaan bewerken",
     "Hide file listing" : "Verberg bestandsoverzicht",
     "Sending ..." : "Versturen ...",
     "Email sent" : "E-mail verzonden",
@@ -365,20 +367,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Aanvullende beveiliging is ingeschakeld voor je account. Log in met een tweede factor.",
     "Cancel login" : "Inlog annuleren",
     "Please authenticate using the selected factor." : "Log in met de geselecteerde factor.",
-    "An error occured while verifying the token" : "Er trad een fout op bij het verifiëren van het token",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Je webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kun je de memcache configureren als die beschikbaar is. Meer informatie vind je in onze <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom is niet leesbaar door PHP, hetgeen wordt afgeraden wegens beveiligingsredenen. Meer informatie in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Je draait momenteel PHP {version}. We adviseren je om, zo gauw je distributie dat biedt, je PHP versie bij te werken voor betere <a target=\"_blank\" href=\"{phpLink}\">prestaties en beveiliging geleverd door de PHP Group</a>.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "De reverse proxy headerconfiguratie is onjuist, of je hebt toegang tot Nextcloud via een vertrouwde proxy. Als je Nextcloud niet via een vertrouwde proxy benadert, dan levert dat een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat Nextcloud ziet kan vervalsen. Meer informatie is te vinden in onze<a target=\"_blank\" href=\"{docLink}\">documentatie</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached is geconfigureerd als gedistribueerde cache, maar de verkeerde PHP module \"memcache\" is geïnstalleerd. \\OC\\Memcache\\Memcached ondersteunt alleen \"memcached\" en niet \"memcache\". Zie de  <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki over beide modules</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sommige bestanden kwamen niet door de code betrouwbaarheidscontrole. Meer informatie over het oplossen van dit probleem kan worden gevonden in onze  <a target=\"_blank\" href=\"{docLink}\">documentatie</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lijst met ongeldige bestanden…</a> / <a href=\"{rescanEndpoint}\">Opnieuw scannen…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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 met minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.",
-    "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw",
-    "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",
-    "not assignable" : "niet-toewijsbaar",
-    "Updating {productName} to version {version}, this may take a while." : "Updaten {productName} naar versie {version}, dit kan even duren.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van je server.",
-    "An internal error occured." : "Er heeft zich een interne fout voorgedaan."
+    "An error occured while verifying the token" : "Er trad een fout op bij het verifiëren van het token"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index b365758f196..c53918ff27a 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -58,7 +58,7 @@
     "seconds ago" : "seconden geleden",
     "Logging in …" : "Inloggen...",
     "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." : "De link om je wachtwoord te herstellen is per e-mail naar je verstuurd. Als je dit bericht niet binnen redelijke tijd hebt ontvangen, controleer dan je spammap. <br>Als het daar niet in zit, neem dan contact op met je beheerder.",
-    "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?" : "Je bestanden zijn versleuteld. Als je de herstelsleutel niet hebt geactiveerd, is het niet mogelijk om je gegevens terug te krijgen nadat je wachtwoord is hersteld. <br>Als je niet weet wat je moet doen, neem dan eerst contact op met je beheerder. <br>Wil je echt verder gaan?",
+    "Your files are encrypted. 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?" : "Je bestanden zijn versleuteld. Het is niet mogelijk om je gegevens terug te krijgen als je wachtwoord wordt gereset.<br />Als je niet zeker weer wat je moet doen, neem dan contact op met je beheerder voordat je verdergaat. <br />Wil je echt verder gaan?",
     "I know what I'm doing" : "Ik weet wat ik doe",
     "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
     "No" : "Nee",
@@ -120,6 +120,7 @@
     "Link" : "Link",
     "Password protect" : "Wachtwoord beveiligd",
     "Allow upload and editing" : "Toestaan uploaden en bewerken",
+    "Allow editing" : "Toestaan bewerken",
     "File drop (upload only)" : "File drop (alleen uploaden)",
     "Email link to person" : "E-mail link naar persoon",
     "Send" : "Versturen",
@@ -228,6 +229,7 @@
     "Database name" : "Naam database",
     "Database tablespace" : "Database tablespace",
     "Database host" : "Databaseserver",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Geef het poortnummer en servernaam op (bijv. localhost:5432).",
     "Performance warning" : "Prestatiewaarschuwing",
     "SQLite will be used as database." : "SQLite wordt gebruikt als database.",
     "For larger installations we recommend to choose a different database backend." : "Voor grotere installaties adviseren we een andere database engine te kiezen.",
@@ -237,8 +239,8 @@
     "Need help?" : "Hulp nodig?",
     "See the documentation" : "Zie de documentatie",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Deze applicatie heeft JavaScript nodig. {linkstart}Activeer JavaScript{linkend} en ververs deze pagina.",
-    "Log out" : "Afmelden",
     "Search" : "Zoeken",
+    "Log out" : "Afmelden",
     "This action requires you to confirm your password:" : "Deze actie vereist dat je je wachtwoord bevestigt:",
     "Confirm your password" : "Bevestig je wachtwoord",
     "Server side authentication failed!" : "Authenticatie bij de server mislukte!",
@@ -336,9 +338,9 @@
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dec.",
+    "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?" : "Je bestanden zijn versleuteld. Als je de herstelsleutel niet hebt geactiveerd, is het niet mogelijk om je gegevens terug te krijgen nadat je wachtwoord is hersteld. <br>Als je niet weet wat je moet doen, neem dan eerst contact op met je beheerder. <br>Wil je echt verder gaan?",
     "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." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie e-mails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "De reverse proxy headerconfiguratie is onjuist, of je hebt toegang tot Nextcloud via een vertrouwde proxy. Als je Nextcloud niet via een vertrouwde proxy benadert, dan levert dan een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat Nextcloud ziet kan vervalsen. Meer informatie is te vinden in onze <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentatie</a>.",
-    "Allow editing" : "Toestaan bewerken",
     "Hide file listing" : "Verberg bestandsoverzicht",
     "Sending ..." : "Versturen ...",
     "Email sent" : "E-mail verzonden",
@@ -363,20 +365,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Aanvullende beveiliging is ingeschakeld voor je account. Log in met een tweede factor.",
     "Cancel login" : "Inlog annuleren",
     "Please authenticate using the selected factor." : "Log in met de geselecteerde factor.",
-    "An error occured while verifying the token" : "Er trad een fout op bij het verifiëren van het token",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Je webserver is niet goed ingesteld om \"{url}\" te vinden. Meer informatie is te vinden in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Er is geen geheugencache geconfigureerd. Om de prestaties te verhogen kun je de memcache configureren als die beschikbaar is. Meer informatie vind je in onze <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom is niet leesbaar door PHP, hetgeen wordt afgeraden wegens beveiligingsredenen. Meer informatie in onze <a target=\"_blank\" href=\"{docLink}\">documentatie</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Je draait momenteel PHP {version}. We adviseren je om, zo gauw je distributie dat biedt, je PHP versie bij te werken voor betere <a target=\"_blank\" href=\"{phpLink}\">prestaties en beveiliging geleverd door de PHP Group</a>.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "De reverse proxy headerconfiguratie is onjuist, of je hebt toegang tot Nextcloud via een vertrouwde proxy. Als je Nextcloud niet via een vertrouwde proxy benadert, dan levert dat een beveiligingsrisico op, waardoor een aanvaller het IP-adres dat Nextcloud ziet kan vervalsen. Meer informatie is te vinden in onze<a target=\"_blank\" href=\"{docLink}\">documentatie</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached is geconfigureerd als gedistribueerde cache, maar de verkeerde PHP module \"memcache\" is geïnstalleerd. \\OC\\Memcache\\Memcached ondersteunt alleen \"memcached\" en niet \"memcache\". Zie de  <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki over beide modules</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Sommige bestanden kwamen niet door de code betrouwbaarheidscontrole. Meer informatie over het oplossen van dit probleem kan worden gevonden in onze  <a target=\"_blank\" href=\"{docLink}\">documentatie</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lijst met ongeldige bestanden…</a> / <a href=\"{rescanEndpoint}\">Opnieuw scannen…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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 met minimaal \"{seconds}\" seconden. Voor verbeterde beveiliging adviseren we HSTS in te schakelen zoals beschreven in onze <a href=\"{docUrl}\">security tips</a>.",
-    "An error occured. Please try again" : "Er trad een fout op. Probeer het opnieuw",
-    "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",
-    "not assignable" : "niet-toewijsbaar",
-    "Updating {productName} to version {version}, this may take a while." : "Updaten {productName} naar versie {version}, dit kan even duren.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van je server.",
-    "An internal error occured." : "Er heeft zich een interne fout voorgedaan."
+    "An error occured while verifying the token" : "Er trad een fout op bij het verifiëren van het token"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index 40cdd2b3fc0..44bb7d06d17 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -45,18 +45,21 @@ OC.L10N.register(
     "%s (incompatible)" : "%s (niekompatybilne)",
     "Following apps have been disabled: %s" : "Poniższe aplikacje zostały wyłączone: %s",
     "Already up to date" : "Już zaktualizowano",
-    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Sprawdzenie spójności kodu nie wykazało problemów. Więcej informacji…</a>",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Wystąpiły problemy przy sprawdzaniu integralności kodu Więcej informacji…</a>",
     "Settings" : "Ustawienia",
     "Connection to server lost" : "Utracone połączenie z serwerem",
     "Problem loading page, reloading in 5 seconds" : "Błąd podczas ładowania strony, odświeżanie w ciągu 5 sekund.",
     "Saving..." : "Zapisywanie...",
     "Dismiss" : "Anuluj",
+    "This action requires you to confirm your password" : "Ta akcja wymaga potwierdzenia hasłem",
+    "Authentication required" : "Wymagana autoryzacja",
     "Password" : "Hasło",
     "Cancel" : "Anuluj",
+    "Confirm" : "Potwierdź",
+    "Failed to authenticate, try again" : "Nie udało się uwierzytelnić, spróbuj ponownie.",
     "seconds ago" : "sekund temu",
     "Logging in …" : "Logowanie …",
     "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." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.",
-    "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?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
     "I know what I'm doing" : "Wiem co robię",
     "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
     "No" : "Nie",
@@ -67,7 +70,7 @@ OC.L10N.register(
     "Ok" : "OK",
     "Error loading message template: {error}" : "Błąd podczas ładowania szablonu wiadomości: {error}",
     "read-only" : "tylko odczyt",
-    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"],
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"],
     "One file conflict" : "Konflikt pliku",
     "New Files" : "Nowe pliki",
     "Already existing files" : "Już istniejące pliki",
@@ -82,15 +85,16 @@ OC.L10N.register(
     "Weak password" : "Słabe hasło",
     "So-so password" : "Mało skomplikowane hasło",
     "Good password" : "Dobre hasło",
-    "Strong password" : "Mocne hasło",
+    "Strong password" : "Silne hasło",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Serwer WWW nie jest jeszcze na tyle poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
     "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Serwer WWW nie jest poprawnie skonfigurowany, aby wyświetlić \"{url}\". Więcej informacji można znaleźć w naszej <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentacji</a>.",
     "Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera",
+    "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>." : "Dostęp do tej strony jest za pośrednictwem protokołu HTTP. Zalecamy skonfigurowanie dostępu do serwera za pomocą protokołu HTTPS zamiast HTTP, jak to opisano w naszych <a href=\"{docUrl}\">wskazówkach bezpieczeństwa</a>.",
     "Shared" : "Udostępniono",
     "Shared with {recipients}" : "Współdzielony z {recipients}",
     "Error" : "Błąd",
-    "Error while sharing" : "Błąd podczas współdzielenia",
-    "Error while unsharing" : "Błąd podczas zatrzymywania współdzielenia",
+    "Error while sharing" : "Błąd podczas udostępniania",
+    "Error while unsharing" : "Błąd podczas zatrzymywania udostepniania",
     "Error setting expiration date" : "Błąd podczas ustawiania daty wygaśnięcia",
     "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",
     "Set expiration date" : "Ustaw datę wygaśnięcia",
@@ -98,6 +102,7 @@ OC.L10N.register(
     "Expiration date" : "Data wygaśnięcia",
     "Choose a password for the public link" : "Wybierz hasło dla linku publicznego",
     "Copied!" : "Skopiowano!",
+    "Copy" : "Skopiuj",
     "Not supported!" : "Brak wsparcia!",
     "Press ⌘-C to copy." : "Wciśnij ⌘-C by skopiować.",
     "Press Ctrl-C to copy." : "Wciśnij Ctrl-C by skopiować,",
@@ -106,6 +111,7 @@ OC.L10N.register(
     "Link" : "Odnośnik",
     "Password protect" : "Zabezpiecz hasłem",
     "Allow upload and editing" : "Pozwól na przesyłanie i edycję",
+    "Allow editing" : "Pozwól na edycję",
     "Email link to person" : "Wyślij osobie odnośnik poprzez e-mail",
     "Send" : "Wyślij",
     "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
@@ -117,6 +123,9 @@ OC.L10N.register(
     "Unshare" : "Zatrzymaj współdzielenie",
     "can reshare" : "mogą udostępniać",
     "can edit" : "może edytować",
+    "can create" : "może utworzyć",
+    "can change" : "może zmienić",
+    "can delete" : "może usunąć",
     "access control" : "kontrola dostępu",
     "Could not unshare" : "Nie udało się usunąć udostępnienia",
     "Share details could not be loaded for this item." : "Szczegóły udziału nie mogły zostać wczytane dla tego obiektu.",
@@ -125,7 +134,16 @@ OC.L10N.register(
     "An error occurred. Please try again" : "Wystąpił błąd. Proszę spróbować ponownie.",
     "{sharee} (group)" : "{sharee} (grupa)",
     "{sharee} (remote)" : "{sharee} (zdalny)",
+    "{sharee} (email)" : "{sharee} (email)",
     "Share" : "Udostępnij",
+    "Share with users or by mail..." : "Współdziel z użytkownikami lub poprzez mail...",
+    "Share with users or remote users..." : "Współdziel z użytkownikami lub zdalnymi użytkownikami...",
+    "Share with users, remote users or by mail..." : "Współdziel z użytkownikami, zdalnymi użytkownikami lub poprzez mail...",
+    "Share with users or groups..." : "Współdziel z użytkownikami lub grupami",
+    "Share with users, groups or by mail..." : "Współdziel z użytkownikami, grupami lub poprzez mail...",
+    "Share with users, groups or remote users..." : "Współdziel z użytkownikami, grupami lub zdalnymi użytkownikami...",
+    "Share with users, groups, remote users or by mail..." : "Współdziel z użytkownikami, grupami, zdalnymi użytkownikami lub poprzez mail...",
+    "Share with users..." : "Współdziel z użytkownikami...",
     "Error removing share" : "Błąd podczas usuwania współdzielenia",
     "Non-existing tag #{tag}" : "Znacznik #{tag} nie istnieje",
     "restricted" : "ograniczone",
@@ -134,6 +152,7 @@ OC.L10N.register(
     "Delete" : "Usuń",
     "Rename" : "Zmień nazwę",
     "Collaborative tags" : "Wspólne tagi",
+    "No tags found" : "Nie znaleziono etykiet",
     "The object type is not specified." : "Nie określono typu obiektu.",
     "Enter new" : "Wpisz nowy",
     "Add" : "Dodaj",
@@ -146,7 +165,7 @@ OC.L10N.register(
     "Hello {name}, the weather is {weather}" : "Cześć {name}, dzisiejsza pogoda jest {weather}",
     "Hello {name}" : "Witaj {name}",
     "new" : "nowy",
-    "_download %n file_::_download %n files_" : ["pobrano %n plik","pobrano %n plików","pobrano %n plików"],
+    "_download %n file_::_download %n files_" : ["pobrano %n plik","pobrano %n plików","pobrano %n plików","pobrano %n plików"],
     "The update is in progress, leaving this page might interrupt the process in some environments." : "Trwa aktualizacja. W niektórych przypadkach, opuszczenie tej strony może przerwać ten proces.",
     "Update to {version}" : "Uaktualnij do {version}",
     "An error occurred." : "Wystąpił błąd",
@@ -157,7 +176,7 @@ OC.L10N.register(
     "The update was successful. Redirecting you to Nextcloud now." : "Aktualizacja przebiegła pomyślnie. Trwa przekierowywanie do Nextcloud.",
     "Searching other places" : "Przeszukaj inne miejsca",
     "No search results in other folders for '{tag}{filter}{endtag}'" : "Brak wyników wyszukiwania w innych folderach '{tag}{filter}{endtag}'",
-    "_{count} search result in another folder_::_{count} search results in other folders_" : ["Liczba wyników wyszukiwania w innych folderach - {count} ","Liczba wyników wyszukiwania w innych folderach - {count} ","Liczba wyników wyszukiwania w innych folderach - {count} "],
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["Liczba wyników wyszukiwania w innych folderach - {count} ","Liczba wyników wyszukiwania w innych folderach - {count} ","Liczba wyników wyszukiwania w innych folderach - {count} ","Liczba wyników wyszukiwania w innych folderach - {count} "],
     "Personal" : "Osobiste",
     "Users" : "Użytkownicy",
     "Apps" : "Aplikacje",
@@ -170,7 +189,7 @@ OC.L10N.register(
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Witaj,\n\ntylko informuję, że %s współdzieli z Tobą %s.\nZobacz tutaj: %s\n\n",
     "The share will expire on %s." : "Ten zasób wygaśnie %s",
     "Cheers!" : "Pozdrawiam!",
-    "Internal Server Error" : "Internal Server Error",
+    "Internal Server Error" : "Błąd wewnętrzny serwera",
     "The server encountered an internal error and was unable to complete your request." : "Serwer napotkał błąd wewnętrzny i nie był w stanie ukończyć Twojego żądania.",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Proszę skontaktować się z administratorem jeśli ten błąd będzie się pojawiał wielokrotnie, proszę do zgłoszenia dołączyć szczegóły techniczne opisane poniżej.",
     "More details can be found in the server log." : "Więcej szczegółów można znaleźć w logu serwera.",
@@ -199,6 +218,7 @@ OC.L10N.register(
     "Database name" : "Nazwa bazy danych",
     "Database tablespace" : "Obszar tabel bazy danych",
     "Database host" : "Komputer bazy danych",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Wskaż proszę numer portu wraz z adresem (np. localhost:5432).",
     "Performance warning" : "Ostrzeżenie o wydajności",
     "SQLite will be used as database." : "SQLite będzie używane jako baza danych.",
     "For larger installations we recommend to choose a different database backend." : "Dla większych instalacji zalecamy użycie innej bazy danych.",
@@ -208,8 +228,10 @@ OC.L10N.register(
     "Need help?" : "Potrzebujesz pomocy?",
     "See the documentation" : "Zapoznaj się z dokumentacją",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę {linkstart}włączyć JavaScript{linkend} i przeładować stronę.",
-    "Log out" : "Wyloguj",
     "Search" : "Wyszukaj",
+    "Log out" : "Wyloguj",
+    "This action requires you to confirm your password:" : "Ta akcja wymaga potwierdzenia hasłem:",
+    "Confirm your password" : "Potwierdź hasło",
     "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!",
     "Please contact your administrator." : "Skontaktuj się z administratorem",
     "An internal error occurred." : "Wystąpił wewnętrzny błąd.",
@@ -305,7 +327,7 @@ OC.L10N.register(
     "Oct." : "Paź.",
     "Nov." : "Lis.",
     "Dec." : "Gru.",
-    "Allow editing" : "Pozwól na edycję",
+    "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?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
     "Hide file listing" : "Schowaj listę plików",
     "Sending ..." : "Wysyłanie...",
     "Email sent" : "E-mail wysłany",
@@ -330,13 +352,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Dla Twojego konta uruchomiono wzmocnioną ochronę. Uwierzytelnij przy pomocy drugiego składnika.",
     "Cancel login" : "Anuluj logowanie",
     "Please authenticate using the selected factor." : "Uwierzytelnij przy pomocy wybranego składnika",
-    "An error occured while verifying the token" : "Wystąpił błąd podczas weryfikacji tokena",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Serwer WWW nie jest poprawnie skonfigurowany, aby wyświetlić \"{url}\". Więcej informacji można znaleźć w naszej <a target=\"_blank\" href=\"{docLink}\">dokumentacji</a>.",
-    "An error occured. Please try again" : "Wystąpił błąd. Proszę spróbować ponownie.",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Współdziel z użytkownikami innych chmur ownCloud używając wzorca uzytkownik@example.com/owncloud",
-    "not assignable" : "nie przypisane",
-    "Updating {productName} to version {version}, this may take a while." : "AKtualizowanie {productName} do wersji {version}, może to trochę potrwać.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informację jak poprawnie skonfigurować Twój serwer, zajrzyj do <a href=\"%s\" target=\"_blank\">dokumentacji</a>.",
-    "An internal error occured." : "Wystąpił wewnętrzny błąd."
+    "An error occured while verifying the token" : "Wystąpił błąd podczas weryfikacji tokena"
 },
 "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index 13d1382ee4c..a7ccd87a34c 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -43,18 +43,21 @@
     "%s (incompatible)" : "%s (niekompatybilne)",
     "Following apps have been disabled: %s" : "Poniższe aplikacje zostały wyłączone: %s",
     "Already up to date" : "Już zaktualizowano",
-    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Sprawdzenie spójności kodu nie wykazało problemów. Więcej informacji…</a>",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Wystąpiły problemy przy sprawdzaniu integralności kodu Więcej informacji…</a>",
     "Settings" : "Ustawienia",
     "Connection to server lost" : "Utracone połączenie z serwerem",
     "Problem loading page, reloading in 5 seconds" : "Błąd podczas ładowania strony, odświeżanie w ciągu 5 sekund.",
     "Saving..." : "Zapisywanie...",
     "Dismiss" : "Anuluj",
+    "This action requires you to confirm your password" : "Ta akcja wymaga potwierdzenia hasłem",
+    "Authentication required" : "Wymagana autoryzacja",
     "Password" : "Hasło",
     "Cancel" : "Anuluj",
+    "Confirm" : "Potwierdź",
+    "Failed to authenticate, try again" : "Nie udało się uwierzytelnić, spróbuj ponownie.",
     "seconds ago" : "sekund temu",
     "Logging in …" : "Logowanie …",
     "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." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.",
-    "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?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
     "I know what I'm doing" : "Wiem co robię",
     "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
     "No" : "Nie",
@@ -65,7 +68,7 @@
     "Ok" : "OK",
     "Error loading message template: {error}" : "Błąd podczas ładowania szablonu wiadomości: {error}",
     "read-only" : "tylko odczyt",
-    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"],
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"],
     "One file conflict" : "Konflikt pliku",
     "New Files" : "Nowe pliki",
     "Already existing files" : "Już istniejące pliki",
@@ -80,15 +83,16 @@
     "Weak password" : "Słabe hasło",
     "So-so password" : "Mało skomplikowane hasło",
     "Good password" : "Dobre hasło",
-    "Strong password" : "Mocne hasło",
+    "Strong password" : "Silne hasło",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Serwer WWW nie jest jeszcze na tyle poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
     "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Serwer WWW nie jest poprawnie skonfigurowany, aby wyświetlić \"{url}\". Więcej informacji można znaleźć w naszej <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentacji</a>.",
     "Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera",
+    "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>." : "Dostęp do tej strony jest za pośrednictwem protokołu HTTP. Zalecamy skonfigurowanie dostępu do serwera za pomocą protokołu HTTPS zamiast HTTP, jak to opisano w naszych <a href=\"{docUrl}\">wskazówkach bezpieczeństwa</a>.",
     "Shared" : "Udostępniono",
     "Shared with {recipients}" : "Współdzielony z {recipients}",
     "Error" : "Błąd",
-    "Error while sharing" : "Błąd podczas współdzielenia",
-    "Error while unsharing" : "Błąd podczas zatrzymywania współdzielenia",
+    "Error while sharing" : "Błąd podczas udostępniania",
+    "Error while unsharing" : "Błąd podczas zatrzymywania udostepniania",
     "Error setting expiration date" : "Błąd podczas ustawiania daty wygaśnięcia",
     "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",
     "Set expiration date" : "Ustaw datę wygaśnięcia",
@@ -96,6 +100,7 @@
     "Expiration date" : "Data wygaśnięcia",
     "Choose a password for the public link" : "Wybierz hasło dla linku publicznego",
     "Copied!" : "Skopiowano!",
+    "Copy" : "Skopiuj",
     "Not supported!" : "Brak wsparcia!",
     "Press ⌘-C to copy." : "Wciśnij ⌘-C by skopiować.",
     "Press Ctrl-C to copy." : "Wciśnij Ctrl-C by skopiować,",
@@ -104,6 +109,7 @@
     "Link" : "Odnośnik",
     "Password protect" : "Zabezpiecz hasłem",
     "Allow upload and editing" : "Pozwól na przesyłanie i edycję",
+    "Allow editing" : "Pozwól na edycję",
     "Email link to person" : "Wyślij osobie odnośnik poprzez e-mail",
     "Send" : "Wyślij",
     "Shared with you and the group {group} by {owner}" : "Udostępnione tobie i grupie {group} przez {owner}",
@@ -115,6 +121,9 @@
     "Unshare" : "Zatrzymaj współdzielenie",
     "can reshare" : "mogą udostępniać",
     "can edit" : "może edytować",
+    "can create" : "może utworzyć",
+    "can change" : "może zmienić",
+    "can delete" : "może usunąć",
     "access control" : "kontrola dostępu",
     "Could not unshare" : "Nie udało się usunąć udostępnienia",
     "Share details could not be loaded for this item." : "Szczegóły udziału nie mogły zostać wczytane dla tego obiektu.",
@@ -123,7 +132,16 @@
     "An error occurred. Please try again" : "Wystąpił błąd. Proszę spróbować ponownie.",
     "{sharee} (group)" : "{sharee} (grupa)",
     "{sharee} (remote)" : "{sharee} (zdalny)",
+    "{sharee} (email)" : "{sharee} (email)",
     "Share" : "Udostępnij",
+    "Share with users or by mail..." : "Współdziel z użytkownikami lub poprzez mail...",
+    "Share with users or remote users..." : "Współdziel z użytkownikami lub zdalnymi użytkownikami...",
+    "Share with users, remote users or by mail..." : "Współdziel z użytkownikami, zdalnymi użytkownikami lub poprzez mail...",
+    "Share with users or groups..." : "Współdziel z użytkownikami lub grupami",
+    "Share with users, groups or by mail..." : "Współdziel z użytkownikami, grupami lub poprzez mail...",
+    "Share with users, groups or remote users..." : "Współdziel z użytkownikami, grupami lub zdalnymi użytkownikami...",
+    "Share with users, groups, remote users or by mail..." : "Współdziel z użytkownikami, grupami, zdalnymi użytkownikami lub poprzez mail...",
+    "Share with users..." : "Współdziel z użytkownikami...",
     "Error removing share" : "Błąd podczas usuwania współdzielenia",
     "Non-existing tag #{tag}" : "Znacznik #{tag} nie istnieje",
     "restricted" : "ograniczone",
@@ -132,6 +150,7 @@
     "Delete" : "Usuń",
     "Rename" : "Zmień nazwę",
     "Collaborative tags" : "Wspólne tagi",
+    "No tags found" : "Nie znaleziono etykiet",
     "The object type is not specified." : "Nie określono typu obiektu.",
     "Enter new" : "Wpisz nowy",
     "Add" : "Dodaj",
@@ -144,7 +163,7 @@
     "Hello {name}, the weather is {weather}" : "Cześć {name}, dzisiejsza pogoda jest {weather}",
     "Hello {name}" : "Witaj {name}",
     "new" : "nowy",
-    "_download %n file_::_download %n files_" : ["pobrano %n plik","pobrano %n plików","pobrano %n plików"],
+    "_download %n file_::_download %n files_" : ["pobrano %n plik","pobrano %n plików","pobrano %n plików","pobrano %n plików"],
     "The update is in progress, leaving this page might interrupt the process in some environments." : "Trwa aktualizacja. W niektórych przypadkach, opuszczenie tej strony może przerwać ten proces.",
     "Update to {version}" : "Uaktualnij do {version}",
     "An error occurred." : "Wystąpił błąd",
@@ -155,7 +174,7 @@
     "The update was successful. Redirecting you to Nextcloud now." : "Aktualizacja przebiegła pomyślnie. Trwa przekierowywanie do Nextcloud.",
     "Searching other places" : "Przeszukaj inne miejsca",
     "No search results in other folders for '{tag}{filter}{endtag}'" : "Brak wyników wyszukiwania w innych folderach '{tag}{filter}{endtag}'",
-    "_{count} search result in another folder_::_{count} search results in other folders_" : ["Liczba wyników wyszukiwania w innych folderach - {count} ","Liczba wyników wyszukiwania w innych folderach - {count} ","Liczba wyników wyszukiwania w innych folderach - {count} "],
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["Liczba wyników wyszukiwania w innych folderach - {count} ","Liczba wyników wyszukiwania w innych folderach - {count} ","Liczba wyników wyszukiwania w innych folderach - {count} ","Liczba wyników wyszukiwania w innych folderach - {count} "],
     "Personal" : "Osobiste",
     "Users" : "Użytkownicy",
     "Apps" : "Aplikacje",
@@ -168,7 +187,7 @@
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Witaj,\n\ntylko informuję, że %s współdzieli z Tobą %s.\nZobacz tutaj: %s\n\n",
     "The share will expire on %s." : "Ten zasób wygaśnie %s",
     "Cheers!" : "Pozdrawiam!",
-    "Internal Server Error" : "Internal Server Error",
+    "Internal Server Error" : "Błąd wewnętrzny serwera",
     "The server encountered an internal error and was unable to complete your request." : "Serwer napotkał błąd wewnętrzny i nie był w stanie ukończyć Twojego żądania.",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Proszę skontaktować się z administratorem jeśli ten błąd będzie się pojawiał wielokrotnie, proszę do zgłoszenia dołączyć szczegóły techniczne opisane poniżej.",
     "More details can be found in the server log." : "Więcej szczegółów można znaleźć w logu serwera.",
@@ -197,6 +216,7 @@
     "Database name" : "Nazwa bazy danych",
     "Database tablespace" : "Obszar tabel bazy danych",
     "Database host" : "Komputer bazy danych",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Wskaż proszę numer portu wraz z adresem (np. localhost:5432).",
     "Performance warning" : "Ostrzeżenie o wydajności",
     "SQLite will be used as database." : "SQLite będzie używane jako baza danych.",
     "For larger installations we recommend to choose a different database backend." : "Dla większych instalacji zalecamy użycie innej bazy danych.",
@@ -206,8 +226,10 @@
     "Need help?" : "Potrzebujesz pomocy?",
     "See the documentation" : "Zapoznaj się z dokumentacją",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę {linkstart}włączyć JavaScript{linkend} i przeładować stronę.",
-    "Log out" : "Wyloguj",
     "Search" : "Wyszukaj",
+    "Log out" : "Wyloguj",
+    "This action requires you to confirm your password:" : "Ta akcja wymaga potwierdzenia hasłem:",
+    "Confirm your password" : "Potwierdź hasło",
     "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!",
     "Please contact your administrator." : "Skontaktuj się z administratorem",
     "An internal error occurred." : "Wystąpił wewnętrzny błąd.",
@@ -303,7 +325,7 @@
     "Oct." : "Paź.",
     "Nov." : "Lis.",
     "Dec." : "Gru.",
-    "Allow editing" : "Pozwól na edycję",
+    "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?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
     "Hide file listing" : "Schowaj listę plików",
     "Sending ..." : "Wysyłanie...",
     "Email sent" : "E-mail wysłany",
@@ -328,13 +350,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Dla Twojego konta uruchomiono wzmocnioną ochronę. Uwierzytelnij przy pomocy drugiego składnika.",
     "Cancel login" : "Anuluj logowanie",
     "Please authenticate using the selected factor." : "Uwierzytelnij przy pomocy wybranego składnika",
-    "An error occured while verifying the token" : "Wystąpił błąd podczas weryfikacji tokena",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Serwer WWW nie jest poprawnie skonfigurowany, aby wyświetlić \"{url}\". Więcej informacji można znaleźć w naszej <a target=\"_blank\" href=\"{docLink}\">dokumentacji</a>.",
-    "An error occured. Please try again" : "Wystąpił błąd. Proszę spróbować ponownie.",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Współdziel z użytkownikami innych chmur ownCloud używając wzorca uzytkownik@example.com/owncloud",
-    "not assignable" : "nie przypisane",
-    "Updating {productName} to version {version}, this may take a while." : "AKtualizowanie {productName} do wersji {version}, może to trochę potrwać.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informację jak poprawnie skonfigurować Twój serwer, zajrzyj do <a href=\"%s\" target=\"_blank\">dokumentacji</a>.",
-    "An internal error occured." : "Wystąpił wewnętrzny błąd."
+    "An error occured while verifying the token" : "Wystąpił błąd podczas weryfikacji tokena"
 },"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 13c091dea2b..7f5bea95d53 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -60,7 +60,7 @@ OC.L10N.register(
     "seconds ago" : "segundos atrás",
     "Logging in …" : "Logando ...",
     "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 redefinir sua senha foi enviado para seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique suas pastas de spam/lixo.<br> Se ele não estiver lá, pergunte ao administrador do 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?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida.<br/>Se não tiver certeza do que deve fazer, contate o administrador antes de continuar. <br/>Deseja realmente continuar?",
+    "Your files are encrypted. 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?" : "Seus arquivos são criptografados. Não existe nenhuma maneira de ter seus dados de volta depois que sua senha seja redefinida.<br /> Se você não tem certeza do que fazer, por favor contate seu administrador antes de continuar.<br />Você realmente deseja continuar?",
     "I know what I'm doing" : "Eu sei o que estou fazendo",
     "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.",
     "No" : "Não",
@@ -100,7 +100,7 @@ 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.",
     "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 at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "O \"Strict-Transport-Security\" cabeçalho HTTP não está configurado para pelo menos \"{segundos}\" segundos. Para maior segurança recomendamos a ativação HSTS como descrito em nossas <a href=\"{docUrl}\" rel=\"noreferrer\">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>.",
+    "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 sugerimos fortemente que você configure o servidor para exigir o uso de HTTPS como descrito em nossas  <a href=\"{docUrl}\">dicas de segurança</a>.",
     "Shared" : "Compartilhado",
     "Shared with {recipients}" : "Compartilhado com {recipients}",
     "Error" : "Erro",
@@ -122,6 +122,7 @@ OC.L10N.register(
     "Link" : "Link",
     "Password protect" : "Proteger com senha",
     "Allow upload and editing" : "Permitir envio e edição",
+    "Allow editing" : "Permitir edição",
     "File drop (upload only)" : "Zona de arquivos (somente upload)",
     "Email link to person" : "Enviar link por e-mail",
     "Send" : "Enviar",
@@ -230,6 +231,7 @@ OC.L10N.register(
     "Database name" : "Nome do banco de dados",
     "Database tablespace" : "Espaço de tabela do banco de dados",
     "Database host" : "Host do banco de dados",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Por favor especifique o número de porta e o nome do host (e.g., localhost:5432).",
     "Performance warning" : "Performance de alerta",
     "SQLite will be used as database." : "SQLite será usado como banco de dados",
     "For larger installations we recommend to choose a different database backend." : "Para instalações maiores é recomendável escolher um backend de banco de dados diferente.",
@@ -239,8 +241,8 @@ OC.L10N.register(
     "Need help?" : "Precisa de ajuda?",
     "See the documentation" : "Veja a documentação",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicação requer JavaScript para sua correta operação. Por favor {linkstart}habilite JavaScript{linkend} e recerregue a página.",
-    "Log out" : "Sair",
     "Search" : "Perquisar",
+    "Log out" : "Sair",
     "This action requires you to confirm your password:" : "Essa ação requer confirmação da sua senha:",
     "Confirm your password" : "Confirme sua senha",
     "Server side authentication failed!" : "Autenticação do servidor falhou!",
@@ -281,7 +283,7 @@ OC.L10N.register(
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
     "Detailed logs" : "Logs detalhados",
     "Update needed" : "Atualização necessária",
-    "Please use the command line updater because you have a big instance." : "Por favor, use a atualização de linha de comando, porque você tem um grande exemplo.",
+    "Please use the command line updater because you have a big instance." : "Por favor, use a atualização de linha de comando, porque você tem muitos dados em sua instância.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Para obter ajuda, consulte a  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Esta instância %s está em modo de manutenção, o que pode demorar um pouco.",
     "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente.",
@@ -338,9 +340,9 @@ OC.L10N.register(
     "Oct." : "Out.",
     "Nov." : "Nov.",
     "Dec." : "Dez.",
+    "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?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida.<br/>Se não tiver certeza do que deve fazer, contate o administrador antes de continuar. <br/>Deseja realmente continuar?",
     "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 não tem nenhuma conexão com a Internet. Isso significa que alguns dos recursos como montar armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de terceiros não vai funcionar. Acessar arquivos remotamente e envio de e-mails de notificação pode não funcionar, também. Sugerimos permitir conexão com a Internet para este servidor, se você quer ter todas as funcionalidades.",
     "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 target=\"_blank\" rel=\"noreferrer\" 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 estiver acessando ownCloud de um proxy de confiança, esta é uma questão de segurança e pode permitir a um invasor falsificar o endereço IP como visíveis para ownCloud. Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.",
-    "Allow editing" : "Permitir edição",
     "Hide file listing" : "Listar arquivo oculto",
     "Sending ..." : "Enviando ...",
     "Email sent" : "E-mail enviado",
@@ -365,20 +367,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Segurança reforçada foi ativada para sua conta. Por favor autenticar usando um segundo fator.",
     "Cancel login" : "Cancelar o login",
     "Please authenticate using the selected factor." : "Por favor autenticar usando o fator selecionado.",
-    "An error occured while verifying the token" : "Ocorreu um erro ao verificar o token",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Seu servidor web não está configurado corretamente para abrir a URL \"{url}\". Mais informações podem ser encontradas em nossa <a target=\"_blank\" href=\"{docLink}\">documentação</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" 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 target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom não é legível pelo PHP que é altamente desencorajado por razões de segurança. Mais informação pode ser encontrada na nossa <a target=\"_blank\" href=\"{docLink}\">documentação</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Você está rodando o PHP {version}. Nós o incentivamos a atualizar sua versão do PHP para aproveitar <a target=\"_blank\" href=\"{phpLink}\"> atualizações de desempenho e de segurança fornecidos pelo Grupo PHP </a>, logo que a sua distribuição for compatível.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "A configuração cabeçalhos do proxy reverso está incorreta, ou você está acessando Nextcloud de um proxy confiável. Se você não estiver acessando Nextcloud de um proxy confiável, esta é uma questão de segurança e pode permitir a um invasor falsificar o endereço IP como visíveis para Nextcloud. Mais informações podem ser encontradas em nossa <a target=\"_blank\" href=\"{docLink}\">documentação</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached é configurado como cache distribuído, mas o módulo PHP errado \"memcache\" está instalado. \\OC\\Memcache\\Memcached suporta apenas \"memcached\" e não \"memcache\". Veja <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki sobre ambos os módulos</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Alguns arquivos não passaram na verificação de integridade. Mais informações sobre como resolver este problema pode ser encontrado em nossa <a target=\"_blank\" href=\"{docLink}\">documentação</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista de arquivos inválidos…</a> / <a href=\"{rescanEndpoint}\">Reescanear…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "O cabeçalho HTTP \"Strict-Transport-Security\"  não está configurado para pelo menos \"{seconds}\" segundos. Para maior segurança recomendamos a ativação HSTS como descrito em nosso <a href=\"{docUrl}\">dicas de segurança</a>.",
-    "An error occured. Please try again" : "Ocorreu um erro. Tente novamente",
-    "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",
-    "not assignable" : "não atribuível",
-    "Updating {productName} to version {version}, this may take a while." : "Atualizando o {productName} para a versão {version}. Isso pode levar algum tempo.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, leia a <a href=\"%s\" target=\"_blank\">documentação</a>.",
-    "An internal error occured." : "Ocorreu um erro interno."
+    "An error occured while verifying the token" : "Ocorreu um erro ao verificar o token"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 9d57784168f..caa468c1de4 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -58,7 +58,7 @@
     "seconds ago" : "segundos atrás",
     "Logging in …" : "Logando ...",
     "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 redefinir sua senha foi enviado para seu e-mail. Se você não recebê-lo dentro de um período razoável de tempo, verifique suas pastas de spam/lixo.<br> Se ele não estiver lá, pergunte ao administrador do 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?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida.<br/>Se não tiver certeza do que deve fazer, contate o administrador antes de continuar. <br/>Deseja realmente continuar?",
+    "Your files are encrypted. 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?" : "Seus arquivos são criptografados. Não existe nenhuma maneira de ter seus dados de volta depois que sua senha seja redefinida.<br /> Se você não tem certeza do que fazer, por favor contate seu administrador antes de continuar.<br />Você realmente deseja continuar?",
     "I know what I'm doing" : "Eu sei o que estou fazendo",
     "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.",
     "No" : "Não",
@@ -98,7 +98,7 @@
     "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.",
     "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 at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "O \"Strict-Transport-Security\" cabeçalho HTTP não está configurado para pelo menos \"{segundos}\" segundos. Para maior segurança recomendamos a ativação HSTS como descrito em nossas <a href=\"{docUrl}\" rel=\"noreferrer\">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>.",
+    "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 sugerimos fortemente que você configure o servidor para exigir o uso de HTTPS como descrito em nossas  <a href=\"{docUrl}\">dicas de segurança</a>.",
     "Shared" : "Compartilhado",
     "Shared with {recipients}" : "Compartilhado com {recipients}",
     "Error" : "Erro",
@@ -120,6 +120,7 @@
     "Link" : "Link",
     "Password protect" : "Proteger com senha",
     "Allow upload and editing" : "Permitir envio e edição",
+    "Allow editing" : "Permitir edição",
     "File drop (upload only)" : "Zona de arquivos (somente upload)",
     "Email link to person" : "Enviar link por e-mail",
     "Send" : "Enviar",
@@ -228,6 +229,7 @@
     "Database name" : "Nome do banco de dados",
     "Database tablespace" : "Espaço de tabela do banco de dados",
     "Database host" : "Host do banco de dados",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Por favor especifique o número de porta e o nome do host (e.g., localhost:5432).",
     "Performance warning" : "Performance de alerta",
     "SQLite will be used as database." : "SQLite será usado como banco de dados",
     "For larger installations we recommend to choose a different database backend." : "Para instalações maiores é recomendável escolher um backend de banco de dados diferente.",
@@ -237,8 +239,8 @@
     "Need help?" : "Precisa de ajuda?",
     "See the documentation" : "Veja a documentação",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicação requer JavaScript para sua correta operação. Por favor {linkstart}habilite JavaScript{linkend} e recerregue a página.",
-    "Log out" : "Sair",
     "Search" : "Perquisar",
+    "Log out" : "Sair",
     "This action requires you to confirm your password:" : "Essa ação requer confirmação da sua senha:",
     "Confirm your password" : "Confirme sua senha",
     "Server side authentication failed!" : "Autenticação do servidor falhou!",
@@ -279,7 +281,7 @@
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
     "Detailed logs" : "Logs detalhados",
     "Update needed" : "Atualização necessária",
-    "Please use the command line updater because you have a big instance." : "Por favor, use a atualização de linha de comando, porque você tem um grande exemplo.",
+    "Please use the command line updater because you have a big instance." : "Por favor, use a atualização de linha de comando, porque você tem muitos dados em sua instância.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Para obter ajuda, consulte a  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentação</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Esta instância %s está em modo de manutenção, o que pode demorar um pouco.",
     "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente.",
@@ -336,9 +338,9 @@
     "Oct." : "Out.",
     "Nov." : "Nov.",
     "Dec." : "Dez.",
+    "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?" : "Seus arquivos são criptografados. Se você não ativou a chave de recuperação, não haverá maneira de obter seus dados de volta após a sua senha ser redefinida.<br/>Se não tiver certeza do que deve fazer, contate o administrador antes de continuar. <br/>Deseja realmente continuar?",
     "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 não tem nenhuma conexão com a Internet. Isso significa que alguns dos recursos como montar armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de terceiros não vai funcionar. Acessar arquivos remotamente e envio de e-mails de notificação pode não funcionar, também. Sugerimos permitir conexão com a Internet para este servidor, se você quer ter todas as funcionalidades.",
     "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 target=\"_blank\" rel=\"noreferrer\" 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 estiver acessando ownCloud de um proxy de confiança, esta é uma questão de segurança e pode permitir a um invasor falsificar o endereço IP como visíveis para ownCloud. Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.",
-    "Allow editing" : "Permitir edição",
     "Hide file listing" : "Listar arquivo oculto",
     "Sending ..." : "Enviando ...",
     "Email sent" : "E-mail enviado",
@@ -363,20 +365,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Segurança reforçada foi ativada para sua conta. Por favor autenticar usando um segundo fator.",
     "Cancel login" : "Cancelar o login",
     "Please authenticate using the selected factor." : "Por favor autenticar usando o fator selecionado.",
-    "An error occured while verifying the token" : "Ocorreu um erro ao verificar o token",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Seu servidor web não está configurado corretamente para abrir a URL \"{url}\". Mais informações podem ser encontradas em nossa <a target=\"_blank\" href=\"{docLink}\">documentação</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" 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 target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom não é legível pelo PHP que é altamente desencorajado por razões de segurança. Mais informação pode ser encontrada na nossa <a target=\"_blank\" href=\"{docLink}\">documentação</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Você está rodando o PHP {version}. Nós o incentivamos a atualizar sua versão do PHP para aproveitar <a target=\"_blank\" href=\"{phpLink}\"> atualizações de desempenho e de segurança fornecidos pelo Grupo PHP </a>, logo que a sua distribuição for compatível.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "A configuração cabeçalhos do proxy reverso está incorreta, ou você está acessando Nextcloud de um proxy confiável. Se você não estiver acessando Nextcloud de um proxy confiável, esta é uma questão de segurança e pode permitir a um invasor falsificar o endereço IP como visíveis para Nextcloud. Mais informações podem ser encontradas em nossa <a target=\"_blank\" href=\"{docLink}\">documentação</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached é configurado como cache distribuído, mas o módulo PHP errado \"memcache\" está instalado. \\OC\\Memcache\\Memcached suporta apenas \"memcached\" e não \"memcache\". Veja <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki sobre ambos os módulos</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Alguns arquivos não passaram na verificação de integridade. Mais informações sobre como resolver este problema pode ser encontrado em nossa <a target=\"_blank\" href=\"{docLink}\">documentação</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista de arquivos inválidos…</a> / <a href=\"{rescanEndpoint}\">Reescanear…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "O cabeçalho HTTP \"Strict-Transport-Security\"  não está configurado para pelo menos \"{seconds}\" segundos. Para maior segurança recomendamos a ativação HSTS como descrito em nosso <a href=\"{docUrl}\">dicas de segurança</a>.",
-    "An error occured. Please try again" : "Ocorreu um erro. Tente novamente",
-    "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",
-    "not assignable" : "não atribuível",
-    "Updating {productName} to version {version}, this may take a while." : "Atualizando o {productName} para a versão {version}. Isso pode levar algum tempo.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, leia a <a href=\"%s\" target=\"_blank\">documentação</a>.",
-    "An internal error occured." : "Ocorreu um erro interno."
+    "An error occured while verifying the token" : "Ocorreu um erro ao verificar o token"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index 9c01bbfecfd..28fc45b20e2 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -52,7 +52,6 @@ OC.L10N.register(
     "Cancel" : "Cancelar",
     "seconds ago" : "segundos atrás",
     "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",
@@ -104,6 +103,7 @@ OC.L10N.register(
     "Share link" : "Compartilhar hiperligação",
     "Link" : "Hiperligação",
     "Password protect" : "Proteger com palavra-passe",
+    "Allow editing" : "Permitir edição",
     "Email link to person" : "Enviar hiperligação por mensagem para a pessoa",
     "Send" : "Enviar",
     "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
@@ -197,8 +197,8 @@ OC.L10N.register(
     "Need help?" : "Precisa de ajuda?",
     "See the documentation" : "Consulte a documentação",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicação requer o JavaScript para funcionar corretamente. Por favor, {linkstart}ative o JavaScript{linkend} e recarregue a página.",
-    "Log out" : "Terminar sessão",
     "Search" : "Procurar",
+    "Log out" : "Terminar sessão",
     "Server side authentication failed!" : "Autenticação do lado do servidor falhou!",
     "Please contact your administrator." : "Por favor, contacte o seu administrador.",
     "An internal error occurred." : "Ocorreu um erro interno.",
@@ -289,8 +289,8 @@ OC.L10N.register(
     "Oct." : "Out.",
     "Nov." : "Nov.",
     "Dec." : "Dez.",
+    "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?",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "A configuração dos headers do proxy reverso está incorreta, ou então está a aceder ao ownCloud através de um proxy de confiança. Se não está a aceder ao ownCloud através de um proxy de confiança, isto é um problema de segurança e poderá permitir a um invasor falsificar um endereço IP como visível para o ownCloud. Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.",
-    "Allow editing" : "Permitir edição",
     "Sending ..." : "A enviar...",
     "Email sent" : "Mensagem enviada",
     "Send link via email" : "Enviar hiperligação por mensagem",
@@ -310,7 +310,6 @@ OC.L10N.register(
     "Two-step verification" : "Verificação de dois passos:",
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "A segurança reforçada foi ativada para a sua conta. Por favor, autentique utilizando um segundo fator.",
     "Please authenticate using the selected factor." : "Por favor, autentique utilizando um segundo fator.",
-    "An error occured while verifying the token" : "Ocorreu um erro durante a verificação da senha",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhe com as pessoas nas outras ownClouds utilizando a sintaxe username@example.com/owncloud"
+    "An error occured while verifying the token" : "Ocorreu um erro durante a verificação da senha"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 164455cac9a..fd0d06d47a4 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -50,7 +50,6 @@
     "Cancel" : "Cancelar",
     "seconds ago" : "segundos atrás",
     "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",
@@ -102,6 +101,7 @@
     "Share link" : "Compartilhar hiperligação",
     "Link" : "Hiperligação",
     "Password protect" : "Proteger com palavra-passe",
+    "Allow editing" : "Permitir edição",
     "Email link to person" : "Enviar hiperligação por mensagem para a pessoa",
     "Send" : "Enviar",
     "Shared with you and the group {group} by {owner}" : "Partilhado consigo e com o grupo {group} por {owner}",
@@ -195,8 +195,8 @@
     "Need help?" : "Precisa de ajuda?",
     "See the documentation" : "Consulte a documentação",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Esta aplicação requer o JavaScript para funcionar corretamente. Por favor, {linkstart}ative o JavaScript{linkend} e recarregue a página.",
-    "Log out" : "Terminar sessão",
     "Search" : "Procurar",
+    "Log out" : "Terminar sessão",
     "Server side authentication failed!" : "Autenticação do lado do servidor falhou!",
     "Please contact your administrator." : "Por favor, contacte o seu administrador.",
     "An internal error occurred." : "Ocorreu um erro interno.",
@@ -287,8 +287,8 @@
     "Oct." : "Out.",
     "Nov." : "Nov.",
     "Dec." : "Dez.",
+    "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?",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "A configuração dos headers do proxy reverso está incorreta, ou então está a aceder ao ownCloud através de um proxy de confiança. Se não está a aceder ao ownCloud através de um proxy de confiança, isto é um problema de segurança e poderá permitir a um invasor falsificar um endereço IP como visível para o ownCloud. Mais informação pode ser encontrada na nossa <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentação</a>.",
-    "Allow editing" : "Permitir edição",
     "Sending ..." : "A enviar...",
     "Email sent" : "Mensagem enviada",
     "Send link via email" : "Enviar hiperligação por mensagem",
@@ -308,7 +308,6 @@
     "Two-step verification" : "Verificação de dois passos:",
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "A segurança reforçada foi ativada para a sua conta. Por favor, autentique utilizando um segundo fator.",
     "Please authenticate using the selected factor." : "Por favor, autentique utilizando um segundo fator.",
-    "An error occured while verifying the token" : "Ocorreu um erro durante a verificação da senha",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Compartilhe com as pessoas nas outras ownClouds utilizando a sintaxe username@example.com/owncloud"
+    "An error occured while verifying the token" : "Ocorreu um erro durante a verificação da senha"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 6b277875762..9487a79c578 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -26,8 +26,8 @@ OC.L10N.register(
     "Repair error: " : "Ошибка восстановления:",
     "Please use the command line updater because automatic updating is disabled in the config.php." : "Пожалуйста, используйте обновление через командную строку, так как автоматические обновления отключены в config.php.",
     "[%d / %d]: Checking table %s" : "[%d / %d]: Проверка таблицы %s",
-    "Turned on maintenance mode" : "Режим обслуживания включён",
-    "Turned off maintenance mode" : "Режим обслуживания отключён",
+    "Turned on maintenance mode" : "Включён режим обслуживания ",
+    "Turned off maintenance mode" : "Отключён режим обслуживания",
     "Maintenance mode is kept active" : "Режим обслуживания оставлен включенным",
     "Updating database schema" : "Обновление схемы базы данных",
     "Updated database" : "База данных обновлена",
@@ -37,12 +37,12 @@ OC.L10N.register(
     "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Проверка возможности обновления схемы базы данных для %s (это может занять длительное время в зависимости от размера базы данных)",
     "Checked database schema update for apps" : "Проверено обновление схемы БД приложений",
     "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s",
-    "Set log level to debug" : "Установить журнал в режим отладки",
-    "Reset log level" : "Сбросить уровень журнала",
+    "Set log level to debug" : "Установлен отладочный уровень протоколирования",
+    "Reset log level" : "Сброс уровня протоколирования",
     "Starting code integrity check" : "Начинается проверка целостности кода",
     "Finished code integrity check" : "Проверка целостности кода завершина",
     "%s (3rdparty)" : "%s (стороннее)",
-    "%s (incompatible)" : "%s (несовместим)",
+    "%s (incompatible)" : "%s (несовместимое)",
     "Following apps have been disabled: %s" : "Были отключены следующие приложения: %s",
     "Already up to date" : "Не нуждается в обновлении",
     "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Были обнаружены проблемы с проверкой целостности кода. Подробнее ...",
@@ -51,14 +51,16 @@ OC.L10N.register(
     "Problem loading page, reloading in 5 seconds" : "Возникла проблема при загрузке страницы, повторная попытка через 5 секунд",
     "Saving..." : "Сохранение...",
     "Dismiss" : "Закрыть",
+    "This action requires you to confirm your password" : "Это действие требует подтверждения вашего пароля",
     "Authentication required" : "Требуется аутентификация ",
     "Password" : "Пароль",
     "Cancel" : "Отмена",
+    "Confirm" : "Подтвердить",
     "Failed to authenticate, try again" : "Ошибка аутентификации. Попробуйте снова.",
     "seconds ago" : "несколько секунд назад",
     "Logging in …" : "Вход в систему …",
     "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." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку со спамом.<br>Если письма там нет, то обратитесь к вашему администратору.",
-    "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?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?",
+    "Your files are encrypted. 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?" : "Ваши файлы зашифрованы. После сброса пароля ваши данные будут недоступны. .<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?",
     "I know what I'm doing" : "Я понимаю, что делаю",
     "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
     "No" : "Нет",
@@ -69,12 +71,12 @@ OC.L10N.register(
     "Ok" : "Ок",
     "Error loading message template: {error}" : "Ошибка загрузки шаблона сообщений: {error}",
     "read-only" : "только для чтения",
-    "_{count} file conflict_::_{count} file conflicts_" : ["{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах","{count} конфликтов в файлах"],
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах","{count} конфликтов файлов"],
     "One file conflict" : "Один конфликт в файлах",
     "New Files" : "Новые файлы",
     "Already existing files" : "Существующие файлы",
     "Which files do you want to keep?" : "Какие файлы вы хотите сохранить?",
-    "If you select both versions, the copied file will have a number added to its name." : "При выборе обеих версий, к названию копируемого файла будет добавлена цифра",
+    "If you select both versions, the copied file will have a number added to its name." : "При выборе обеих версий к названию копируемого файла будет добавлена цифра",
     "Continue" : "Продолжить",
     "(all selected)" : "(все выбранные)",
     "({count} selected)" : "(выбрано: {count})",
@@ -105,11 +107,11 @@ OC.L10N.register(
     "Error while sharing" : "При попытке поделиться произошла ошибка",
     "Error while unsharing" : "При закрытии доступа произошла ошибка",
     "Error setting expiration date" : "Ошибка при установке срока доступа",
-    "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней после её создания",
+    "The public link will expire no later than {days} days after it is created" : "Срок действия общедоступной ссылки истекает не позже чем через {days} дней после её создания",
     "Set expiration date" : "Установить срок действия",
     "Expiration" : "Срок действия",
     "Expiration date" : "Дата окончания",
-    "Choose a password for the public link" : "Укажите пароль для публичной ссылки",
+    "Choose a password for the public link" : "Укажите пароль для общедоступной ссылки",
     "Copied!" : "Скопировано!",
     "Copy" : "Копировать",
     "Not supported!" : "Не поддерживается!",
@@ -120,6 +122,8 @@ OC.L10N.register(
     "Link" : "Ссылка",
     "Password protect" : "Защитить паролем",
     "Allow upload and editing" : "Разрешить загрузку и редактирование",
+    "Allow editing" : "Разрешить редактирование",
+    "File drop (upload only)" : "Хранилище (только для приема файлов)",
     "Email link to person" : "Отправить ссылку по электронной почте",
     "Send" : "Отправить",
     "Shared with you and the group {group} by {owner}" : "{owner} поделился с вами и группой {group} ",
@@ -127,9 +131,10 @@ OC.L10N.register(
     "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} поделился через ссылку",
     "group" : "группа",
     "remote" : "удаленный",
+    "email" : "email",
     "Unshare" : "Закрыть доступ",
     "can reshare" : "можно опубликовать",
-    "can edit" : "может редактировать",
+    "can edit" : "можно редактировать",
     "can create" : "можно создавать",
     "can change" : "можно изменять",
     "can delete" : "можно удалять",
@@ -141,11 +146,16 @@ OC.L10N.register(
     "An error occurred. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
     "{sharee} (group)" : "{sharee} (группа)",
     "{sharee} (remote)" : "{sharee} (удалённо)",
+    "{sharee} (email)" : "{sharee} (email)",
     "Share" : "Поделиться",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Поделиться с людьми на других серверах используя Federated Cloud ID username@example.com/nextcloud",
+    "Share with users or by mail..." : "Поделиться с пользователями или по почте...",
     "Share with users or remote users..." : "Общий доступ с пользователями или удаленными пользователями",
+    "Share with users, remote users or by mail..." : "Поделиться с пользователями, удалеными пользователями или по почте...",
     "Share with users or groups..." : "Общий доступ с пользователями или группами",
+    "Share with users, groups or by mail..." : "Поделиться с пользователями, группами или по почте...",
     "Share with users, groups or remote users..." : "Поделиться с пользователями, группами или удаленными пользователями...",
+    "Share with users, groups, remote users or by mail..." : "Поделиться с пользователями, группами, удалёнными пользователями или по почте...",
     "Share with users..." : "Поделиться с пользователями...",
     "Error removing share" : "Ошибка удаления общего доступа",
     "Non-existing tag #{tag}" : "Несуществующий тег #{tag}",
@@ -203,7 +213,7 @@ OC.L10N.register(
     "Code: %s" : "Код: %s",
     "Message: %s" : "Сообщение: %s",
     "File: %s" : "Файл: %s",
-    "Line: %s" : "Линия: %s",
+    "Line: %s" : "Строка: %s",
     "Trace" : "Трассировка",
     "Security warning" : "Предупреждение безопасности",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Правила файла .htaccess не выполняются. Возможно, каталог данных и файлы свободно доступны из интернета.",
@@ -221,6 +231,7 @@ OC.L10N.register(
     "Database name" : "Название базы данных",
     "Database tablespace" : "Табличое пространство базы данных",
     "Database host" : "Хост базы данных",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Пожалуйста укажите номер порта вместе с именем хоста (напр. localhost:5432)",
     "Performance warning" : "Предупреждение о производительности",
     "SQLite will be used as database." : "В качестве базы данных будет использована SQLite.",
     "For larger installations we recommend to choose a different database backend." : "Для крупных проектов мы советуем выбрать другой тип базы данных.",
@@ -230,8 +241,10 @@ OC.L10N.register(
     "Need help?" : "Нужна помощь?",
     "See the documentation" : "Посмотреть документацию",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Для корректной работы приложения требуется JavaScript. Пожалуйста, {linkstart}включите JavaScript{linkend} и обновите страницу.",
-    "Log out" : "Выйти",
     "Search" : "Найти",
+    "Log out" : "Выйти",
+    "This action requires you to confirm your password:" : "Это действие требует подтверждения вашего пароля:",
+    "Confirm your password" : "Подтвердите свой пароль",
     "Server side authentication failed!" : "Ошибка аутентификации на стороне сервера!",
     "Please contact your administrator." : "Пожалуйста, обратитесь к администратору.",
     "An internal error occurred." : "Произошла внутренняя ошибка.",
@@ -268,7 +281,7 @@ OC.L10N.register(
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продолжением убедитесь, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.",
     "Start update" : "Запустить обновление",
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать тайм-аутов в крупных установках, вместо этого можно выполнить следующую команду в каталоге установки:",
-    "Detailed logs" : "Подбробные логи",
+    "Detailed logs" : "Подробные журналы",
     "Update needed" : "Требуется обновление",
     "Please use the command line updater because you have a big instance." : "Пожалуйста, используйте обновление через командную строку, так как данная установка имеет большой размер.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Для помощи, ознакомьтесь с  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документацией</a>.",
@@ -327,14 +340,14 @@ OC.L10N.register(
     "Oct." : "Окт.",
     "Nov." : "Ноя.",
     "Dec." : "Дек.",
+    "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?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?",
     "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." : "Этот сервер не имеет подключения к Интернету. Это означает, что некоторые из функций, таких как внешнее хранилище, уведомления об обновлениях и установка сторонних приложений не будут работать. Доступ к файлам удаленно и отправки уведомлений по почте могут не работать. Рекомендуется разрешить данному серверу доступ в Интернет если хотите, чтобы все функции работали.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Конфигурация заголовков обратного прокси не верна, либо доступ к nextCloud осуществлён через доверенный прокси. Если nextCloud открыт не через доверенный прокси то это проблема безопасности, которая может позволить атакующему подделать IP адрес, который видит nextCloud. Дополнительная информация доступна в нашей  <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документации</a>.",
-    "Allow editing" : "Разрешить редактирование",
     "Hide file listing" : "Скрыть список файлов",
     "Sending ..." : "Отправляется ...",
     "Email sent" : "Письмо отправлено",
     "Send link via email" : "Отправить ссылку по электронной почте",
-    "notify by email" : "уведомить по почте",
+    "notify by email" : "уведомить по эл. почте",
     "can share" : "может делиться с другими",
     "create" : "создать",
     "change" : "изменить",
@@ -349,25 +362,11 @@ OC.L10N.register(
     "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Идет процесс обновления. Не покидайте эту страницу во избежание поломок.",
     "Updating to {version}" : "Обновление до версии {version}",
     "The update was successful. There were warnings." : "Обновление прошло успешно. Есть предупреждения.",
-    "No search results in other folders" : "В других папках ничего не найдено",
+    "No search results in other folders" : "В других каталогах ничего не найдено",
     "Two-step verification" : "Двухшаговая проверка",
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Для вашей учётной записи включена повышенная безопасность. Пожалуйста, аутентифицируйтесь через второй фактор.",
     "Cancel login" : "Отменить вход",
     "Please authenticate using the selected factor." : "Пожалуйста, аутентифицируйтесь выбранным фактором.",
-    "An error occured while verifying the token" : "При проверке токена возникла ошибка.",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ваш веб-сервер настроен некорректно для разрешения \"{url}\". Для получения дополнительной информации смотрите нашу <a target=\"_blank\" href=\"{docLink}\">документацию</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Не настроена система кеширования. Для увеличения производительности сервера настройте memcache. Для получения дополнительной информации смотрите нашу <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "PHP не имеет прав на чтение /dev/urandom, что негативно влияет на безопасность. Для получения дополнительной информации смотрите нашу <a target=\"_blank\" href=\"{docLink}\">документацию</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Используется PHP {version}. Рекомендуется обновить PHP, чтобы воспользоваться <a target=\"_blank\" href=\"{phpLink}\">улучшениями производительности и безопасности, внедрёнными PHP Group</a>, как только новая версия будет доступна в вашем дистрибутиве. ",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Заголовки обратного прокси настроены неправильно, либо вы пытаетесь получить доступ к NextCloud через доверенный прокси. Если NextCloud открыт не через доверенный прокси, это проблема безопасности, которая может позволить атакующему подделать IP-адрес, который видит NextCloud. Для получения дополнительной информации смотрите нашу <a target=\"_blank\" href=\"{docLink}\">документацию</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached настроен на распределенный кеш, но установлен не поддерживаемый модуль PHP \"memcache\". \\OC\\Memcache\\Memcached поддерживает только модуль \"memcached\", но не \"memcache\". Смотрите <a target=\"_blank\" href=\"{wikiLink}\">wiki-страницу memcached</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Некоторые файлы не прошли проверку целостности. Для получения дополнительной информации о том, как устранить данную проблему, смотрите нашу <a target=\"_blank\" href=\"{docLink}\">документацию</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Список проблемных файлов…</a> / <a href=\"{rescanEndpoint}\">Сканировать ещё раз…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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>.",
-    "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах nextCloud используя формат username@example.com/nextcloud",
-    "not assignable" : "Невозможно присвоить",
-    "Updating {productName} to version {version}, this may take a while." : "Обновляем {productName} до версии {version}. Это может занять некоторое время.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Чтобы узнать, как правильно настроить ваш сервер, смотрите <a href=\"%s\" target=\"_blank\">документацию</a>.",
-    "An internal error occured." : "Произошла ошибка сервера."
+    "An error occured while verifying the token" : "При проверке токена возникла ошибка."
 },
 "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/core/l10n/ru.json b/core/l10n/ru.json
index 0c8d22fabaa..0644b0af787 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -24,8 +24,8 @@
     "Repair error: " : "Ошибка восстановления:",
     "Please use the command line updater because automatic updating is disabled in the config.php." : "Пожалуйста, используйте обновление через командную строку, так как автоматические обновления отключены в config.php.",
     "[%d / %d]: Checking table %s" : "[%d / %d]: Проверка таблицы %s",
-    "Turned on maintenance mode" : "Режим обслуживания включён",
-    "Turned off maintenance mode" : "Режим обслуживания отключён",
+    "Turned on maintenance mode" : "Включён режим обслуживания ",
+    "Turned off maintenance mode" : "Отключён режим обслуживания",
     "Maintenance mode is kept active" : "Режим обслуживания оставлен включенным",
     "Updating database schema" : "Обновление схемы базы данных",
     "Updated database" : "База данных обновлена",
@@ -35,12 +35,12 @@
     "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Проверка возможности обновления схемы базы данных для %s (это может занять длительное время в зависимости от размера базы данных)",
     "Checked database schema update for apps" : "Проверено обновление схемы БД приложений",
     "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s",
-    "Set log level to debug" : "Установить журнал в режим отладки",
-    "Reset log level" : "Сбросить уровень журнала",
+    "Set log level to debug" : "Установлен отладочный уровень протоколирования",
+    "Reset log level" : "Сброс уровня протоколирования",
     "Starting code integrity check" : "Начинается проверка целостности кода",
     "Finished code integrity check" : "Проверка целостности кода завершина",
     "%s (3rdparty)" : "%s (стороннее)",
-    "%s (incompatible)" : "%s (несовместим)",
+    "%s (incompatible)" : "%s (несовместимое)",
     "Following apps have been disabled: %s" : "Были отключены следующие приложения: %s",
     "Already up to date" : "Не нуждается в обновлении",
     "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\"> Были обнаружены проблемы с проверкой целостности кода. Подробнее ...",
@@ -49,14 +49,16 @@
     "Problem loading page, reloading in 5 seconds" : "Возникла проблема при загрузке страницы, повторная попытка через 5 секунд",
     "Saving..." : "Сохранение...",
     "Dismiss" : "Закрыть",
+    "This action requires you to confirm your password" : "Это действие требует подтверждения вашего пароля",
     "Authentication required" : "Требуется аутентификация ",
     "Password" : "Пароль",
     "Cancel" : "Отмена",
+    "Confirm" : "Подтвердить",
     "Failed to authenticate, try again" : "Ошибка аутентификации. Попробуйте снова.",
     "seconds ago" : "несколько секунд назад",
     "Logging in …" : "Вход в систему …",
     "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." : "Ссылка для сброса пароля была отправлена на ваш email. Если вы не получили письмо в течении разумного промежутка времени, проверьте папку со спамом.<br>Если письма там нет, то обратитесь к вашему администратору.",
-    "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?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?",
+    "Your files are encrypted. 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?" : "Ваши файлы зашифрованы. После сброса пароля ваши данные будут недоступны. .<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?",
     "I know what I'm doing" : "Я понимаю, что делаю",
     "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
     "No" : "Нет",
@@ -67,12 +69,12 @@
     "Ok" : "Ок",
     "Error loading message template: {error}" : "Ошибка загрузки шаблона сообщений: {error}",
     "read-only" : "только для чтения",
-    "_{count} file conflict_::_{count} file conflicts_" : ["{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах","{count} конфликтов в файлах"],
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах","{count} конфликтов файлов"],
     "One file conflict" : "Один конфликт в файлах",
     "New Files" : "Новые файлы",
     "Already existing files" : "Существующие файлы",
     "Which files do you want to keep?" : "Какие файлы вы хотите сохранить?",
-    "If you select both versions, the copied file will have a number added to its name." : "При выборе обеих версий, к названию копируемого файла будет добавлена цифра",
+    "If you select both versions, the copied file will have a number added to its name." : "При выборе обеих версий к названию копируемого файла будет добавлена цифра",
     "Continue" : "Продолжить",
     "(all selected)" : "(все выбранные)",
     "({count} selected)" : "(выбрано: {count})",
@@ -103,11 +105,11 @@
     "Error while sharing" : "При попытке поделиться произошла ошибка",
     "Error while unsharing" : "При закрытии доступа произошла ошибка",
     "Error setting expiration date" : "Ошибка при установке срока доступа",
-    "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней после её создания",
+    "The public link will expire no later than {days} days after it is created" : "Срок действия общедоступной ссылки истекает не позже чем через {days} дней после её создания",
     "Set expiration date" : "Установить срок действия",
     "Expiration" : "Срок действия",
     "Expiration date" : "Дата окончания",
-    "Choose a password for the public link" : "Укажите пароль для публичной ссылки",
+    "Choose a password for the public link" : "Укажите пароль для общедоступной ссылки",
     "Copied!" : "Скопировано!",
     "Copy" : "Копировать",
     "Not supported!" : "Не поддерживается!",
@@ -118,6 +120,8 @@
     "Link" : "Ссылка",
     "Password protect" : "Защитить паролем",
     "Allow upload and editing" : "Разрешить загрузку и редактирование",
+    "Allow editing" : "Разрешить редактирование",
+    "File drop (upload only)" : "Хранилище (только для приема файлов)",
     "Email link to person" : "Отправить ссылку по электронной почте",
     "Send" : "Отправить",
     "Shared with you and the group {group} by {owner}" : "{owner} поделился с вами и группой {group} ",
@@ -125,9 +129,10 @@
     "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} поделился через ссылку",
     "group" : "группа",
     "remote" : "удаленный",
+    "email" : "email",
     "Unshare" : "Закрыть доступ",
     "can reshare" : "можно опубликовать",
-    "can edit" : "может редактировать",
+    "can edit" : "можно редактировать",
     "can create" : "можно создавать",
     "can change" : "можно изменять",
     "can delete" : "можно удалять",
@@ -139,11 +144,16 @@
     "An error occurred. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
     "{sharee} (group)" : "{sharee} (группа)",
     "{sharee} (remote)" : "{sharee} (удалённо)",
+    "{sharee} (email)" : "{sharee} (email)",
     "Share" : "Поделиться",
     "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Поделиться с людьми на других серверах используя Federated Cloud ID username@example.com/nextcloud",
+    "Share with users or by mail..." : "Поделиться с пользователями или по почте...",
     "Share with users or remote users..." : "Общий доступ с пользователями или удаленными пользователями",
+    "Share with users, remote users or by mail..." : "Поделиться с пользователями, удалеными пользователями или по почте...",
     "Share with users or groups..." : "Общий доступ с пользователями или группами",
+    "Share with users, groups or by mail..." : "Поделиться с пользователями, группами или по почте...",
     "Share with users, groups or remote users..." : "Поделиться с пользователями, группами или удаленными пользователями...",
+    "Share with users, groups, remote users or by mail..." : "Поделиться с пользователями, группами, удалёнными пользователями или по почте...",
     "Share with users..." : "Поделиться с пользователями...",
     "Error removing share" : "Ошибка удаления общего доступа",
     "Non-existing tag #{tag}" : "Несуществующий тег #{tag}",
@@ -201,7 +211,7 @@
     "Code: %s" : "Код: %s",
     "Message: %s" : "Сообщение: %s",
     "File: %s" : "Файл: %s",
-    "Line: %s" : "Линия: %s",
+    "Line: %s" : "Строка: %s",
     "Trace" : "Трассировка",
     "Security warning" : "Предупреждение безопасности",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Правила файла .htaccess не выполняются. Возможно, каталог данных и файлы свободно доступны из интернета.",
@@ -219,6 +229,7 @@
     "Database name" : "Название базы данных",
     "Database tablespace" : "Табличое пространство базы данных",
     "Database host" : "Хост базы данных",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Пожалуйста укажите номер порта вместе с именем хоста (напр. localhost:5432)",
     "Performance warning" : "Предупреждение о производительности",
     "SQLite will be used as database." : "В качестве базы данных будет использована SQLite.",
     "For larger installations we recommend to choose a different database backend." : "Для крупных проектов мы советуем выбрать другой тип базы данных.",
@@ -228,8 +239,10 @@
     "Need help?" : "Нужна помощь?",
     "See the documentation" : "Посмотреть документацию",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Для корректной работы приложения требуется JavaScript. Пожалуйста, {linkstart}включите JavaScript{linkend} и обновите страницу.",
-    "Log out" : "Выйти",
     "Search" : "Найти",
+    "Log out" : "Выйти",
+    "This action requires you to confirm your password:" : "Это действие требует подтверждения вашего пароля:",
+    "Confirm your password" : "Подтвердите свой пароль",
     "Server side authentication failed!" : "Ошибка аутентификации на стороне сервера!",
     "Please contact your administrator." : "Пожалуйста, обратитесь к администратору.",
     "An internal error occurred." : "Произошла внутренняя ошибка.",
@@ -266,7 +279,7 @@
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перед продолжением убедитесь, что вы сделали резервную копию базы данных, каталога конфигурации и каталога с данными.",
     "Start update" : "Запустить обновление",
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать тайм-аутов в крупных установках, вместо этого можно выполнить следующую команду в каталоге установки:",
-    "Detailed logs" : "Подбробные логи",
+    "Detailed logs" : "Подробные журналы",
     "Update needed" : "Требуется обновление",
     "Please use the command line updater because you have a big instance." : "Пожалуйста, используйте обновление через командную строку, так как данная установка имеет большой размер.",
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "Для помощи, ознакомьтесь с  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">документацией</a>.",
@@ -325,14 +338,14 @@
     "Oct." : "Окт.",
     "Nov." : "Ноя.",
     "Dec." : "Дек.",
+    "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?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к вашему администратору.<br />Вы действительно хотите продолжить?",
     "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." : "Этот сервер не имеет подключения к Интернету. Это означает, что некоторые из функций, таких как внешнее хранилище, уведомления об обновлениях и установка сторонних приложений не будут работать. Доступ к файлам удаленно и отправки уведомлений по почте могут не работать. Рекомендуется разрешить данному серверу доступ в Интернет если хотите, чтобы все функции работали.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Конфигурация заголовков обратного прокси не верна, либо доступ к nextCloud осуществлён через доверенный прокси. Если nextCloud открыт не через доверенный прокси то это проблема безопасности, которая может позволить атакующему подделать IP адрес, который видит nextCloud. Дополнительная информация доступна в нашей  <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">документации</a>.",
-    "Allow editing" : "Разрешить редактирование",
     "Hide file listing" : "Скрыть список файлов",
     "Sending ..." : "Отправляется ...",
     "Email sent" : "Письмо отправлено",
     "Send link via email" : "Отправить ссылку по электронной почте",
-    "notify by email" : "уведомить по почте",
+    "notify by email" : "уведомить по эл. почте",
     "can share" : "может делиться с другими",
     "create" : "создать",
     "change" : "изменить",
@@ -347,25 +360,11 @@
     "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Идет процесс обновления. Не покидайте эту страницу во избежание поломок.",
     "Updating to {version}" : "Обновление до версии {version}",
     "The update was successful. There were warnings." : "Обновление прошло успешно. Есть предупреждения.",
-    "No search results in other folders" : "В других папках ничего не найдено",
+    "No search results in other folders" : "В других каталогах ничего не найдено",
     "Two-step verification" : "Двухшаговая проверка",
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Для вашей учётной записи включена повышенная безопасность. Пожалуйста, аутентифицируйтесь через второй фактор.",
     "Cancel login" : "Отменить вход",
     "Please authenticate using the selected factor." : "Пожалуйста, аутентифицируйтесь выбранным фактором.",
-    "An error occured while verifying the token" : "При проверке токена возникла ошибка.",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ваш веб-сервер настроен некорректно для разрешения \"{url}\". Для получения дополнительной информации смотрите нашу <a target=\"_blank\" href=\"{docLink}\">документацию</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Не настроена система кеширования. Для увеличения производительности сервера настройте memcache. Для получения дополнительной информации смотрите нашу <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "PHP не имеет прав на чтение /dev/urandom, что негативно влияет на безопасность. Для получения дополнительной информации смотрите нашу <a target=\"_blank\" href=\"{docLink}\">документацию</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Используется PHP {version}. Рекомендуется обновить PHP, чтобы воспользоваться <a target=\"_blank\" href=\"{phpLink}\">улучшениями производительности и безопасности, внедрёнными PHP Group</a>, как только новая версия будет доступна в вашем дистрибутиве. ",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Заголовки обратного прокси настроены неправильно, либо вы пытаетесь получить доступ к NextCloud через доверенный прокси. Если NextCloud открыт не через доверенный прокси, это проблема безопасности, которая может позволить атакующему подделать IP-адрес, который видит NextCloud. Для получения дополнительной информации смотрите нашу <a target=\"_blank\" href=\"{docLink}\">документацию</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached настроен на распределенный кеш, но установлен не поддерживаемый модуль PHP \"memcache\". \\OC\\Memcache\\Memcached поддерживает только модуль \"memcached\", но не \"memcache\". Смотрите <a target=\"_blank\" href=\"{wikiLink}\">wiki-страницу memcached</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Некоторые файлы не прошли проверку целостности. Для получения дополнительной информации о том, как устранить данную проблему, смотрите нашу <a target=\"_blank\" href=\"{docLink}\">документацию</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Список проблемных файлов…</a> / <a href=\"{rescanEndpoint}\">Сканировать ещё раз…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at 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>.",
-    "An error occured. Please try again" : "Произошла ошибка. Попробуйте ещё раз",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поделиться с людьми на других серверах nextCloud используя формат username@example.com/nextcloud",
-    "not assignable" : "Невозможно присвоить",
-    "Updating {productName} to version {version}, this may take a while." : "Обновляем {productName} до версии {version}. Это может занять некоторое время.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Чтобы узнать, как правильно настроить ваш сервер, смотрите <a href=\"%s\" target=\"_blank\">документацию</a>.",
-    "An internal error occured." : "Произошла ошибка сервера."
+    "An error occured while verifying the token" : "При проверке токена возникла ошибка."
 },"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);"
 }
\ No newline at end of file
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
new file mode 100644
index 00000000000..0b1e2d05f07
--- /dev/null
+++ b/core/l10n/sk_SK.js
@@ -0,0 +1,321 @@
+OC.L10N.register(
+    "core",
+    {
+    "Please select a file." : "Prosím, vyberte súbor.",
+    "File is too big" : "Súbor je príliš veľký",
+    "The selected file is not an image." : "Vybraný súbor nie je obrázok.",
+    "The selected file cannot be read." : "Vybraný súbor nie je možné čítať.",
+    "Invalid file provided" : "Zadaný neplatný súbor",
+    "No image or file provided" : "Obrázok alebo súbor nebol zadaný",
+    "Unknown filetype" : "Neznámy typ súboru",
+    "Invalid image" : "Chybný obrázok",
+    "An error occurred. Please contact your admin." : "Vyskytla sa chyba.\nProsím, kontaktujte svojho správcu.\n\t",
+    "No temporary profile picture available, try again" : "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu",
+    "No crop data provided" : "Dáta pre orezanie neboli zadané",
+    "No valid crop data provided" : "Neplatné dáta pre orezanie neboli zadané",
+    "Crop is not square" : "Orezanie nie je štvorcové",
+    "Couldn't reset password because the token is invalid" : "Nemožno zmeniť heslo pre neplatnosť tokenu.",
+    "Couldn't reset password because the token is expired" : "Nepodarilo sa obnoviť heslo, pretože platnosť tokenu uplynula.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nemožno poslať email pre obnovu. Uistite sa, či vkladáte správne používateľské meno.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu, lebo pre zadaného používateľa neexistuje emailová adresa. Kontaktujte prosím vášho administrátora.",
+    "%s password reset" : "reset hesla %s",
+    "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
+    "Preparing update" : "Pripravuje sa aktualizácia",
+    "Repair warning: " : "Oznámenie opravy:",
+    "Repair error: " : "Chyba opravy:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Automatická aktualizácia je zakázaná v config.php, použite prosím aktualizáciu cez príkazový riadok.",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Kontrola tabuľky %s",
+    "Turned on maintenance mode" : "Mód údržby je zapnutý",
+    "Turned off maintenance mode" : "Mód údržby je vypnutý",
+    "Maintenance mode is kept active" : "Režim údržby je stále aktívny",
+    "Updating database schema" : "Aktualizuje sa schéma databázy",
+    "Updated database" : "Databáza je aktualizovaná",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Kontroluje sa, či je možné aktualizovať schému databázy (to môže trvať dlhší čas v závislosti na veľkosti databázy)",
+    "Checked database schema update" : "Skontrolovať aktualizáciu schémy databázy",
+    "Checking updates of apps" : "Kontrolujú sa aktualizácie aplikácií",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Kontroluje sa, či je možné aktualizovať schému databázy pre %s (to môže trvať dlhší čas v závislosti na veľkosti databázy)",
+    "Checked database schema update for apps" : "Aktualizácia schémy databázy aplikácií bola overená",
+    "Updated \"%s\" to %s" : "Aktualizované \"%s\" na %s",
+    "Set log level to debug" : "Nastaviť úroveň záznamu na ladenie",
+    "Reset log level" : "Obnoviť úroveň záznamu",
+    "Starting code integrity check" : "Začína kontrola integrity kódu",
+    "Finished code integrity check" : "Kontrola integrity kódu ukončená",
+    "%s (3rdparty)" : "%s (od tretej strany)",
+    "%s (incompatible)" : "%s (nekompatibilná)",
+    "Following apps have been disabled: %s" : "Nasledovné aplikácie boli zakázané: %s",
+    "Already up to date" : "Už aktuálne",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Pri kontrole integrity kódu sa vyskytli chyby. Viac informácií…</a>",
+    "Settings" : "Nastavenia",
+    "Connection to server lost" : "Stratené spojenie so serverom",
+    "Problem loading page, reloading in 5 seconds" : "Nastal problém pri načítaní stránky, pokus sa zopakuje o 5 sekúnd",
+    "Saving..." : "Ukladám...",
+    "Dismiss" : "Odmietnuť",
+    "This action requires you to confirm your password" : "Táto akcia vyžaduje potvrdenie vášho hesla",
+    "Authentication required" : "Vyžaduje sa overenie",
+    "Password" : "Heslo",
+    "Cancel" : "Zrušiť",
+    "Confirm" : "Potvrdiť",
+    "Failed to authenticate, try again" : "Nastal problém pri overení, skúste znova",
+    "seconds ago" : "pred sekundami",
+    "Logging in …" : "Prihlasujem ...",
+    "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." : "Odkaz na obnovu hesla bol odoslaný na váš email. Pokiaľ ho neobdržíte v primeranom čase, skontrolujte spam / priečinok nevyžiadanej pošty. <br> Ak tam nie je, kontaktujte svojho administrátora.",
+    "I know what I'm doing" : "Viem, čo robím",
+    "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
+    "No" : "Nie",
+    "Yes" : "Áno",
+    "No files in here" : "Nie sú tu žiadne súbory",
+    "Choose" : "Vybrať",
+    "Error loading file picker template: {error}" : "Chyba pri nahrávaní šablóny výberu súborov: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Chyba pri nahrávaní šablóny správy: {error}",
+    "read-only" : "iba na čítanie",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"],
+    "One file conflict" : "Jeden konflikt súboru",
+    "New Files" : "Nové súbory",
+    "Already existing files" : "Už existujúce súbory",
+    "Which files do you want to keep?" : "Ktoré súbory chcete ponechať?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo.",
+    "Continue" : "Pokračovať",
+    "(all selected)" : "(všetko vybrané)",
+    "({count} selected)" : "({count} vybraných)",
+    "Error loading file exists template" : "Chyba pri nahrávaní šablóny existencie súboru",
+    "Pending" : "Čaká",
+    "Very weak password" : "Veľmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Priemerné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Váš webový server nie je zatiaľ správne nastavený, aby umožnil synchronizáciu súborov, pretože rozhranie WebDAV sa zdá byť nefunkčné.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "dev/urandom nie je prístupný na čítanie procesom PHP, čo z bezpečnostných dôvodov nie je vôbec odporúčané. Viac informácií nájdete v našej <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentácii</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached je nakonfigurovaný ako distribuovaná vyrovnávacia pamäť, ale v PHP je nainštalovaný nesprávny modul - \"memcache\". \\OC\\Memcache\\Memcached podporuje len modul \"memcached\", \"memcache\" nie je podporovaný. Viac informácií nájdete na <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki stránke o oboch moduloch</a>.",
+    "Error occurred while checking server setup" : "Počas kontroly nastavenia serveru sa stala chyba",
+    "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áš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Dôrazne odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný alebo presunúť priečinok s dátami mimo priestoru, ktorý webový server sprístupňuje.",
+    "Shared" : "Sprístupnené",
+    "Shared with {recipients}" : "Sprístupnené {recipients}",
+    "Error" : "Chyba",
+    "Error while sharing" : "Chyba počas sprístupňovania",
+    "Error while unsharing" : "Chyba počas odobratia sprístupnenia",
+    "Error setting expiration date" : "Chyba pri nastavení dátumu expirácie",
+    "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í",
+    "Set expiration date" : "Nastaviť dátum expirácie",
+    "Expiration" : "Koniec platnosti",
+    "Expiration date" : "Dátum expirácie",
+    "Choose a password for the public link" : "Zadajte heslo pre tento verejný odkaz",
+    "Copied!" : "Skopírované!",
+    "Copy" : "Kopírovať",
+    "Not supported!" : "Nie je podporované!",
+    "Press ⌘-C to copy." : "Stlač ⌘-C pre skopírovanie.",
+    "Press Ctrl-C to copy." : "Stlač Ctrl-C pre skopírovanie.",
+    "Resharing is not allowed" : "Sprístupnenie už sprístupnenej položky nie je povolené",
+    "Share link" : "Sprístupniť odkaz",
+    "Link" : "Odkaz",
+    "Password protect" : "Chrániť heslom",
+    "Allow upload and editing" : "Povoliť nahratie a úpravy",
+    "Allow editing" : "Povoliť úpravy",
+    "Email link to person" : "Odoslať odkaz emailom",
+    "Send" : "Odoslať",
+    "Shared with you and the group {group} by {owner}" : "Sprístupnené vám a skupine {group} používateľom {owner}",
+    "Shared with you by {owner}" : "Sprístupnené vám používateľom {owner}",
+    "group" : "skupina",
+    "remote" : "vzdialený",
+    "Unshare" : "Zneprístupniť",
+    "can edit" : "môže upraviť",
+    "can create" : "môže vytvoriť",
+    "can change" : "môže zmeniť",
+    "can delete" : "môže odstrániť",
+    "access control" : "prístupové práva",
+    "Could not unshare" : "Nepodarilo sa zrušiť sprístupnenie",
+    "Share details could not be loaded for this item." : "Nebolo možné načítať údaje o sprístupnení tejto položky.",
+    "An error occurred. Please try again" : "Nastala chyba. Skúste to prosím znovu",
+    "Share" : "Sprístupniť",
+    "Share with users or remote users..." : "Sprístupniť používateľom alebo vzdialeným používateľom...",
+    "Share with users or groups..." : "Sprístupniť používateľom alebo skupinám",
+    "Share with users, groups or remote users..." : "Sprístupniť používateľom, skupinám alebo vzdialeným používateľom...",
+    "Share with users..." : "Sprístupniť používateľom...",
+    "Error removing share" : "Chyba pri rušení sprístupnenia",
+    "restricted" : "obmedzený",
+    "invisible" : "neviditeľný",
+    "Delete" : "Zmazať",
+    "Rename" : "Premenovať",
+    "No tags found" : "Štítky sa nenašli",
+    "The object type is not specified." : "Nešpecifikovaný typ objektu.",
+    "Enter new" : "Zadať nový",
+    "Add" : "Pridať",
+    "Edit tags" : "Upraviť štítky",
+    "Error loading dialog template: {error}" : "Chyba pri načítaní šablóny dialógu: {error}",
+    "No tags selected for deletion." : "Nie sú vybraté štítky na zmazanie.",
+    "unknown text" : "neznámy text",
+    "Hello world!" : "Ahoj svet!",
+    "sunny" : "slnečno",
+    "Hello {name}, the weather is {weather}" : "Dobrý deň {name}, počasie je {weather}",
+    "Hello {name}" : "Vitaj {name}",
+    "new" : "nový",
+    "_download %n file_::_download %n files_" : ["stiahnuť %n súbor","stiahnuť %n súbory","stiahnuť %n súborov"],
+    "Update to {version}" : "Aktualizuj na {version}",
+    "An error occurred." : "Vyskytla sa chyba.",
+    "Please reload the page." : "Obnovte prosím stránku.",
+    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Aktualizácia neprebehla úspešne. Pre viac informácií <a href=\"{url}\">navštívte príspevok na našom fóre</a>, ktorý pokrýva tento problém.",
+    "Continue to Nextcloud" : "Pokračovať na Nextcloud",
+    "The update was successful. Redirecting you to Nextcloud now." : "Aktualizácia bola úspešná. Presmerovávam na Nextcloud.",
+    "Searching other places" : "Prehľadanie ostatných umiestnení",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} výsledok vyhľadávania v ostatných priečinkoch","{count} výsledky vyhľadávania v ostatných priečinkoch","{count} výsledkov vyhľadávania v ostatných priečinkoch"],
+    "Personal" : "Osobné",
+    "Users" : "Používatelia",
+    "Apps" : "Aplikácie",
+    "Admin" : "Administrácia",
+    "Help" : "Pomoc",
+    "Access forbidden" : "Prístup odmietnutý",
+    "File not found" : "Súbor nenájdený",
+    "The specified document has not been found on the server." : "Zadaný dokument nebol nájdený na serveri.",
+    "You can click here to return to %s." : "Kliknite tu pre návrat do %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Dobrý deň,\n\npoužívateľ %s Vám sprístupnil položku s názvom %s.\nPre zobrazenie kliknite na odkaz: %s\n",
+    "The share will expire on %s." : "Sprístupnenie vyprší %s.",
+    "Cheers!" : "Pekný deň!",
+    "Internal Server Error" : "Vnútorná chyba servera",
+    "The server encountered an internal error and was unable to complete your request." : "Na serveri došlo k vnútornej chybe a nebol schopný dokončiť vašu požiadavku.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Obráťte sa na správcu servera, ak sa táto chyba objaví znovu viackrát, uveďte nižšie zobrazené technické údaje vo svojej správe.",
+    "More details can be found in the server log." : "Viac nájdete v logu servera.",
+    "Technical details" : "Technické podrobnosti",
+    "Remote Address: %s" : "Vzdialená adresa: %s",
+    "Request ID: %s" : "ID požiadavky: %s",
+    "Type: %s" : "Typ: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Správa: %s",
+    "File: %s" : "Súbor: %s",
+    "Line: %s" : "Riadok: %s",
+    "Trace" : "Trasa",
+    "Security warning" : "Bezpečnostné varovanie",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
+    "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
+    "Username" : "Meno používateľa",
+    "Storage & database" : "Úložislo & databáza",
+    "Data folder" : "Priečinok dát",
+    "Configure the database" : "Nastaviť databázu",
+    "Only %s is available." : "Len %s je dostupný.",
+    "Install and activate additional PHP modules to choose other database types." : "Pri výbere iného typu databázy bude potrebné nainštalovať a aktivovať ďalšie PHP moduly.",
+    "For more details check out the documentation." : "Viac informácií nájdete v dokumentácii.",
+    "Database user" : "Používateľ databázy",
+    "Database password" : "Heslo databázy",
+    "Database name" : "Meno databázy",
+    "Database tablespace" : "Tabuľkový priestor databázy",
+    "Database host" : "Server databázy",
+    "Performance warning" : "Varovanie o výkone",
+    "SQLite will be used as database." : "Bude použitá SQLite databáza.",
+    "For larger installations we recommend to choose a different database backend." : "Pre veľké inštalácie odporúčame vybrať si iné databázové riešenie.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Najmä pri používaní klientských aplikácií na synchronizáciu s desktopom neodporúčame používať SQLite.",
+    "Finish setup" : "Dokončiť inštaláciu",
+    "Finishing …" : "Dokončujem...",
+    "Need help?" : "Potrebujete pomoc?",
+    "See the documentation" : "Pozri dokumentáciu",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Táto aplikácia vyžaduje JavaScript, aby správne fungovala. Prosím, {linkstart}zapnite si JavaScript{linkend} a obnovte stránku",
+    "Search" : "Hľadať",
+    "Log out" : "Odhlásiť",
+    "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!",
+    "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.",
+    "An internal error occurred." : "Došlo k vnútornej chybe.",
+    "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.",
+    "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?",
+    "Wrong password." : "Nesprávne heslo.",
+    "Log in" : "Prihlásiť sa",
+    "Stay logged in" : "Zostať prihlásený",
+    "Alternative Logins" : "Alternatívne prihlásenie",
+    "Use the following link to reset your password: {link}" : "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
+    "New password" : "Nové heslo",
+    "New Password" : "Nové heslo",
+    "Reset password" : "Obnovenie hesla",
+    "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 Vám sprístupnil položku s názvom »%s«.<br><a href=\"%s\">Zobraziť!</a><br><br>",
+    "This Nextcloud instance is currently in single user mode." : "Táto inštancia Nextcloudu je teraz v jednopoužívateľskom móde.",
+    "This means only administrators can use the instance." : "Len správca systému môže používať túto inštanciu.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
+    "Thank you for your patience." : "Ďakujeme za Vašu trpezlivosť.",
+    "You are accessing the server from an untrusted domain." : "Pristupujete na server v nedôveryhodnej doméne.",
+    "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",
+    "App update required" : "Je nutná aktualizácia aplikácie",
+    "%s will be updated to version %s" : "%s bude zaktualizovaný na verziu %s.",
+    "These apps will be updated:" : "Tieto aplikácie budú aktualizované:",
+    "These incompatible apps will be disabled:" : "Tieto nekompatibilné aplikácie budú vypnuté:",
+    "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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Aby nedošlo k vypršaniu časového limitu vo väčších inštaláciách, môžete namiesto toho použiť nasledujúci príkaz z inštalačného priečinka:",
+    "Detailed logs" : "Podrobné záznamy",
+    "Update needed" : "Aktualizácia je potrebná",
+    "Please use the command line updater because you have a big instance." : "Vaša inštancia je veľká, použite prosím aktualizáciu cez príkazový riadok.",
+    "This %s instance is currently in maintenance mode, which may take a while." : "Táto %s inštancia je v súčasnej dobe v režime údržby. Počkajte prosím.",
+    "This page will refresh itself when the %s instance is available again." : "Táto stránka sa obnoví sama hneď ako bude %s inštancia znovu dostupná.",
+    "Error loading tags" : "Chyba pri načítaní štítkov",
+    "Tag already exists" : "Štítok už existuje",
+    "Error deleting tag(s)" : "Chyba pri mazaní štítka(ov)",
+    "Error tagging" : "Chyba pri pridaní štítka",
+    "Error untagging" : "Chyba pri odobratí štítka",
+    "Error favoriting" : "Chyba pri pridaní do obľúbených",
+    "Error unfavoriting" : "Chyba pri odobratí z obľúbených",
+    "Couldn't send mail to following users: %s " : "Nebolo možné odoslať email týmto používateľom: %s ",
+    "Sunday" : "Nedeľa",
+    "Monday" : "Pondelok",
+    "Tuesday" : "Utorok",
+    "Wednesday" : "Streda",
+    "Thursday" : "Štvrtok",
+    "Friday" : "Piatok",
+    "Saturday" : "Sobota",
+    "Sun." : "Ned.",
+    "Mon." : "Pon.",
+    "Tue." : "Uto.",
+    "Wed." : "Str.",
+    "Thu." : "Štv.",
+    "Fri." : "Pia.",
+    "Sat." : "Sob.",
+    "Su" : "Ne",
+    "Mo" : "Po",
+    "Tu" : "Ut",
+    "We" : "St",
+    "Th" : "Št",
+    "Fr" : "Pi",
+    "Sa" : "So",
+    "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",
+    "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.",
+    "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?" : "Súbory sú zašifrované. Ak ste nepovolili kľúč pre obnovenie, neexistuje žiadny spôsob, ako obnoviť vaše dáta po obnovení vášho hesla. <br /> Ak si nie ste istí čo urobiť, prosím skôr než budete pokračovať, obráťte sa na administrátora. <br /> Naozaj chcete pokračovať?",
+    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurácia hlavičiek reverse proxy nie je správna alebo pristupujete k ownCloud z dôveryhodného proxy servera. Ak k ownCloud nepristupujete z dôveryhodného proxy servera, vzniká bezpečnostné riziko - IP adresa potenciálneho útočníka, ktorú vidí ownCloud, môže byť falošná. Viac informácií nájdete v našej <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentácii</a>.",
+    "Sending ..." : "Odosielam ...",
+    "Email sent" : "Email odoslaný",
+    "notify by email" : "informovať emailom",
+    "can share" : "môže sprístupniť",
+    "create" : "vytvoriť",
+    "change" : "zmeniť",
+    "delete" : "vymazať",
+    "{sharee} (at {server})" : "{sharee} (na {server})",
+    "Share with users…" : "Sprístupniť používateľom...",
+    "Share with users, groups or remote users…" : "Sprístupniť používateľom, skupinám alebo vzdialeným používateľom...",
+    "Share with users or groups…" : "Sprístupniť používateľom alebo skupinám...",
+    "Share with users or remote users…" : "Sprístupniť používateľom alebo vzdialeným používateľom...",
+    "Warning" : "Varovanie",
+    "Error while sending notification" : "Chyba pri posielaní oznámenia",
+    "Updating to {version}" : "Aktualizuje sa na {version}",
+    "The update was successful. There were warnings." : "Aktualizácia bola úspešná. Vyskytli sa upozornenia.",
+    "No search results in other folders" : "Žiadne výsledky vyhľadávania v ostatných priečinkoch",
+    "Cancel login" : "Zruš prihlasovanie"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
new file mode 100644
index 00000000000..ae464c73869
--- /dev/null
+++ b/core/l10n/sk_SK.json
@@ -0,0 +1,319 @@
+{ "translations": {
+    "Please select a file." : "Prosím, vyberte súbor.",
+    "File is too big" : "Súbor je príliš veľký",
+    "The selected file is not an image." : "Vybraný súbor nie je obrázok.",
+    "The selected file cannot be read." : "Vybraný súbor nie je možné čítať.",
+    "Invalid file provided" : "Zadaný neplatný súbor",
+    "No image or file provided" : "Obrázok alebo súbor nebol zadaný",
+    "Unknown filetype" : "Neznámy typ súboru",
+    "Invalid image" : "Chybný obrázok",
+    "An error occurred. Please contact your admin." : "Vyskytla sa chyba.\nProsím, kontaktujte svojho správcu.\n\t",
+    "No temporary profile picture available, try again" : "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu",
+    "No crop data provided" : "Dáta pre orezanie neboli zadané",
+    "No valid crop data provided" : "Neplatné dáta pre orezanie neboli zadané",
+    "Crop is not square" : "Orezanie nie je štvorcové",
+    "Couldn't reset password because the token is invalid" : "Nemožno zmeniť heslo pre neplatnosť tokenu.",
+    "Couldn't reset password because the token is expired" : "Nepodarilo sa obnoviť heslo, pretože platnosť tokenu uplynula.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nemožno poslať email pre obnovu. Uistite sa, či vkladáte správne používateľské meno.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu, lebo pre zadaného používateľa neexistuje emailová adresa. Kontaktujte prosím vášho administrátora.",
+    "%s password reset" : "reset hesla %s",
+    "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
+    "Preparing update" : "Pripravuje sa aktualizácia",
+    "Repair warning: " : "Oznámenie opravy:",
+    "Repair error: " : "Chyba opravy:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "Automatická aktualizácia je zakázaná v config.php, použite prosím aktualizáciu cez príkazový riadok.",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: Kontrola tabuľky %s",
+    "Turned on maintenance mode" : "Mód údržby je zapnutý",
+    "Turned off maintenance mode" : "Mód údržby je vypnutý",
+    "Maintenance mode is kept active" : "Režim údržby je stále aktívny",
+    "Updating database schema" : "Aktualizuje sa schéma databázy",
+    "Updated database" : "Databáza je aktualizovaná",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Kontroluje sa, či je možné aktualizovať schému databázy (to môže trvať dlhší čas v závislosti na veľkosti databázy)",
+    "Checked database schema update" : "Skontrolovať aktualizáciu schémy databázy",
+    "Checking updates of apps" : "Kontrolujú sa aktualizácie aplikácií",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "Kontroluje sa, či je možné aktualizovať schému databázy pre %s (to môže trvať dlhší čas v závislosti na veľkosti databázy)",
+    "Checked database schema update for apps" : "Aktualizácia schémy databázy aplikácií bola overená",
+    "Updated \"%s\" to %s" : "Aktualizované \"%s\" na %s",
+    "Set log level to debug" : "Nastaviť úroveň záznamu na ladenie",
+    "Reset log level" : "Obnoviť úroveň záznamu",
+    "Starting code integrity check" : "Začína kontrola integrity kódu",
+    "Finished code integrity check" : "Kontrola integrity kódu ukončená",
+    "%s (3rdparty)" : "%s (od tretej strany)",
+    "%s (incompatible)" : "%s (nekompatibilná)",
+    "Following apps have been disabled: %s" : "Nasledovné aplikácie boli zakázané: %s",
+    "Already up to date" : "Už aktuálne",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Pri kontrole integrity kódu sa vyskytli chyby. Viac informácií…</a>",
+    "Settings" : "Nastavenia",
+    "Connection to server lost" : "Stratené spojenie so serverom",
+    "Problem loading page, reloading in 5 seconds" : "Nastal problém pri načítaní stránky, pokus sa zopakuje o 5 sekúnd",
+    "Saving..." : "Ukladám...",
+    "Dismiss" : "Odmietnuť",
+    "This action requires you to confirm your password" : "Táto akcia vyžaduje potvrdenie vášho hesla",
+    "Authentication required" : "Vyžaduje sa overenie",
+    "Password" : "Heslo",
+    "Cancel" : "Zrušiť",
+    "Confirm" : "Potvrdiť",
+    "Failed to authenticate, try again" : "Nastal problém pri overení, skúste znova",
+    "seconds ago" : "pred sekundami",
+    "Logging in …" : "Prihlasujem ...",
+    "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." : "Odkaz na obnovu hesla bol odoslaný na váš email. Pokiaľ ho neobdržíte v primeranom čase, skontrolujte spam / priečinok nevyžiadanej pošty. <br> Ak tam nie je, kontaktujte svojho administrátora.",
+    "I know what I'm doing" : "Viem, čo robím",
+    "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
+    "No" : "Nie",
+    "Yes" : "Áno",
+    "No files in here" : "Nie sú tu žiadne súbory",
+    "Choose" : "Vybrať",
+    "Error loading file picker template: {error}" : "Chyba pri nahrávaní šablóny výberu súborov: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Chyba pri nahrávaní šablóny správy: {error}",
+    "read-only" : "iba na čítanie",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"],
+    "One file conflict" : "Jeden konflikt súboru",
+    "New Files" : "Nové súbory",
+    "Already existing files" : "Už existujúce súbory",
+    "Which files do you want to keep?" : "Ktoré súbory chcete ponechať?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo.",
+    "Continue" : "Pokračovať",
+    "(all selected)" : "(všetko vybrané)",
+    "({count} selected)" : "({count} vybraných)",
+    "Error loading file exists template" : "Chyba pri nahrávaní šablóny existencie súboru",
+    "Pending" : "Čaká",
+    "Very weak password" : "Veľmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Priemerné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Váš webový server nie je zatiaľ správne nastavený, aby umožnil synchronizáciu súborov, pretože rozhranie WebDAV sa zdá byť nefunkčné.",
+    "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "dev/urandom nie je prístupný na čítanie procesom PHP, čo z bezpečnostných dôvodov nie je vôbec odporúčané. Viac informácií nájdete v našej <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentácii</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached je nakonfigurovaný ako distribuovaná vyrovnávacia pamäť, ale v PHP je nainštalovaný nesprávny modul - \"memcache\". \\OC\\Memcache\\Memcached podporuje len modul \"memcached\", \"memcache\" nie je podporovaný. Viac informácií nájdete na <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki stránke o oboch moduloch</a>.",
+    "Error occurred while checking server setup" : "Počas kontroly nastavenia serveru sa stala chyba",
+    "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áš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Dôrazne odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný alebo presunúť priečinok s dátami mimo priestoru, ktorý webový server sprístupňuje.",
+    "Shared" : "Sprístupnené",
+    "Shared with {recipients}" : "Sprístupnené {recipients}",
+    "Error" : "Chyba",
+    "Error while sharing" : "Chyba počas sprístupňovania",
+    "Error while unsharing" : "Chyba počas odobratia sprístupnenia",
+    "Error setting expiration date" : "Chyba pri nastavení dátumu expirácie",
+    "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í",
+    "Set expiration date" : "Nastaviť dátum expirácie",
+    "Expiration" : "Koniec platnosti",
+    "Expiration date" : "Dátum expirácie",
+    "Choose a password for the public link" : "Zadajte heslo pre tento verejný odkaz",
+    "Copied!" : "Skopírované!",
+    "Copy" : "Kopírovať",
+    "Not supported!" : "Nie je podporované!",
+    "Press ⌘-C to copy." : "Stlač ⌘-C pre skopírovanie.",
+    "Press Ctrl-C to copy." : "Stlač Ctrl-C pre skopírovanie.",
+    "Resharing is not allowed" : "Sprístupnenie už sprístupnenej položky nie je povolené",
+    "Share link" : "Sprístupniť odkaz",
+    "Link" : "Odkaz",
+    "Password protect" : "Chrániť heslom",
+    "Allow upload and editing" : "Povoliť nahratie a úpravy",
+    "Allow editing" : "Povoliť úpravy",
+    "Email link to person" : "Odoslať odkaz emailom",
+    "Send" : "Odoslať",
+    "Shared with you and the group {group} by {owner}" : "Sprístupnené vám a skupine {group} používateľom {owner}",
+    "Shared with you by {owner}" : "Sprístupnené vám používateľom {owner}",
+    "group" : "skupina",
+    "remote" : "vzdialený",
+    "Unshare" : "Zneprístupniť",
+    "can edit" : "môže upraviť",
+    "can create" : "môže vytvoriť",
+    "can change" : "môže zmeniť",
+    "can delete" : "môže odstrániť",
+    "access control" : "prístupové práva",
+    "Could not unshare" : "Nepodarilo sa zrušiť sprístupnenie",
+    "Share details could not be loaded for this item." : "Nebolo možné načítať údaje o sprístupnení tejto položky.",
+    "An error occurred. Please try again" : "Nastala chyba. Skúste to prosím znovu",
+    "Share" : "Sprístupniť",
+    "Share with users or remote users..." : "Sprístupniť používateľom alebo vzdialeným používateľom...",
+    "Share with users or groups..." : "Sprístupniť používateľom alebo skupinám",
+    "Share with users, groups or remote users..." : "Sprístupniť používateľom, skupinám alebo vzdialeným používateľom...",
+    "Share with users..." : "Sprístupniť používateľom...",
+    "Error removing share" : "Chyba pri rušení sprístupnenia",
+    "restricted" : "obmedzený",
+    "invisible" : "neviditeľný",
+    "Delete" : "Zmazať",
+    "Rename" : "Premenovať",
+    "No tags found" : "Štítky sa nenašli",
+    "The object type is not specified." : "Nešpecifikovaný typ objektu.",
+    "Enter new" : "Zadať nový",
+    "Add" : "Pridať",
+    "Edit tags" : "Upraviť štítky",
+    "Error loading dialog template: {error}" : "Chyba pri načítaní šablóny dialógu: {error}",
+    "No tags selected for deletion." : "Nie sú vybraté štítky na zmazanie.",
+    "unknown text" : "neznámy text",
+    "Hello world!" : "Ahoj svet!",
+    "sunny" : "slnečno",
+    "Hello {name}, the weather is {weather}" : "Dobrý deň {name}, počasie je {weather}",
+    "Hello {name}" : "Vitaj {name}",
+    "new" : "nový",
+    "_download %n file_::_download %n files_" : ["stiahnuť %n súbor","stiahnuť %n súbory","stiahnuť %n súborov"],
+    "Update to {version}" : "Aktualizuj na {version}",
+    "An error occurred." : "Vyskytla sa chyba.",
+    "Please reload the page." : "Obnovte prosím stránku.",
+    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Aktualizácia neprebehla úspešne. Pre viac informácií <a href=\"{url}\">navštívte príspevok na našom fóre</a>, ktorý pokrýva tento problém.",
+    "Continue to Nextcloud" : "Pokračovať na Nextcloud",
+    "The update was successful. Redirecting you to Nextcloud now." : "Aktualizácia bola úspešná. Presmerovávam na Nextcloud.",
+    "Searching other places" : "Prehľadanie ostatných umiestnení",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} výsledok vyhľadávania v ostatných priečinkoch","{count} výsledky vyhľadávania v ostatných priečinkoch","{count} výsledkov vyhľadávania v ostatných priečinkoch"],
+    "Personal" : "Osobné",
+    "Users" : "Používatelia",
+    "Apps" : "Aplikácie",
+    "Admin" : "Administrácia",
+    "Help" : "Pomoc",
+    "Access forbidden" : "Prístup odmietnutý",
+    "File not found" : "Súbor nenájdený",
+    "The specified document has not been found on the server." : "Zadaný dokument nebol nájdený na serveri.",
+    "You can click here to return to %s." : "Kliknite tu pre návrat do %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Dobrý deň,\n\npoužívateľ %s Vám sprístupnil položku s názvom %s.\nPre zobrazenie kliknite na odkaz: %s\n",
+    "The share will expire on %s." : "Sprístupnenie vyprší %s.",
+    "Cheers!" : "Pekný deň!",
+    "Internal Server Error" : "Vnútorná chyba servera",
+    "The server encountered an internal error and was unable to complete your request." : "Na serveri došlo k vnútornej chybe a nebol schopný dokončiť vašu požiadavku.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Obráťte sa na správcu servera, ak sa táto chyba objaví znovu viackrát, uveďte nižšie zobrazené technické údaje vo svojej správe.",
+    "More details can be found in the server log." : "Viac nájdete v logu servera.",
+    "Technical details" : "Technické podrobnosti",
+    "Remote Address: %s" : "Vzdialená adresa: %s",
+    "Request ID: %s" : "ID požiadavky: %s",
+    "Type: %s" : "Typ: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Správa: %s",
+    "File: %s" : "Súbor: %s",
+    "Line: %s" : "Riadok: %s",
+    "Trace" : "Trasa",
+    "Security warning" : "Bezpečnostné varovanie",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
+    "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
+    "Username" : "Meno používateľa",
+    "Storage & database" : "Úložislo & databáza",
+    "Data folder" : "Priečinok dát",
+    "Configure the database" : "Nastaviť databázu",
+    "Only %s is available." : "Len %s je dostupný.",
+    "Install and activate additional PHP modules to choose other database types." : "Pri výbere iného typu databázy bude potrebné nainštalovať a aktivovať ďalšie PHP moduly.",
+    "For more details check out the documentation." : "Viac informácií nájdete v dokumentácii.",
+    "Database user" : "Používateľ databázy",
+    "Database password" : "Heslo databázy",
+    "Database name" : "Meno databázy",
+    "Database tablespace" : "Tabuľkový priestor databázy",
+    "Database host" : "Server databázy",
+    "Performance warning" : "Varovanie o výkone",
+    "SQLite will be used as database." : "Bude použitá SQLite databáza.",
+    "For larger installations we recommend to choose a different database backend." : "Pre veľké inštalácie odporúčame vybrať si iné databázové riešenie.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Najmä pri používaní klientských aplikácií na synchronizáciu s desktopom neodporúčame používať SQLite.",
+    "Finish setup" : "Dokončiť inštaláciu",
+    "Finishing …" : "Dokončujem...",
+    "Need help?" : "Potrebujete pomoc?",
+    "See the documentation" : "Pozri dokumentáciu",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Táto aplikácia vyžaduje JavaScript, aby správne fungovala. Prosím, {linkstart}zapnite si JavaScript{linkend} a obnovte stránku",
+    "Search" : "Hľadať",
+    "Log out" : "Odhlásiť",
+    "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!",
+    "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.",
+    "An internal error occurred." : "Došlo k vnútornej chybe.",
+    "Please try again or contact your administrator." : "Skúste to znovu, alebo sa obráťte na vášho administrátora.",
+    "Wrong password. Reset it?" : "Chybné heslo. Chcete ho obnoviť?",
+    "Wrong password." : "Nesprávne heslo.",
+    "Log in" : "Prihlásiť sa",
+    "Stay logged in" : "Zostať prihlásený",
+    "Alternative Logins" : "Alternatívne prihlásenie",
+    "Use the following link to reset your password: {link}" : "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
+    "New password" : "Nové heslo",
+    "New Password" : "Nové heslo",
+    "Reset password" : "Obnovenie hesla",
+    "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 Vám sprístupnil položku s názvom »%s«.<br><a href=\"%s\">Zobraziť!</a><br><br>",
+    "This Nextcloud instance is currently in single user mode." : "Táto inštancia Nextcloudu je teraz v jednopoužívateľskom móde.",
+    "This means only administrators can use the instance." : "Len správca systému môže používať túto inštanciu.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
+    "Thank you for your patience." : "Ďakujeme za Vašu trpezlivosť.",
+    "You are accessing the server from an untrusted domain." : "Pristupujete na server v nedôveryhodnej doméne.",
+    "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",
+    "App update required" : "Je nutná aktualizácia aplikácie",
+    "%s will be updated to version %s" : "%s bude zaktualizovaný na verziu %s.",
+    "These apps will be updated:" : "Tieto aplikácie budú aktualizované:",
+    "These incompatible apps will be disabled:" : "Tieto nekompatibilné aplikácie budú vypnuté:",
+    "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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Aby nedošlo k vypršaniu časového limitu vo väčších inštaláciách, môžete namiesto toho použiť nasledujúci príkaz z inštalačného priečinka:",
+    "Detailed logs" : "Podrobné záznamy",
+    "Update needed" : "Aktualizácia je potrebná",
+    "Please use the command line updater because you have a big instance." : "Vaša inštancia je veľká, použite prosím aktualizáciu cez príkazový riadok.",
+    "This %s instance is currently in maintenance mode, which may take a while." : "Táto %s inštancia je v súčasnej dobe v režime údržby. Počkajte prosím.",
+    "This page will refresh itself when the %s instance is available again." : "Táto stránka sa obnoví sama hneď ako bude %s inštancia znovu dostupná.",
+    "Error loading tags" : "Chyba pri načítaní štítkov",
+    "Tag already exists" : "Štítok už existuje",
+    "Error deleting tag(s)" : "Chyba pri mazaní štítka(ov)",
+    "Error tagging" : "Chyba pri pridaní štítka",
+    "Error untagging" : "Chyba pri odobratí štítka",
+    "Error favoriting" : "Chyba pri pridaní do obľúbených",
+    "Error unfavoriting" : "Chyba pri odobratí z obľúbených",
+    "Couldn't send mail to following users: %s " : "Nebolo možné odoslať email týmto používateľom: %s ",
+    "Sunday" : "Nedeľa",
+    "Monday" : "Pondelok",
+    "Tuesday" : "Utorok",
+    "Wednesday" : "Streda",
+    "Thursday" : "Štvrtok",
+    "Friday" : "Piatok",
+    "Saturday" : "Sobota",
+    "Sun." : "Ned.",
+    "Mon." : "Pon.",
+    "Tue." : "Uto.",
+    "Wed." : "Str.",
+    "Thu." : "Štv.",
+    "Fri." : "Pia.",
+    "Sat." : "Sob.",
+    "Su" : "Ne",
+    "Mo" : "Po",
+    "Tu" : "Ut",
+    "We" : "St",
+    "Th" : "Št",
+    "Fr" : "Pi",
+    "Sa" : "So",
+    "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",
+    "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.",
+    "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?" : "Súbory sú zašifrované. Ak ste nepovolili kľúč pre obnovenie, neexistuje žiadny spôsob, ako obnoviť vaše dáta po obnovení vášho hesla. <br /> Ak si nie ste istí čo urobiť, prosím skôr než budete pokračovať, obráťte sa na administrátora. <br /> Naozaj chcete pokračovať?",
+    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfigurácia hlavičiek reverse proxy nie je správna alebo pristupujete k ownCloud z dôveryhodného proxy servera. Ak k ownCloud nepristupujete z dôveryhodného proxy servera, vzniká bezpečnostné riziko - IP adresa potenciálneho útočníka, ktorú vidí ownCloud, môže byť falošná. Viac informácií nájdete v našej <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentácii</a>.",
+    "Sending ..." : "Odosielam ...",
+    "Email sent" : "Email odoslaný",
+    "notify by email" : "informovať emailom",
+    "can share" : "môže sprístupniť",
+    "create" : "vytvoriť",
+    "change" : "zmeniť",
+    "delete" : "vymazať",
+    "{sharee} (at {server})" : "{sharee} (na {server})",
+    "Share with users…" : "Sprístupniť používateľom...",
+    "Share with users, groups or remote users…" : "Sprístupniť používateľom, skupinám alebo vzdialeným používateľom...",
+    "Share with users or groups…" : "Sprístupniť používateľom alebo skupinám...",
+    "Share with users or remote users…" : "Sprístupniť používateľom alebo vzdialeným používateľom...",
+    "Warning" : "Varovanie",
+    "Error while sending notification" : "Chyba pri posielaní oznámenia",
+    "Updating to {version}" : "Aktualizuje sa na {version}",
+    "The update was successful. There were warnings." : "Aktualizácia bola úspešná. Vyskytli sa upozornenia.",
+    "No search results in other folders" : "Žiadne výsledky vyhľadávania v ostatných priečinkoch",
+    "Cancel login" : "Zruš prihlasovanie"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index 48d3dcfa743..bd85912c08d 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Please select a file." : "Izberite datoteko",
     "File is too big" : "Datoteka je prevelika",
+    "The selected file is not an image." : "Izbrana datoteka ni slika.",
+    "The selected file cannot be read." : "Izbrane datoteke ni mogoče prebrati.",
     "Invalid file provided" : "Predložena je neveljavna datoteka",
     "No image or file provided" : "Ni podane datoteke ali slike",
     "Unknown filetype" : "Neznana vrsta datoteke",
@@ -52,7 +54,6 @@ OC.L10N.register(
     "Cancel" : "Prekliči",
     "seconds ago" : "pred nekaj sekundami",
     "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." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
-    "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?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
     "I know what I'm doing" : "Vem, kaj delam!",
     "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
     "No" : "Ne",
@@ -108,6 +109,7 @@ OC.L10N.register(
     "Link" : "Povezava",
     "Password protect" : "Zaščiti z geslom",
     "Allow upload and editing" : "Dovoli nalaganje in urejanje",
+    "Allow editing" : "Dovoli urejanje",
     "Email link to person" : "Posreduj povezavo po elektronski pošti",
     "Send" : "Pošlji",
     "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
@@ -206,8 +208,8 @@ OC.L10N.register(
     "Need help?" : "Ali potrebujete pomoč?",
     "See the documentation" : "Preverite dokumentacijo",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Program zahteva podporo JavaScript za pravilno delovanje. Med nastavitvami omogočite {linkstart}JavaScript{linkend} in osvežite spletno stran.",
-    "Log out" : "Odjava",
     "Search" : "Poišči",
+    "Log out" : "Odjava",
     "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
     "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
     "An internal error occurred." : "Prišlo je do notranje napake.",
@@ -302,7 +304,7 @@ OC.L10N.register(
     "Oct." : "okt",
     "Nov." : "nov",
     "Dec." : "dec",
-    "Allow editing" : "Dovoli urejanje",
+    "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?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
     "Hide file listing" : "Skrij spisek datotek",
     "Sending ..." : "Pošiljanje ...",
     "Email sent" : "Elektronska pošta je poslana",
@@ -327,11 +329,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Za vaš račun je določena napredna varnost. Prosim, prijavite se z drugo metodo.",
     "Cancel login" : "Prekliči prijavo",
     "Please authenticate using the selected factor." : "Prijavite se z izbrano metodo.",
-    "An error occured while verifying the token" : "Napaka se je zgodila med preverjanjem ključa",
-    "An error occured. Please try again" : "Zgodila se je napaka. Poskusi ponovno",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Souporaba z uporabniki, ki so na drugih oblakih ownCloud s povezavo uporabnik@domena.si/owncloud",
-    "not assignable" : "ni nastavljivo",
-    "Updating {productName} to version {version}, this may take a while." : "Posodabljanje {productName} na različico {version}, lahko traja nekaj časa.",
-    "An internal error occured." : "Zgodila se je interna napaka."
+    "An error occured while verifying the token" : "Napaka se je zgodila med preverjanjem ključa"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index b14b014be3f..53149b06fb9 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Please select a file." : "Izberite datoteko",
     "File is too big" : "Datoteka je prevelika",
+    "The selected file is not an image." : "Izbrana datoteka ni slika.",
+    "The selected file cannot be read." : "Izbrane datoteke ni mogoče prebrati.",
     "Invalid file provided" : "Predložena je neveljavna datoteka",
     "No image or file provided" : "Ni podane datoteke ali slike",
     "Unknown filetype" : "Neznana vrsta datoteke",
@@ -50,7 +52,6 @@
     "Cancel" : "Prekliči",
     "seconds ago" : "pred nekaj sekundami",
     "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." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
-    "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?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
     "I know what I'm doing" : "Vem, kaj delam!",
     "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
     "No" : "Ne",
@@ -106,6 +107,7 @@
     "Link" : "Povezava",
     "Password protect" : "Zaščiti z geslom",
     "Allow upload and editing" : "Dovoli nalaganje in urejanje",
+    "Allow editing" : "Dovoli urejanje",
     "Email link to person" : "Posreduj povezavo po elektronski pošti",
     "Send" : "Pošlji",
     "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
@@ -204,8 +206,8 @@
     "Need help?" : "Ali potrebujete pomoč?",
     "See the documentation" : "Preverite dokumentacijo",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Program zahteva podporo JavaScript za pravilno delovanje. Med nastavitvami omogočite {linkstart}JavaScript{linkend} in osvežite spletno stran.",
-    "Log out" : "Odjava",
     "Search" : "Poišči",
+    "Log out" : "Odjava",
     "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
     "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
     "An internal error occurred." : "Prišlo je do notranje napake.",
@@ -300,7 +302,7 @@
     "Oct." : "okt",
     "Nov." : "nov",
     "Dec." : "dec",
-    "Allow editing" : "Dovoli urejanje",
+    "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?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
     "Hide file listing" : "Skrij spisek datotek",
     "Sending ..." : "Pošiljanje ...",
     "Email sent" : "Elektronska pošta je poslana",
@@ -325,11 +327,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Za vaš račun je določena napredna varnost. Prosim, prijavite se z drugo metodo.",
     "Cancel login" : "Prekliči prijavo",
     "Please authenticate using the selected factor." : "Prijavite se z izbrano metodo.",
-    "An error occured while verifying the token" : "Napaka se je zgodila med preverjanjem ključa",
-    "An error occured. Please try again" : "Zgodila se je napaka. Poskusi ponovno",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Souporaba z uporabniki, ki so na drugih oblakih ownCloud s povezavo uporabnik@domena.si/owncloud",
-    "not assignable" : "ni nastavljivo",
-    "Updating {productName} to version {version}, this may take a while." : "Posodabljanje {productName} na različico {version}, lahko traja nekaj časa.",
-    "An internal error occured." : "Zgodila se je interna napaka."
+    "An error occured while verifying the token" : "Napaka se je zgodila med preverjanjem ključa"
 },"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index 8c1caab3a5c..29a0ee5ff97 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -3,6 +3,8 @@ OC.L10N.register(
     {
     "Please select a file." : "Ju lutemi, përzgjidhni një kartelë.",
     "File is too big" : "Kartela është shumë e madhe",
+    "The selected file is not an image." : "Skedari i zgjedhur nuk është një imazh",
+    "The selected file cannot be read." : "Skedari i zgjedhur nuk mund të lexohet",
     "Invalid file provided" : "U dha kartelë e pavlefshme",
     "No image or file provided" : "S’u dha figurë apo kartelë",
     "Unknown filetype" : "Lloj i panjohur kartele",
@@ -45,18 +47,25 @@ OC.L10N.register(
     "Already up to date" : "Tashmë e përditësuar",
     "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Pati probleme me kontrollin e integritetit të kodit. Më tepër të dhëna…</a>",
     "Settings" : "Rregullime",
+    "Connection to server lost" : "Lidhja me serverin u shkëput",
     "Problem loading page, reloading in 5 seconds" : "Gabim në ngarkimin e faqes, do të ringarkohet pas 5 sekondash",
     "Saving..." : "Po ruhet …",
     "Dismiss" : "Mos e merr parasysh",
+    "This action requires you to confirm your password" : "Ky veprim kërkon që të konfirmoni fjalëkalimin tuaj.",
+    "Authentication required" : "Verifikim i kërkuar",
     "Password" : "Fjalëkalim",
     "Cancel" : "Anuloje",
+    "Confirm" : "Konfirmo",
+    "Failed to authenticate, try again" : "Dështoi në verifikim, provo përsëri",
     "seconds ago" : "sekonda më parë",
+    "Logging in …" : "Duke u loguar ...",
     "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." : "Lidhja për ricaktimin e fjalëkalimi tuaj u dërgua tek email-i juaj. Nëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme/postës së pavlerë.<br>Nëse s’është as aty, pyetni përgjegjësin tuaj lokal.",
-    "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?" : "Kartelat tuaja janë të fshehtëzuara. Nëse s’keni aktivizuar kyçin e rimarrjeve, nuk do të ketë ndonjë rrugë për të marrë sërish të dhënat tuaja pasi të jetë ricaktuar fjalëkalimi juaj.<br />Nëse s’jeni i sigurt se ç’duhet bërë, ju lutemi, përpara se të vazhdoni, lidhuni me përgjegjësin tuaj. <br />Doni vërtet të vazhdoni?",
+    "Your files are encrypted. 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?" : "Skedarët tuaj janë të enkriptuar. Nuk do ketë asnjë mënyrë për ti rimarrë të dhënat pasi fjalëkalimi juaj të rivendoset. <br>Nëse nuk jeni të sigurt se çfarë duhet të bëni, ju lutemi flisni me administratorin tuaj para se të vazhdoni. <br /> Doni vërtet të vazhdoni?",
     "I know what I'm doing" : "E di se ç’bëj",
     "Password can not be changed. Please contact your administrator." : "Fjalëkalimi nuk mund të ndryshohet. Ju lutemi, lidhuni me përgjegjësin tuaj.",
     "No" : "Jo",
     "Yes" : "Po",
+    "No files in here" : "Jo skedar këtu",
     "Choose" : "Zgjidhni",
     "Error loading file picker template: {error}" : "Gabim në ngarkimin e gjedhes së marrësit të kartelave: {error}",
     "Ok" : "Në rregull",
@@ -72,6 +81,7 @@ OC.L10N.register(
     "(all selected)" : "(krejt të përzgjedhurat)",
     "({count} selected)" : "({count} të përzgjedhura)",
     "Error loading file exists template" : "Gabim në ngarkimin e gjedhes kartela ekziston",
+    "Pending" : "Në pritje",
     "Very weak password" : "Fjalëkalim shumë i dobët",
     "Weak password" : "Fjalëkalim i dobët",
     "So-so password" : "Fjalëkalim çka",
@@ -79,9 +89,11 @@ OC.L10N.register(
     "Strong password" : "Fjalëkalim i fortë",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Shërbyesi juaj web ende s’është rregulluar për të lejuar njëkohësim kartelash, ngaqë ndërfaqja WebDAV duket se është e dëmtuar.",
     "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Shërbyesi juaj s’është rregulluar si duhet për të kuptuar \"{url}\". Të dhëna të mëtejshme mund të gjenden te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Ky shërbyes nuk ka lidhje Internet funksionale. Kjo do të  thotë që disa nga karakteristikat e lidhjes së ngarkesës së jashtme, njoftimet rreth përditësimit ose instalimit të aplikacioneve të palës së tretë nuk do të punojnë. Duke aksesuar skedarët në distancë dhe duke dërguar njoftimin me postë elektronike mund të mos punojë. Ne sygjerojmë të aktivizoni lidhjen e Internet për këtë shërbyes nëse doni të keni të gjitha karakteristikat.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "S’ka të formësuar fshehtinë kujtese. Që të përmirësoni punimin, ju lutemi formësoni një të tillë, në pastë. Më tepër të dhëna mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom s’lexohet dot nga PHP-ja, çka shkëshillohet me forcë, për arsye sigurie. Më tepër të dhëna mund të gjenden te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.",
     "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Po xhironi PHP {version}. Ju nxisim të përmirësoni versionin e PHP-së që të përfitoni <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">nga përditësimet e punimit dhe sigurisë të ofruara PHP Group</a>, sapo të mbulohet nga shpërndarja juaj.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "E anasjellta e konfigurimit të kryeve proxy është e pasaktë, ose ju po aksesoni Nextcloud nga një proxy i besuar. Nëse nuk jeni duke aksesuar Nextcloud nga një proxy i besuar, kjo është një çështje sigurie dhe mund të lejoj një sulmues të manipuloj adresën e tyre IP si të dukshme nga Nextcloud. Informacione të mëtejshme mund të gjendet në  <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
     "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached është formësuar si fshehtinë e shpërndarë, por është instaluar moduli i gabuar PHP \"memcache\". \\OC\\Memcache\\Memcached mbulon vetëm \"memcached\" dhe jo \"memcache\". Shihni <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">wiki-n mbi memcached rreth të dy moduleve</a>.",
     "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Disa kartela s’e kaluan dot kontrollin e pacenueshmërisë. Më tepër të dhëna se si të zgjidhet ky problem mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listë e kartelave të pavlefshme…</a> / <a href=\"{rescanEndpoint}\">Rikontrollojini…</a>)",
     "Error occurred while checking server setup" : "Ndodhi një gabim gjatë kontrollit të rregullimit të shërbyesit",
@@ -100,18 +112,32 @@ OC.L10N.register(
     "Expiration" : "Skadim",
     "Expiration date" : "Datë skadimi",
     "Choose a password for the public link" : "Zgjidhni një fjalëkalim për lidhjen publike",
+    "Copied!" : "U kopjua!",
+    "Copy" : "Kopjo",
+    "Not supported!" : "Jo i përshtatshëm!",
+    "Press ⌘-C to copy." : "Shtyp ⌘-C për të kopjuar.",
+    "Press Ctrl-C to copy." : "Shtypni Ctrl-C për të kopjuar.",
     "Resharing is not allowed" : "Nuk lejohen rindarjet",
     "Share link" : "Lidhje ndarjeje",
     "Link" : "Lidhje",
     "Password protect" : "Mbroje me fjalëkalim",
+    "Allow upload and editing" : "Lejo ngarkim dhe editim",
+    "Allow editing" : "Lejo përpunim",
+    "File drop (upload only)" : "Lësho skedar (vetëm ngarkim)",
     "Email link to person" : "Dërgoja personit lidhjen me email",
     "Send" : "Dërgoje",
     "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}",
+    "{{shareInitiatorDisplayName}} shared via link" : "{{shpërndaEmrinEShfaqurTëNismëtarit}} shpërnda nëpërmjet linkut",
     "group" : "grup",
     "remote" : "i largët",
+    "email" : "postë elektronike",
     "Unshare" : "Hiqe ndarjen",
+    "can reshare" : "mund të rishpërndahet",
     "can edit" : "mund të përpunojnë",
+    "can create" : "mund të krijohet",
+    "can change" : "mund të ndryshohet",
+    "can delete" : "mund të fshihet",
     "access control" : "kontroll hyrjesh",
     "Could not unshare" : "S’e shndau dot",
     "Share details could not be loaded for this item." : "Për këtë objekt s’u ngarkuan dot hollësi ndarjeje.",
@@ -120,7 +146,17 @@ OC.L10N.register(
     "An error occurred. Please try again" : "Ndodhi një gabim. Ju lutemi, riprovoni",
     "{sharee} (group)" : "{sharee} (grup)",
     "{sharee} (remote)" : "{sharee} (i largët)",
+    "{sharee} (email)" : "{shpërnda} (postë elektronike)",
     "Share" : "Ndaje",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Shpërnda me njerëzit në serverat e tjerë duke përdorur ID e tyre të Cloud-it të Federuar\nusername@example.com/nextcloud",
+    "Share with users or by mail..." : "Shpërnda me përdoruesit ose nga posta elektronike",
+    "Share with users or remote users..." : "Shpërnda me përdoruesit ose me përdoruesit në distancë...",
+    "Share with users, remote users or by mail..." : "Shpërnda me përdoruesit, përdoruesit në distancë ose nga posta elektronike...",
+    "Share with users or groups..." : "Shpërnda me përdoruesit ose grupet...",
+    "Share with users, groups or by mail..." : "Shpërnda me përdoruesit, grupet ose nga posta elektronike...",
+    "Share with users, groups or remote users..." : "Shpërnda me përdoruesit, grupet ose përdoruesit në distancë...",
+    "Share with users, groups, remote users or by mail..." : "Shpërnda me përdoruesit, grupet, përdoruesit në distancë ose nga posta elektronike...",
+    "Share with users..." : "Shpërnda me përdoruesit...",
     "Error removing share" : "Gabim në heqjen e ndarjes",
     "Non-existing tag #{tag}" : "Etiketë #{tag} që s’ekziston",
     "restricted" : "e kufizuar",
@@ -129,6 +165,7 @@ OC.L10N.register(
     "Delete" : "Fshije",
     "Rename" : "Riemërtoje",
     "Collaborative tags" : "Etiketa bashkëpunimi",
+    "No tags found" : "Jo etiketime të gjetura",
     "The object type is not specified." : "S’është specifikuar lloji i objektit.",
     "Enter new" : "Jep të ri",
     "Add" : "Shtoni",
@@ -142,10 +179,16 @@ OC.L10N.register(
     "Hello {name}" : "Tungjatjeta {name}",
     "new" : "re",
     "_download %n file_::_download %n files_" : ["shkarko %n kartelë","shkarko %n kartela"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Përditësimi është në zhvillim, largimi nga faqja mund të ndërpres procesin në disa mjedise.",
+    "Update to {version}" : "Përditëso në {version}",
     "An error occurred." : "Ndodhi një gabim.",
     "Please reload the page." : "Ju lutemi, ringarkoni faqen.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Përditësimi qe i pasuksesshëm. Për më tepër të dhëna <a href=\"{url}\">shihni postimin te forumi ynë</a> lidhur me këtë çështje.",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Përditësimi ishte i pasuksesshëm. Ju lutem raportoni këtë problem në <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>.",
+    "Continue to Nextcloud" : "Vazhdoni tek Nextcloud",
+    "The update was successful. Redirecting you to Nextcloud now." : "Përditësimi ishte i suksesshëm. Ju ridrejtojmë në Nextcloud tani.",
     "Searching other places" : "Po kërkohet në vende të tjera",
+    "No search results in other folders for '{tag}{filter}{endtag}'" : "Jo rezultate nga kërkimi në dosjet e tjera për '{etiketim}{filtrim}{përfundoetiketimin}'",
     "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} përfundim kërkimi në një tjetër dosje","{count} përfundime kërkimi në dosje të tjera"],
     "Personal" : "Personale",
     "Users" : "Përdorues",
@@ -188,6 +231,7 @@ OC.L10N.register(
     "Database name" : "Emër baze të dhënash",
     "Database tablespace" : "Tablespace-i i database-it",
     "Database host" : "Strehë baze të dhënash",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Ju lutem specifikoni numrin e portës së bashku me një emër hosti (p.sh. localhost:5432).",
     "Performance warning" : "Sinjalizim funksionimi",
     "SQLite will be used as database." : "Si bazë të dhënash do të përdoret SQLite.",
     "For larger installations we recommend to choose a different database backend." : "Për instalime më të mëdha këshillojmë të zgjidhni një tjetër program shërbyesi baze të dhënash.",
@@ -197,8 +241,10 @@ OC.L10N.register(
     "Need help?" : "Ju duhet ndihmë?",
     "See the documentation" : "Shihni dokumentimin",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ky aplikacion lyp JavaScript për punim të saktë. Ju lutemi, {linkstart}aktivizoni JavaScript-in{linkend} dhe ringarkoni faqen.",
-    "Log out" : "Dilni",
     "Search" : "Kërko",
+    "Log out" : "Dilni",
+    "This action requires you to confirm your password:" : "Ky veprim kërkon të konfirmoni fjalëkalimin tuaj:",
+    "Confirm your password" : "Konfrimoni fjalëkalimin tuaj",
     "Server side authentication failed!" : "Mirëfilltësimi më anë të shërbyesit dështoi!",
     "Please contact your administrator." : "Ju lutemi, lidhuni me përgjegjësin tuaj.",
     "An internal error occurred." : "Ndodhi një gabim i brendshëm.",
@@ -218,6 +264,11 @@ OC.L10N.register(
     "This means only administrators can use the instance." : "Kjo do të thotë që instancën mund ta përdorin vetëm administratorët.",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Nëse ky mesazh shfaqet vazhdimisht ose u shfaq papritmas, lidhuni me përgjegjësin e sistemit.",
     "Thank you for your patience." : "Ju faleminderit për durimin.",
+    "Two-factor authentication" : "Verifikim dy-element",
+    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Rrit sigurinë për llogarin tuaj. Ju lutem bëni verifikimin duke përdorur një element të dytë.",
+    "Cancel log in" : "Anuloni identifikimin",
+    "Use backup code" : "Përdorni kodin e kopjes rezervë",
+    "Error while validating your second factor" : "Gabim gjatë verifikimit të elementit të dytë",
     "You are accessing the server from an untrusted domain." : "Po hyni në shërbyes nga një përkatësi jo e besuar.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ju lutemi, lidhuni me përgjegjësin tuaj. Nëse jeni një përgjegjës në këtë instancë, formësoni rregullimin \"trusted_domains\" te config/config.php. Një formësim shembull jepet te 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ë formësimit tuaj, si administrator mundet gjithashtu të jeni në gjendje të përdorni butonin më poshtë për ta besuar këtë përkatësi.",
@@ -289,8 +340,10 @@ OC.L10N.register(
     "Oct." : "Tet.",
     "Nov." : "Nën.",
     "Dec." : "Dhj.",
+    "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?" : "Kartelat tuaja janë të fshehtëzuara. Nëse s’keni aktivizuar kyçin e rimarrjeve, nuk do të ketë ndonjë rrugë për të marrë sërish të dhënat tuaja pasi të jetë ricaktuar fjalëkalimi juaj.<br />Nëse s’jeni i sigurt se ç’duhet bërë, ju lutemi, përpara se të vazhdoni, lidhuni me përgjegjësin tuaj. <br />Doni vërtet të vazhdoni?",
+    "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." : "Ky shërbyes nuk ka lidhje Internet funksionale. Kjo do të  thotë që disa nga karakteristikat e lidhjes së ngarkesës së jashtme, njoftimet rreth përditësimit ose instalimit të aplikacioneve të palës së tretë nuk do të punojnë. Duke aksesuar skedarët në distancë dhe duke dërguar njoftimin me postë elektronike mund të mos punojë. Ne sygjerojmë të aktivizoni lidhjen e Internet për këtë shërbyes nëse doni të keni të gjitha karakteristikat.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Formësimi për krye ndërmjetësi prapësor është i pasaktë, ose jeni duke hyrë në ownCloud prej një ndërmjetësi të besuar. Nëse s’jeni duke hyrë në ownCloud prej një ndërmjetësi të besuar, ky është një problem sigurie dhe mund t’i lejojë një agresori të maskojë adresën e vet IP si një të pranueshme nga ownCloud-i. Të dhëna të mëtejshme mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.",
-    "Allow editing" : "Lejo përpunim",
+    "Hide file listing" : "Fshih skedarin e listimit",
     "Sending ..." : "Po dërgohet …",
     "Email sent" : "Email-i u dërgua",
     "Send link via email" : "Dërgojeni lidhjen me email",
@@ -306,12 +359,14 @@ OC.L10N.register(
     "Share with users or remote users…" : "Ndajeni me përdorues ose përdorues të largët…",
     "Warning" : "Kujdes",
     "Error while sending notification" : "Gabim gjatë dërgimit të njoftimit",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Përmirësimi është në progres, largimi nga faqja mund të ndërpres procesin në disa mjedise.",
+    "Updating to {version}" : "Përditësim në {version}",
+    "The update was successful. There were warnings." : "Përditësimi ishte i suksesshëm. Ka paralajmërime..",
     "No search results in other folders" : "S’u gjetën përfundime në dosje të tjera",
     "Two-step verification" : "Verifikim dyhapësh",
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Siguria e zgjeruar është aktivizuar për llogarinë tuaj. Ju lutemi, bëni mirëfilltësimin duke përdorur një faktor të dytë.",
     "Cancel login" : "Anuloje hyrjen",
-    "Please authenticate using the selected factor." : "Ju lutemi, bëni mirëfilltësimin duke përdorur faktorin e përzgjedhur.",
-    "An error occured while verifying the token" : "Ndodhi një gabim gjatë verifikimit të token-it",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Ndajeni me persona në ownCloud-e të tjera duke përdorur sintaksën username@example.com/owncloud"
+    "Please authenticate using the selected factor." : "Ju lutemi, bëni identifikimin duke përdorur faktorin e përzgjedhur.",
+    "An error occured while verifying the token" : "Ndodhi një gabim gjatë verifikimit të token-it"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index b5ee4a364c4..b61584cc5f3 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -1,6 +1,8 @@
 { "translations": {
     "Please select a file." : "Ju lutemi, përzgjidhni një kartelë.",
     "File is too big" : "Kartela është shumë e madhe",
+    "The selected file is not an image." : "Skedari i zgjedhur nuk është një imazh",
+    "The selected file cannot be read." : "Skedari i zgjedhur nuk mund të lexohet",
     "Invalid file provided" : "U dha kartelë e pavlefshme",
     "No image or file provided" : "S’u dha figurë apo kartelë",
     "Unknown filetype" : "Lloj i panjohur kartele",
@@ -43,18 +45,25 @@
     "Already up to date" : "Tashmë e përditësuar",
     "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">Pati probleme me kontrollin e integritetit të kodit. Më tepër të dhëna…</a>",
     "Settings" : "Rregullime",
+    "Connection to server lost" : "Lidhja me serverin u shkëput",
     "Problem loading page, reloading in 5 seconds" : "Gabim në ngarkimin e faqes, do të ringarkohet pas 5 sekondash",
     "Saving..." : "Po ruhet …",
     "Dismiss" : "Mos e merr parasysh",
+    "This action requires you to confirm your password" : "Ky veprim kërkon që të konfirmoni fjalëkalimin tuaj.",
+    "Authentication required" : "Verifikim i kërkuar",
     "Password" : "Fjalëkalim",
     "Cancel" : "Anuloje",
+    "Confirm" : "Konfirmo",
+    "Failed to authenticate, try again" : "Dështoi në verifikim, provo përsëri",
     "seconds ago" : "sekonda më parë",
+    "Logging in …" : "Duke u loguar ...",
     "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." : "Lidhja për ricaktimin e fjalëkalimi tuaj u dërgua tek email-i juaj. Nëse nuk e merrni brenda një kohe të arsyeshme, kontrolloni dosjet e postës së padëshirueshme/postës së pavlerë.<br>Nëse s’është as aty, pyetni përgjegjësin tuaj lokal.",
-    "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?" : "Kartelat tuaja janë të fshehtëzuara. Nëse s’keni aktivizuar kyçin e rimarrjeve, nuk do të ketë ndonjë rrugë për të marrë sërish të dhënat tuaja pasi të jetë ricaktuar fjalëkalimi juaj.<br />Nëse s’jeni i sigurt se ç’duhet bërë, ju lutemi, përpara se të vazhdoni, lidhuni me përgjegjësin tuaj. <br />Doni vërtet të vazhdoni?",
+    "Your files are encrypted. 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?" : "Skedarët tuaj janë të enkriptuar. Nuk do ketë asnjë mënyrë për ti rimarrë të dhënat pasi fjalëkalimi juaj të rivendoset. <br>Nëse nuk jeni të sigurt se çfarë duhet të bëni, ju lutemi flisni me administratorin tuaj para se të vazhdoni. <br /> Doni vërtet të vazhdoni?",
     "I know what I'm doing" : "E di se ç’bëj",
     "Password can not be changed. Please contact your administrator." : "Fjalëkalimi nuk mund të ndryshohet. Ju lutemi, lidhuni me përgjegjësin tuaj.",
     "No" : "Jo",
     "Yes" : "Po",
+    "No files in here" : "Jo skedar këtu",
     "Choose" : "Zgjidhni",
     "Error loading file picker template: {error}" : "Gabim në ngarkimin e gjedhes së marrësit të kartelave: {error}",
     "Ok" : "Në rregull",
@@ -70,6 +79,7 @@
     "(all selected)" : "(krejt të përzgjedhurat)",
     "({count} selected)" : "({count} të përzgjedhura)",
     "Error loading file exists template" : "Gabim në ngarkimin e gjedhes kartela ekziston",
+    "Pending" : "Në pritje",
     "Very weak password" : "Fjalëkalim shumë i dobët",
     "Weak password" : "Fjalëkalim i dobët",
     "So-so password" : "Fjalëkalim çka",
@@ -77,9 +87,11 @@
     "Strong password" : "Fjalëkalim i fortë",
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Shërbyesi juaj web ende s’është rregulluar për të lejuar njëkohësim kartelash, ngaqë ndërfaqja WebDAV duket se është e dëmtuar.",
     "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Shërbyesi juaj s’është rregulluar si duhet për të kuptuar \"{url}\". Të dhëna të mëtejshme mund të gjenden te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Ky shërbyes nuk ka lidhje Internet funksionale. Kjo do të  thotë që disa nga karakteristikat e lidhjes së ngarkesës së jashtme, njoftimet rreth përditësimit ose instalimit të aplikacioneve të palës së tretë nuk do të punojnë. Duke aksesuar skedarët në distancë dhe duke dërguar njoftimin me postë elektronike mund të mos punojë. Ne sygjerojmë të aktivizoni lidhjen e Internet për këtë shërbyes nëse doni të keni të gjitha karakteristikat.",
     "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "S’ka të formësuar fshehtinë kujtese. Që të përmirësoni punimin, ju lutemi formësoni një të tillë, në pastë. Më tepër të dhëna mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.",
     "/dev/urandom is not readable by PHP which is highly discouraged for security reasons. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom s’lexohet dot nga PHP-ja, çka shkëshillohet me forcë, për arsye sigurie. Më tepër të dhëna mund të gjenden te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.",
     "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Po xhironi PHP {version}. Ju nxisim të përmirësoni versionin e PHP-së që të përfitoni <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">nga përditësimet e punimit dhe sigurisë të ofruara PHP Group</a>, sapo të mbulohet nga shpërndarja juaj.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "E anasjellta e konfigurimit të kryeve proxy është e pasaktë, ose ju po aksesoni Nextcloud nga një proxy i besuar. Nëse nuk jeni duke aksesuar Nextcloud nga një proxy i besuar, kjo është një çështje sigurie dhe mund të lejoj një sulmues të manipuloj adresën e tyre IP si të dukshme nga Nextcloud. Informacione të mëtejshme mund të gjendet në  <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>.",
     "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached është formësuar si fshehtinë e shpërndarë, por është instaluar moduli i gabuar PHP \"memcache\". \\OC\\Memcache\\Memcached mbulon vetëm \"memcached\" dhe jo \"memcache\". Shihni <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">wiki-n mbi memcached rreth të dy moduleve</a>.",
     "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Disa kartela s’e kaluan dot kontrollin e pacenueshmërisë. Më tepër të dhëna se si të zgjidhet ky problem mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë. (<a href=\"{codeIntegrityDownloadEndpoint}\">Listë e kartelave të pavlefshme…</a> / <a href=\"{rescanEndpoint}\">Rikontrollojini…</a>)",
     "Error occurred while checking server setup" : "Ndodhi një gabim gjatë kontrollit të rregullimit të shërbyesit",
@@ -98,18 +110,32 @@
     "Expiration" : "Skadim",
     "Expiration date" : "Datë skadimi",
     "Choose a password for the public link" : "Zgjidhni një fjalëkalim për lidhjen publike",
+    "Copied!" : "U kopjua!",
+    "Copy" : "Kopjo",
+    "Not supported!" : "Jo i përshtatshëm!",
+    "Press ⌘-C to copy." : "Shtyp ⌘-C për të kopjuar.",
+    "Press Ctrl-C to copy." : "Shtypni Ctrl-C për të kopjuar.",
     "Resharing is not allowed" : "Nuk lejohen rindarjet",
     "Share link" : "Lidhje ndarjeje",
     "Link" : "Lidhje",
     "Password protect" : "Mbroje me fjalëkalim",
+    "Allow upload and editing" : "Lejo ngarkim dhe editim",
+    "Allow editing" : "Lejo përpunim",
+    "File drop (upload only)" : "Lësho skedar (vetëm ngarkim)",
     "Email link to person" : "Dërgoja personit lidhjen me email",
     "Send" : "Dërgoje",
     "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}",
+    "{{shareInitiatorDisplayName}} shared via link" : "{{shpërndaEmrinEShfaqurTëNismëtarit}} shpërnda nëpërmjet linkut",
     "group" : "grup",
     "remote" : "i largët",
+    "email" : "postë elektronike",
     "Unshare" : "Hiqe ndarjen",
+    "can reshare" : "mund të rishpërndahet",
     "can edit" : "mund të përpunojnë",
+    "can create" : "mund të krijohet",
+    "can change" : "mund të ndryshohet",
+    "can delete" : "mund të fshihet",
     "access control" : "kontroll hyrjesh",
     "Could not unshare" : "S’e shndau dot",
     "Share details could not be loaded for this item." : "Për këtë objekt s’u ngarkuan dot hollësi ndarjeje.",
@@ -118,7 +144,17 @@
     "An error occurred. Please try again" : "Ndodhi një gabim. Ju lutemi, riprovoni",
     "{sharee} (group)" : "{sharee} (grup)",
     "{sharee} (remote)" : "{sharee} (i largët)",
+    "{sharee} (email)" : "{shpërnda} (postë elektronike)",
     "Share" : "Ndaje",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Shpërnda me njerëzit në serverat e tjerë duke përdorur ID e tyre të Cloud-it të Federuar\nusername@example.com/nextcloud",
+    "Share with users or by mail..." : "Shpërnda me përdoruesit ose nga posta elektronike",
+    "Share with users or remote users..." : "Shpërnda me përdoruesit ose me përdoruesit në distancë...",
+    "Share with users, remote users or by mail..." : "Shpërnda me përdoruesit, përdoruesit në distancë ose nga posta elektronike...",
+    "Share with users or groups..." : "Shpërnda me përdoruesit ose grupet...",
+    "Share with users, groups or by mail..." : "Shpërnda me përdoruesit, grupet ose nga posta elektronike...",
+    "Share with users, groups or remote users..." : "Shpërnda me përdoruesit, grupet ose përdoruesit në distancë...",
+    "Share with users, groups, remote users or by mail..." : "Shpërnda me përdoruesit, grupet, përdoruesit në distancë ose nga posta elektronike...",
+    "Share with users..." : "Shpërnda me përdoruesit...",
     "Error removing share" : "Gabim në heqjen e ndarjes",
     "Non-existing tag #{tag}" : "Etiketë #{tag} që s’ekziston",
     "restricted" : "e kufizuar",
@@ -127,6 +163,7 @@
     "Delete" : "Fshije",
     "Rename" : "Riemërtoje",
     "Collaborative tags" : "Etiketa bashkëpunimi",
+    "No tags found" : "Jo etiketime të gjetura",
     "The object type is not specified." : "S’është specifikuar lloji i objektit.",
     "Enter new" : "Jep të ri",
     "Add" : "Shtoni",
@@ -140,10 +177,16 @@
     "Hello {name}" : "Tungjatjeta {name}",
     "new" : "re",
     "_download %n file_::_download %n files_" : ["shkarko %n kartelë","shkarko %n kartela"],
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "Përditësimi është në zhvillim, largimi nga faqja mund të ndërpres procesin në disa mjedise.",
+    "Update to {version}" : "Përditëso në {version}",
     "An error occurred." : "Ndodhi një gabim.",
     "Please reload the page." : "Ju lutemi, ringarkoni faqen.",
     "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Përditësimi qe i pasuksesshëm. Për më tepër të dhëna <a href=\"{url}\">shihni postimin te forumi ynë</a> lidhur me këtë çështje.",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "Përditësimi ishte i pasuksesshëm. Ju lutem raportoni këtë problem në <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>.",
+    "Continue to Nextcloud" : "Vazhdoni tek Nextcloud",
+    "The update was successful. Redirecting you to Nextcloud now." : "Përditësimi ishte i suksesshëm. Ju ridrejtojmë në Nextcloud tani.",
     "Searching other places" : "Po kërkohet në vende të tjera",
+    "No search results in other folders for '{tag}{filter}{endtag}'" : "Jo rezultate nga kërkimi në dosjet e tjera për '{etiketim}{filtrim}{përfundoetiketimin}'",
     "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} përfundim kërkimi në një tjetër dosje","{count} përfundime kërkimi në dosje të tjera"],
     "Personal" : "Personale",
     "Users" : "Përdorues",
@@ -186,6 +229,7 @@
     "Database name" : "Emër baze të dhënash",
     "Database tablespace" : "Tablespace-i i database-it",
     "Database host" : "Strehë baze të dhënash",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Ju lutem specifikoni numrin e portës së bashku me një emër hosti (p.sh. localhost:5432).",
     "Performance warning" : "Sinjalizim funksionimi",
     "SQLite will be used as database." : "Si bazë të dhënash do të përdoret SQLite.",
     "For larger installations we recommend to choose a different database backend." : "Për instalime më të mëdha këshillojmë të zgjidhni një tjetër program shërbyesi baze të dhënash.",
@@ -195,8 +239,10 @@
     "Need help?" : "Ju duhet ndihmë?",
     "See the documentation" : "Shihni dokumentimin",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ky aplikacion lyp JavaScript për punim të saktë. Ju lutemi, {linkstart}aktivizoni JavaScript-in{linkend} dhe ringarkoni faqen.",
-    "Log out" : "Dilni",
     "Search" : "Kërko",
+    "Log out" : "Dilni",
+    "This action requires you to confirm your password:" : "Ky veprim kërkon të konfirmoni fjalëkalimin tuaj:",
+    "Confirm your password" : "Konfrimoni fjalëkalimin tuaj",
     "Server side authentication failed!" : "Mirëfilltësimi më anë të shërbyesit dështoi!",
     "Please contact your administrator." : "Ju lutemi, lidhuni me përgjegjësin tuaj.",
     "An internal error occurred." : "Ndodhi një gabim i brendshëm.",
@@ -216,6 +262,11 @@
     "This means only administrators can use the instance." : "Kjo do të thotë që instancën mund ta përdorin vetëm administratorët.",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Nëse ky mesazh shfaqet vazhdimisht ose u shfaq papritmas, lidhuni me përgjegjësin e sistemit.",
     "Thank you for your patience." : "Ju faleminderit për durimin.",
+    "Two-factor authentication" : "Verifikim dy-element",
+    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Rrit sigurinë për llogarin tuaj. Ju lutem bëni verifikimin duke përdorur një element të dytë.",
+    "Cancel log in" : "Anuloni identifikimin",
+    "Use backup code" : "Përdorni kodin e kopjes rezervë",
+    "Error while validating your second factor" : "Gabim gjatë verifikimit të elementit të dytë",
     "You are accessing the server from an untrusted domain." : "Po hyni në shërbyes nga një përkatësi jo e besuar.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ju lutemi, lidhuni me përgjegjësin tuaj. Nëse jeni një përgjegjës në këtë instancë, formësoni rregullimin \"trusted_domains\" te config/config.php. Një formësim shembull jepet te 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ë formësimit tuaj, si administrator mundet gjithashtu të jeni në gjendje të përdorni butonin më poshtë për ta besuar këtë përkatësi.",
@@ -287,8 +338,10 @@
     "Oct." : "Tet.",
     "Nov." : "Nën.",
     "Dec." : "Dhj.",
+    "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?" : "Kartelat tuaja janë të fshehtëzuara. Nëse s’keni aktivizuar kyçin e rimarrjeve, nuk do të ketë ndonjë rrugë për të marrë sërish të dhënat tuaja pasi të jetë ricaktuar fjalëkalimi juaj.<br />Nëse s’jeni i sigurt se ç’duhet bërë, ju lutemi, përpara se të vazhdoni, lidhuni me përgjegjësin tuaj. <br />Doni vërtet të vazhdoni?",
+    "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." : "Ky shërbyes nuk ka lidhje Internet funksionale. Kjo do të  thotë që disa nga karakteristikat e lidhjes së ngarkesës së jashtme, njoftimet rreth përditësimit ose instalimit të aplikacioneve të palës së tretë nuk do të punojnë. Duke aksesuar skedarët në distancë dhe duke dërguar njoftimin me postë elektronike mund të mos punojë. Ne sygjerojmë të aktivizoni lidhjen e Internet për këtë shërbyes nëse doni të keni të gjitha karakteristikat.",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Formësimi për krye ndërmjetësi prapësor është i pasaktë, ose jeni duke hyrë në ownCloud prej një ndërmjetësi të besuar. Nëse s’jeni duke hyrë në ownCloud prej një ndërmjetësi të besuar, ky është një problem sigurie dhe mund t’i lejojë një agresori të maskojë adresën e vet IP si një të pranueshme nga ownCloud-i. Të dhëna të mëtejshme mund të gjeni te <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentimi</a> ynë.",
-    "Allow editing" : "Lejo përpunim",
+    "Hide file listing" : "Fshih skedarin e listimit",
     "Sending ..." : "Po dërgohet …",
     "Email sent" : "Email-i u dërgua",
     "Send link via email" : "Dërgojeni lidhjen me email",
@@ -304,12 +357,14 @@
     "Share with users or remote users…" : "Ndajeni me përdorues ose përdorues të largët…",
     "Warning" : "Kujdes",
     "Error while sending notification" : "Gabim gjatë dërgimit të njoftimit",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Përmirësimi është në progres, largimi nga faqja mund të ndërpres procesin në disa mjedise.",
+    "Updating to {version}" : "Përditësim në {version}",
+    "The update was successful. There were warnings." : "Përditësimi ishte i suksesshëm. Ka paralajmërime..",
     "No search results in other folders" : "S’u gjetën përfundime në dosje të tjera",
     "Two-step verification" : "Verifikim dyhapësh",
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Siguria e zgjeruar është aktivizuar për llogarinë tuaj. Ju lutemi, bëni mirëfilltësimin duke përdorur një faktor të dytë.",
     "Cancel login" : "Anuloje hyrjen",
-    "Please authenticate using the selected factor." : "Ju lutemi, bëni mirëfilltësimin duke përdorur faktorin e përzgjedhur.",
-    "An error occured while verifying the token" : "Ndodhi një gabim gjatë verifikimit të token-it",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Ndajeni me persona në ownCloud-e të tjera duke përdorur sintaksën username@example.com/owncloud"
+    "Please authenticate using the selected factor." : "Ju lutemi, bëni identifikimin duke përdorur faktorin e përzgjedhur.",
+    "An error occured while verifying the token" : "Ndodhi një gabim gjatë verifikimit të token-it"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index 74d050a2150..f5cad1205bd 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "Please select a file." : "Vänligen välj en fil.",
+    "Please select a file." : "Välj en fil.",
     "File is too big" : "Filen är för stor",
     "The selected file is not an image." : "Den valda filen är ingen bild.",
     "The selected file cannot be read." : "Den valda filen kan inte läsas.",
@@ -16,10 +16,10 @@ OC.L10N.register(
     "Crop is not square" : "Beskärning är inte kvadratisk",
     "Couldn't reset password because the token is invalid" : "Kunde inte återställa lösenordet på grund av felaktig token",
     "Couldn't reset password because the token is expired" : "Lösenord kunde inte återställas eftersom \"token\" har utgått",
-    "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.",
-    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka återställningsmail eftersom det saknas epost-adress för denna användaren. Kontakta din administratör",
+    "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmejl. Vänligen kontrollera att ditt användarnamn är korrekt.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka återställningsmejl eftersom det saknas e-postadress för denna användare. Kontakta din administratör",
     "%s password reset" : "%s återställ lösenord",
-    "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmail. Vänligen kontakta din administratör.",
+    "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmejl. Vänligen kontakta din administratör.",
     "Preparing update" : "Förbereder uppdatering",
     "[%d / %d]: %s" : "[%d / %d]: %s",
     "Repair warning: " : "Reperationsvarning:",
@@ -27,8 +27,8 @@ OC.L10N.register(
     "Please use the command line updater because automatic updating is disabled in the config.php." : "Vänligen använd den kommandotolksbaserade uppdateringen då automatisk uppdatering är inaktiverat i config.php.",
     "[%d / %d]: Checking table %s" : "[%d / %d]: Kontrollerar tabell %s",
     "Turned on maintenance mode" : "Aktiverade underhållsläge",
-    "Turned off maintenance mode" : "Deaktiverade underhållsläge",
-    "Maintenance mode is kept active" : "Underhållsläget förblir aktivt",
+    "Turned off maintenance mode" : "Inaktivera underhållsläge",
+    "Maintenance mode is kept active" : "Underhållsläget förblir aktiverat",
     "Updating database schema" : "Uppdaterar databasschema",
     "Updated database" : "Uppdaterade databasen",
     "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Kontrollerar om databasschema kan uppdateras (detta kan ta lång tid beroende på databasens storlek)",
@@ -60,7 +60,7 @@ OC.L10N.register(
     "seconds ago" : "sekunder sedan",
     "Logging in …" : "Loggar in ...",
     "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." : "Länken för att återställa ditt lösenord har skickats till din e-mail. Om du inte mottar något inom kort, kontrollera spam/skräpkorgen.<br>Om det inte finns något där, vänligen kontakta din lokala administratör.",
-    "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?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?",
+    "Your files are encrypted. 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?" : "Dina filer är krypterade. Det kommer inte att finnas något sätt att få tillbaka din data efter att ditt lösenord om ditt lösenord återställs..<br />Om du är osäker på hur du ska göra, vänligen kontakta din administratör innan du fortsätter..<br />Är du verkligen säker på att du vill fortsätta?",
     "I know what I'm doing" : "Jag är säker på vad jag gör",
     "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
     "No" : "Nej",
@@ -75,7 +75,7 @@ OC.L10N.register(
     "One file conflict" : "En filkonflikt",
     "New Files" : "Nya filer",
     "Already existing files" : "Filer som redan existerar",
-    "Which files do you want to keep?" : "Vilken fil vill du behålla?",
+    "Which files do you want to keep?" : "Vilka filer vill du behålla?",
     "If you select both versions, the copied file will have a number added to its name." : "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet.",
     "Continue" : "Fortsätt",
     "(all selected)" : "(Alla valda)",
@@ -90,14 +90,14 @@ OC.L10N.register(
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Din webbserver är inte konfigurerad korrekt för att tillåta filsynkronisering eftersom WebDAV gränssnittet verkar otillgängligt.",
     "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Din webbserver är inte konfigurerad riktigt för att lösa \"{url}\". Vidare information kan hittas i vår <a target=\"_blank\" rel\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
     "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Servern har ingen fungerande internetuppkoppling. Detta betyder att vissa funktioner såsom extern lagring, notifikationer om uppdateringar eller installationer utav tredjepartsapplikationer inte kommer fungera. Åtkomst av filer utifrån och att skicka notifieringar via epost kanske inte fungerar heller. Vi föreslår att internetanslutningen aktiveras för denna server om man vill använda samtliga funktioner.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ingen minnes cache har blivit konfigurerad. För att förbättra din prestanda var god konfigurera memcache om tillgängligt. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ingen minnescache har blivit konfigurerad. För att förbättra din prestanda var god konfigurera memcache om tillgängligt. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom är inte läsbar av PHP vilket definitivt inte är rekommenderat av säkerhetsskäl. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
     "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du kör för närvarande PHP {version}. Vi rekommenderar dig att uppgradera din PHP version så att ta fördel utav <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">prestanda och säkerhetsuppdateringar från PHP Group</a> så fort som din distribution stödjer det.",
     "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfiguration för \"reverse proxy headers\" är felaktig eller så försöker du nå Nextcloud från en betrodd proxy. Om du inte försöker nå Nextcloud från en betrodd proxy, så är detta är en säkerhetsrisk och kan möjliggöra att en hacker att förfalska sin IP adress som är synlig för Nextcloud. Vidare information kan hittas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
     "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached är konfigurerad som distribuerad cache, men fel PHP modul \"memcache\" är installerad. \\OC\\Memcache\\Memcached stödjer bara \"memcached\" och inte \"memcache\". Se wiki för <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached för båda modulerna</a>.",
     "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Några filer passerade inte integritetskontrollen. Vidare information om hur man löser dessa problem kan finnas i vår dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista över felaktiga filer…</a> / <a href=\"{rescanEndpoint}\">Sök igenom igen…</a>)",
-    "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens setup gjordes",
-    "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 datakatalog och dina filer är sannolikt tillgängliga över internet. .htaccess filen fungerar ej korrekt. Vi uppmuntrar starkt att du konfigurerar din webbserver på ett sätt som inte gör din datakatalog tillgänglig på nätet eller att man flyttar hela datakatalogen ut ifrån webbserverns webbrot.",
+    "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens konfiguration gjordes",
+    "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 datakatalog och dina filer är sannolikt tillgängliga för vem som helst på internet. .htaccess filen fungerar inte korrekt. Vi rekommenderar starkt att du konfigurerar din webbserver på ett sätt som gör din datakatalog otillgänglig för vem som helst på internet eller att du flyttar ut hela datakatalogen ifrån webbserverns webbrot.",
     "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 headern är inte konfigurerad att evalueras till \"{expected}\". Detta är en potensiell säkerhetsrisk och vi rekommenderar dig åtgärda denna inställning.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "The \"Strict-Transport-Security\" HTTP headern är inte konfigurerad till minst \"{seconds}\" sekunder. För förbättrad säkerhet rekommenderas aktivering utav HSTS som beskrivs i våra <a href=\"{docUrl}\" rel=\"noreferrer\">säkerhetstips</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 har begärt denna sidan över HTTP. Vi föreslår starkt att du konfigurerar din webbserver att kräva använding utav HTTPS istället, som beskrivs i våra <a href=\"{docUrl}\">säkerhetstips</a>.",
@@ -106,12 +106,12 @@ OC.L10N.register(
     "Error" : "Fel",
     "Error while sharing" : "Fel vid delning",
     "Error while unsharing" : "Fel när delning skulle avslutas",
-    "Error setting expiration date" : "Fel vid sättning av utgångsdatum",
-    "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",
-    "Set expiration date" : "Sätt utgångsdatum",
+    "Error setting expiration date" : "Fel vid val av utgångsdatum",
+    "The public link will expire no later than {days} days after it is created" : "Den offentliga länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
+    "Set expiration date" : "Välj utgångsdatum",
     "Expiration" : "Upphör",
     "Expiration date" : "Utgångsdatum",
-    "Choose a password for the public link" : "Välj ett lösenord för den publika länken",
+    "Choose a password for the public link" : "Välj ett lösenord för den offentliga länken",
     "Copied!" : "Kopierad!",
     "Copy" : "Kopiera",
     "Not supported!" : "Stöds ej!",
@@ -122,15 +122,16 @@ OC.L10N.register(
     "Link" : "Länk",
     "Password protect" : "Lösenordsskydda",
     "Allow upload and editing" : "Tillåt uppladdning och redigering",
+    "Allow editing" : "Tillåt redigering",
     "File drop (upload only)" : "Göm fillista (endast uppladdning)",
-    "Email link to person" : "E-posta länk till person",
+    "Email link to person" : "Skicka länken som e-postmeddelande",
     "Send" : "Skicka",
     "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}",
     "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} delad via länk",
     "group" : "Grupp",
-    "remote" : "fjärr",
-    "email" : "epost",
+    "remote" : "extern",
+    "email" : "e-post",
     "Unshare" : "Sluta dela",
     "can reshare" : "kan dela vidare",
     "can edit" : "kan redigera",
@@ -138,23 +139,23 @@ OC.L10N.register(
     "can change" : "kan ändra",
     "can delete" : "kan radera",
     "access control" : "åtkomstkontroll",
-    "Could not unshare" : "Kunde inte odela",
+    "Could not unshare" : "Kunde inte ta bort delning",
     "Share details could not be loaded for this item." : "Delningsdetaljer kunde inte laddas för detta objekt.",
     "No users or groups found for {search}" : "Inga användare eller grupper funna för {search}",
     "No users found for {search}" : "Inga användare funna för {search}",
     "An error occurred. Please try again" : "Ett fel uppstod. Vänligen försök igen",
-    "{sharee} (group)" : "{sharee} (group)",
-    "{sharee} (remote)" : "{sharee} (remote)",
-    "{sharee} (email)" : "{sharee} (email)",
+    "{sharee} (group)" : "{sharee} (grupp)",
+    "{sharee} (remote)" : "{sharee} (externt)",
+    "{sharee} (email)" : "{sharee} (e-post)",
     "Share" : "Dela",
-    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Dela med andra personer på andra servrar genom att använda deras Federerade Cloud ID användarnamn@example.com/nextcloud",
-    "Share with users or by mail..." : "Dela med användare via epost...",
-    "Share with users or remote users..." : "Dela med användare eller fjärranvändare...",
-    "Share with users, remote users or by mail..." : "Dela med användare, fjärranvändare eller via epost...",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Dela med andra personer på andra servrar genom att använda deras Federerade Moln-ID användarnamn@example.com/nextcloud",
+    "Share with users or by mail..." : "Dela med användare eller via e-post...",
+    "Share with users or remote users..." : "Dela med användare eller externanvändare...",
+    "Share with users, remote users or by mail..." : "Dela med användare, externanvändare eller via e-post...",
     "Share with users or groups..." : "Dela med användare eller grupper...",
     "Share with users, groups or by mail..." : "Dela med användare, grupper eller via epost",
-    "Share with users, groups or remote users..." : "Dela med användare, grupper eller fjärranvändare...",
-    "Share with users, groups, remote users or by mail..." : "Dela med användare, grupper, fjärranvändare eller via epost...",
+    "Share with users, groups or remote users..." : "Dela med användare, grupper eller externanvändare...",
+    "Share with users, groups, remote users or by mail..." : "Dela med användare, grupper, externanvändare eller via e-post...",
     "Share with users..." : "Dela med användare...",
     "Error removing share" : "Fel uppstod när delning försökte tas bort",
     "Non-existing tag #{tag}" : "Icke-existerande tag #{tag}",
@@ -163,13 +164,13 @@ OC.L10N.register(
     "({scope})" : "({scope})",
     "Delete" : "Radera",
     "Rename" : "Byt namn",
-    "Collaborative tags" : "Sammarbets taggar",
+    "Collaborative tags" : "Samverkanstaggar",
     "No tags found" : "Hittade inga taggar",
     "The object type is not specified." : "Objekttypen är inte specificerad.",
     "Enter new" : "Skriv nytt",
     "Add" : "Lägg till",
     "Edit tags" : "Redigera taggar",
-    "Error loading dialog template: {error}" : "Fel vid inläsning av dialogmall: {fel}",
+    "Error loading dialog template: {error}" : "Fel vid inläsning av dialogmall: {error}",
     "No tags selected for deletion." : "Inga taggar valda för borttagning.",
     "unknown text" : "okänd text",
     "Hello world!" : "Hej världen!",
@@ -177,7 +178,7 @@ OC.L10N.register(
     "Hello {name}, the weather is {weather}" : "Hej {name}, vädret är {weather}",
     "Hello {name}" : "Hej {name}",
     "new" : "ny",
-    "_download %n file_::_download %n files_" : ["Ladda ner %n fil","Ladda ner %n filer"],
+    "_download %n file_::_download %n files_" : ["Ladda ner %n fil","Ladda ned %n filer"],
     "The update is in progress, leaving this page might interrupt the process in some environments." : "Uppdateringen pågår, om sidan lämnas kan uppdateringen misslyckas. ",
     "Update to {version}" : "Uppdatera till {version}",
     "An error occurred." : "Ett fel inträffade.",
@@ -189,24 +190,24 @@ OC.L10N.register(
     "Searching other places" : "Söker på andra platser",
     "No search results in other folders for '{tag}{filter}{endtag}'" : "Inga sökresultat i andra mappar för '{tag}{filter}{endtag}'",
     "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} sökresultat i en annan mapp","{count} sökresultat i andra mappar"],
-    "Personal" : "Personligt",
+    "Personal" : "Personliga Inställningar",
     "Users" : "Användare",
-    "Apps" : "Program",
+    "Apps" : "Appar",
     "Admin" : "Admin",
     "Help" : "Hjälp",
     "Access forbidden" : "Åtkomst förbjuden",
     "File not found" : "Filen kunde inte hittas",
     "The specified document has not been found on the server." : "Det angivna dokumentet hittades inte på servern.",
     "You can click here to return to %s." : "Du kan klicka här för att återvända till %s.",
-    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej där!,\n\nVi vill bara meddela att %s delade %s med dig.\nTitta på den här: %s\n\n",
-    "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej där,\n\nVi vill bara meddela att %s delade %s med dig.\nTitta på den här: %s\n\n",
+    "The share will expire on %s." : "Delningen kommer att upphöra %s.",
     "Cheers!" : "Ha de fint!",
     "Internal Server Error" : "Internt serverfel",
     "The server encountered an internal error and was unable to complete your request." : "Servern påträffade ett internt fel och lmisslyckades att slutföra din begäran.",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Vänligen kontakta serveradministratören om detta fel återkommer flera gånger, vänligen inkludera nedanstående tekniska detaljeri din felrapport.",
     "More details can be found in the server log." : "Mer detaljer återfinns i serverns logg.",
     "Technical details" : "Tekniska detaljer",
-    "Remote Address: %s" : "Fjärradress: %s",
+    "Remote Address: %s" : "Extern adress: %s",
     "Request ID: %s" : "Begärd ID: %s",
     "Type: %s" : "Typ: %s",
     "Code: %s" : "Kod: %s",
@@ -230,17 +231,18 @@ OC.L10N.register(
     "Database name" : "Databasnamn",
     "Database tablespace" : "Databas tabellutrymme",
     "Database host" : "Databasserver",
-    "Performance warning" : "Prestanda varning",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Vänligen ange portnumret tillsammans med hostnamnet (t.ex. localhost:5432).",
+    "Performance warning" : "Prestandavarning",
     "SQLite will be used as database." : "SQLite kommer att användas som databas",
-    "For larger installations we recommend to choose a different database backend." : "För större installationer rekommenderar vi at man väljer en annan databasmotor.",
-    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Speciellt när desktop klienten för filsynkronisering används så avråds användande av SQLite.",
-    "Finish setup" : "Avsluta installation",
+    "For larger installations we recommend to choose a different database backend." : "För större installationer rekommenderar vi att man väljer en annan databasmotor.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Speciellt när skrivbordsklienten för filsynkronisering används så avråds användande av SQLite.",
+    "Finish setup" : "Slutför installationen",
     "Finishing …" : "Avslutar ...",
     "Need help?" : "Behöver du hjälp?",
-    "See the documentation" : "Kolla dokumentationen",
+    "See the documentation" : "Läs dokumentationen",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denna applikationen kräver JavaScript för att fungera korrekt. Var god {linkstart}aktivera JavaScript{linkend} och ladda om sidan.",
-    "Log out" : "Logga ut",
     "Search" : "Sök",
+    "Log out" : "Logga ut",
     "This action requires you to confirm your password:" : "Denna åtgärd kräver att du bekräftar ditt lösenord:",
     "Confirm your password" : "Bekräfta ditt lösenord",
     "Server side authentication failed!" : "Servern misslyckades med autentisering!",
@@ -248,7 +250,7 @@ OC.L10N.register(
     "An internal error occurred." : "Ett internt fel uppstod.",
     "Please try again or contact your administrator." : "Vänligen försök igen eller kontakta din administratör.",
     "Username or email" : "Användarnamn eller e-post",
-    "Wrong password. Reset it?" : "Fel lösenord. Vill du återställa?",
+    "Wrong password. Reset it?" : "Fel lösenord. Vill du återställa lösenordet?",
     "Wrong password." : "Fel lösenord.",
     "Log in" : "Logga in",
     "Stay logged in" : "Fortsätt vara inloggad.",
@@ -256,19 +258,19 @@ OC.L10N.register(
     "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}",
     "New password" : "Nytt lösenord",
     "New Password" : "Nytt lösenord",
-    "Reset password" : "Återställ lösenordet",
-    "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>",
+    "Reset password" : "Återställ lösenord",
+    "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>Tänkte bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Klicka här för att se!</a><br><br>",
     "This Nextcloud instance is currently in single user mode." : "Denna Nextcloud instans är för närvarande i enanvändarläge",
     "This means only administrators can use the instance." : "Detta betyder att endast administartörer kan använda instansen.",
-    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hör av dig till din systemadministratör ifall detta meddelande fortsätter eller visas oväntat.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hör av dig till din systemadministratör om detta meddelande fortsätter eller visas oväntat.",
     "Thank you for your patience." : "Tack för ditt tålamod.",
     "Two-factor authentication" : "Tvåfaktorsautentisering",
-    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Utökad säkerhet är aktiverat för ditt konto. Var vänlig verifiera med en andra faktor. ",
+    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Utökad säkerhet är aktiverat för ditt konto. Var vänlig verifiera med tvåfaktorsautentisering.",
     "Cancel log in" : "Avbryt inloggning",
-    "Use backup code" : "Använd backupkod",
-    "Error while validating your second factor" : "Fel vid verifiering av din andra faktor.",
-    "You are accessing the server from an untrusted domain." : "Du ansluter till servern från en osäker domän.",
-    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Var god kontakta din administratör. Om du är en administratör för denna installationen konfigurera \"trusted_domains\" i inställnings i config/config.php. En exempelkonfiguration återfinns i confg/config.sample.php.",
+    "Use backup code" : "Använd reservkod",
+    "Error while validating your second factor" : "Fel vid verifiering av tvåfaktorsautentisering.",
+    "You are accessing the server from an untrusted domain." : "Du försöker ansluta från en icke tillåten domän.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Var god kontakta din administratör. Om du är en administratör för denna installation så behöver du konfigurera \"trusted_domains\" i config/config.php. En exempelkonfiguration återfinns i confg/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 pålitlig domän",
     "App update required" : "Appen behöver uppdateras",
@@ -277,7 +279,7 @@ OC.L10N.register(
     "These incompatible apps will be disabled:" : "Dessa inkompatibla 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",
+    "Start update" : "Påbörja uppdateringen",
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "För att undvika timeout vid större installationer kan du istället köra följande kommando från din installationskatalog:",
     "Detailed logs" : "Detaljerade loggar",
     "Update needed" : "Uppdatering krävs",
@@ -285,13 +287,13 @@ OC.L10N.register(
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "För hjälp, se <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentationen</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Denna %s instans befinner sig för närvarande i underhållsläge, vilket kan ta ett tag.",
     "This page will refresh itself when the %s instance is available again." : "Denna sida uppdaterar sig själv när %s instansen är tillgänglig igen.",
-    "Error loading tags" : "Fel vid inläsning utav taggar",
-    "Tag already exists" : "Tagg existerar redan",
+    "Error loading tags" : "Fel vid inläsning av taggar",
+    "Tag already exists" : "Taggen finns redan",
     "Error deleting tag(s)" : "Fel vid borttagning utav tagg(ar)",
     "Error tagging" : "Fel vid taggning",
-    "Error untagging" : "Fel vid avtaggning",
+    "Error untagging" : "Fel vid borttagning av tagg",
     "Error favoriting" : "Fel vid favorisering",
-    "Error unfavoriting" : "Fel vid avfavorisering ",
+    "Error unfavoriting" : "Fel vid borttagning av favorisering ",
     "Couldn't send mail to following users: %s " : "Gick inte att skicka e-post till följande användare: %s",
     "Sunday" : "Söndag",
     "Monday" : "Måndag",
@@ -338,23 +340,23 @@ OC.L10N.register(
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dec.",
+    "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?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?",
     "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." : "Servern har ingen fungerande internetuppkoppling. Detta betyder att vissa funktioner så som extern lagring, notifikationer om uppdateringar eller installationer utav tredjepartsapplikationer inte kommer fungera. Åtkomst av filer utifrån och att skicka notifieringar via epost kanske inte fungerar heller. Vi föreslår att internetanslutningen aktiveras för denna server om man vill använda samtliga funktioner.",
-    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfiguration för \"reverse proxy headers\" är felaktig eller så försöker du nå Owncloud från en betrodd proxy. Om du inte försöker nå Owncloud från en betrodd proxy, detta är en säkerhetsrisk och kan möjliggöra att en hacker att förfalska sin IP adress som är synlig för Owncloud. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
-    "Allow editing" : "Tillåt redigering",
-    "Hide file listing" : "Göm fillista",
+    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfiguration för \"reverse proxy headers\" är felaktig eller så försöker du nå Nextcloud från en betrodd proxy. Om du inte försöker nå Nextcloud från en betrodd proxy, detta är en säkerhetsrisk och kan möjliggöra att en hacker att förfalska sin IP adress som är synlig för Nextcloud. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
+    "Hide file listing" : "Dölj filer i mappen",
     "Sending ..." : "Skickar ...",
     "Email sent" : "E-post skickat",
     "Send link via email" : "Skicka länk via e-post",
     "notify by email" : "informera via e-post",
     "can share" : "får dela",
     "create" : "skapa",
-    "change" : "ändra",
+    "change" : "redigera",
     "delete" : "radera",
-    "{sharee} (at {server})" : "{sharee} (at {server})",
+    "{sharee} (at {server})" : "{sharee} (på {server})",
     "Share with users…" : "Dela med användare...",
-    "Share with users, groups or remote users…" : "Dela med användare, grupper och fjärranvändare...",
+    "Share with users, groups or remote users…" : "Dela med användare, grupper eller externanvändare...",
     "Share with users or groups…" : "Dela med användare eller grupper...",
-    "Share with users or remote users…" : "Dela med användare eller fjärranvändare...",
+    "Share with users or remote users…" : "Dela med användare eller externanvändare...",
     "Warning" : "Varning",
     "Error while sending notification" : "Fel när notifikation skulle skickas",
     "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Uppgradering pågår, att lämna denna sidan kan störa processen i vissa miljöer",
@@ -365,20 +367,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Utökad säkerhet har aktiverats på ditt konto. Vänligen autentisera med en andra faktor.",
     "Cancel login" : "Avbryt inloggning",
     "Please authenticate using the selected factor." : "Vänligen autentisera med vald faktor.",
-    "An error occured while verifying the token" : "Ett fel uppstod vid verifiering av token.",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Din webbserver är inte konfigurerad riktigt för att lösa \"{url}\". Vidare information kan hittas i vår <a target=\"_blank\" href=\"{docLink}\">documentation</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ingen minnescache har blivit konfigurerad. För att förbättra din prestanda var god konfigurera memcache om tillgängligt. Vidare information kan finnas i vår <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom är inte läsbar av PHP vilket definitivt inte är rekommenderat av säkerhetsskäl. Vidare information kan finnas i vår <a target=\"_blank\" href=\"{docLink}\">dokumentation</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du kör för närvarande PHP {version}. Vi rekommenderar dig att uppgradera din PHP version så att ta fördel utav <a target=\"_blank\" href=\"{phpLink}\">prestanda och säkerhetsuppdateringar från PHP Group</a> å fort som din distribution stödjer det.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Konfiguration för \"reverse proxy headers\" är felaktig eller så försöker du nå Nextcloud från en betrodd proxy. Om du inte försöker nå Nextcloud från en betrodd proxy, detta är en säkerhetsrisk och kan möjliggöra att en hacker att förfalska sin IP adress som är synlig för Nextcloud. Vidare information kan finnas i vår <a target=\"_blank\" href=\"{docLink}\">documentation</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached är konfigurerad som distribuerad cache, men fel PHP modul \"memcache\" är installerad. \\OC\\Memcache\\Memcached stödjer bara \"memcached\" och inte \"memcache\". Se wiki för  <a target=\"_blank\" href=\"{wikiLink}\">memcached för båda modulerna</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Några filer passerade inte integritetskontrollen. Vidare information om hur man löser dessa problem kan finnas i vår dokumentation <a target=\"_blank\" href=\"{docLink}\">dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista över felaktiga filer…</a> / <a href=\"{rescanEndpoint}\">Sök igenom igen…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP header är inte konfigurerad till minst \"{seconds}\" sekunder. För utökad säkerhet rekommenderas att HSTS aktiveras som beskrivs i våra <a href=\"{docUrl}\">säkerhetstips</a>.",
-    "An error occured. Please try again" : "Ett fel inträffade. Var god försök igen",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Dela med folk på andra ownClouds med följande syntax username@example.com/owncloud",
-    "not assignable" : "Inte tilldelbar",
-    "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information om hur servern bör konfigureras, se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
-    "An internal error occured." : "Ett internt fel uppstod. "
+    "An error occured while verifying the token" : "Ett fel uppstod vid verifiering av token."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index 503e68c100f..642187b356c 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Please select a file." : "Vänligen välj en fil.",
+    "Please select a file." : "Välj en fil.",
     "File is too big" : "Filen är för stor",
     "The selected file is not an image." : "Den valda filen är ingen bild.",
     "The selected file cannot be read." : "Den valda filen kan inte läsas.",
@@ -14,10 +14,10 @@
     "Crop is not square" : "Beskärning är inte kvadratisk",
     "Couldn't reset password because the token is invalid" : "Kunde inte återställa lösenordet på grund av felaktig token",
     "Couldn't reset password because the token is expired" : "Lösenord kunde inte återställas eftersom \"token\" har utgått",
-    "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.",
-    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka återställningsmail eftersom det saknas epost-adress för denna användaren. Kontakta din administratör",
+    "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmejl. Vänligen kontrollera att ditt användarnamn är korrekt.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka återställningsmejl eftersom det saknas e-postadress för denna användare. Kontakta din administratör",
     "%s password reset" : "%s återställ lösenord",
-    "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmail. Vänligen kontakta din administratör.",
+    "Couldn't send reset email. Please contact your administrator." : "Kunde inte skicka återställningsmejl. Vänligen kontakta din administratör.",
     "Preparing update" : "Förbereder uppdatering",
     "[%d / %d]: %s" : "[%d / %d]: %s",
     "Repair warning: " : "Reperationsvarning:",
@@ -25,8 +25,8 @@
     "Please use the command line updater because automatic updating is disabled in the config.php." : "Vänligen använd den kommandotolksbaserade uppdateringen då automatisk uppdatering är inaktiverat i config.php.",
     "[%d / %d]: Checking table %s" : "[%d / %d]: Kontrollerar tabell %s",
     "Turned on maintenance mode" : "Aktiverade underhållsläge",
-    "Turned off maintenance mode" : "Deaktiverade underhållsläge",
-    "Maintenance mode is kept active" : "Underhållsläget förblir aktivt",
+    "Turned off maintenance mode" : "Inaktivera underhållsläge",
+    "Maintenance mode is kept active" : "Underhållsläget förblir aktiverat",
     "Updating database schema" : "Uppdaterar databasschema",
     "Updated database" : "Uppdaterade databasen",
     "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "Kontrollerar om databasschema kan uppdateras (detta kan ta lång tid beroende på databasens storlek)",
@@ -58,7 +58,7 @@
     "seconds ago" : "sekunder sedan",
     "Logging in …" : "Loggar in ...",
     "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." : "Länken för att återställa ditt lösenord har skickats till din e-mail. Om du inte mottar något inom kort, kontrollera spam/skräpkorgen.<br>Om det inte finns något där, vänligen kontakta din lokala administratör.",
-    "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?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?",
+    "Your files are encrypted. 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?" : "Dina filer är krypterade. Det kommer inte att finnas något sätt att få tillbaka din data efter att ditt lösenord om ditt lösenord återställs..<br />Om du är osäker på hur du ska göra, vänligen kontakta din administratör innan du fortsätter..<br />Är du verkligen säker på att du vill fortsätta?",
     "I know what I'm doing" : "Jag är säker på vad jag gör",
     "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
     "No" : "Nej",
@@ -73,7 +73,7 @@
     "One file conflict" : "En filkonflikt",
     "New Files" : "Nya filer",
     "Already existing files" : "Filer som redan existerar",
-    "Which files do you want to keep?" : "Vilken fil vill du behålla?",
+    "Which files do you want to keep?" : "Vilka filer vill du behålla?",
     "If you select both versions, the copied file will have a number added to its name." : "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet.",
     "Continue" : "Fortsätt",
     "(all selected)" : "(Alla valda)",
@@ -88,14 +88,14 @@
     "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "Din webbserver är inte konfigurerad korrekt för att tillåta filsynkronisering eftersom WebDAV gränssnittet verkar otillgängligt.",
     "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Din webbserver är inte konfigurerad riktigt för att lösa \"{url}\". Vidare information kan hittas i vår <a target=\"_blank\" rel\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
     "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "Servern har ingen fungerande internetuppkoppling. Detta betyder att vissa funktioner såsom extern lagring, notifikationer om uppdateringar eller installationer utav tredjepartsapplikationer inte kommer fungera. Åtkomst av filer utifrån och att skicka notifieringar via epost kanske inte fungerar heller. Vi föreslår att internetanslutningen aktiveras för denna server om man vill använda samtliga funktioner.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ingen minnes cache har blivit konfigurerad. För att förbättra din prestanda var god konfigurera memcache om tillgängligt. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ingen minnescache har blivit konfigurerad. För att förbättra din prestanda var god konfigurera memcache om tillgängligt. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom är inte läsbar av PHP vilket definitivt inte är rekommenderat av säkerhetsskäl. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
     "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du kör för närvarande PHP {version}. Vi rekommenderar dig att uppgradera din PHP version så att ta fördel utav <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">prestanda och säkerhetsuppdateringar från PHP Group</a> så fort som din distribution stödjer det.",
     "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfiguration för \"reverse proxy headers\" är felaktig eller så försöker du nå Nextcloud från en betrodd proxy. Om du inte försöker nå Nextcloud från en betrodd proxy, så är detta är en säkerhetsrisk och kan möjliggöra att en hacker att förfalska sin IP adress som är synlig för Nextcloud. Vidare information kan hittas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
     "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached är konfigurerad som distribuerad cache, men fel PHP modul \"memcache\" är installerad. \\OC\\Memcache\\Memcached stödjer bara \"memcached\" och inte \"memcache\". Se wiki för <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached för båda modulerna</a>.",
     "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Några filer passerade inte integritetskontrollen. Vidare information om hur man löser dessa problem kan finnas i vår dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista över felaktiga filer…</a> / <a href=\"{rescanEndpoint}\">Sök igenom igen…</a>)",
-    "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens setup gjordes",
-    "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 datakatalog och dina filer är sannolikt tillgängliga över internet. .htaccess filen fungerar ej korrekt. Vi uppmuntrar starkt att du konfigurerar din webbserver på ett sätt som inte gör din datakatalog tillgänglig på nätet eller att man flyttar hela datakatalogen ut ifrån webbserverns webbrot.",
+    "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens konfiguration gjordes",
+    "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 datakatalog och dina filer är sannolikt tillgängliga för vem som helst på internet. .htaccess filen fungerar inte korrekt. Vi rekommenderar starkt att du konfigurerar din webbserver på ett sätt som gör din datakatalog otillgänglig för vem som helst på internet eller att du flyttar ut hela datakatalogen ifrån webbserverns webbrot.",
     "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 headern är inte konfigurerad att evalueras till \"{expected}\". Detta är en potensiell säkerhetsrisk och vi rekommenderar dig åtgärda denna inställning.",
     "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "The \"Strict-Transport-Security\" HTTP headern är inte konfigurerad till minst \"{seconds}\" sekunder. För förbättrad säkerhet rekommenderas aktivering utav HSTS som beskrivs i våra <a href=\"{docUrl}\" rel=\"noreferrer\">säkerhetstips</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 har begärt denna sidan över HTTP. Vi föreslår starkt att du konfigurerar din webbserver att kräva använding utav HTTPS istället, som beskrivs i våra <a href=\"{docUrl}\">säkerhetstips</a>.",
@@ -104,12 +104,12 @@
     "Error" : "Fel",
     "Error while sharing" : "Fel vid delning",
     "Error while unsharing" : "Fel när delning skulle avslutas",
-    "Error setting expiration date" : "Fel vid sättning av utgångsdatum",
-    "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",
-    "Set expiration date" : "Sätt utgångsdatum",
+    "Error setting expiration date" : "Fel vid val av utgångsdatum",
+    "The public link will expire no later than {days} days after it is created" : "Den offentliga länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
+    "Set expiration date" : "Välj utgångsdatum",
     "Expiration" : "Upphör",
     "Expiration date" : "Utgångsdatum",
-    "Choose a password for the public link" : "Välj ett lösenord för den publika länken",
+    "Choose a password for the public link" : "Välj ett lösenord för den offentliga länken",
     "Copied!" : "Kopierad!",
     "Copy" : "Kopiera",
     "Not supported!" : "Stöds ej!",
@@ -120,15 +120,16 @@
     "Link" : "Länk",
     "Password protect" : "Lösenordsskydda",
     "Allow upload and editing" : "Tillåt uppladdning och redigering",
+    "Allow editing" : "Tillåt redigering",
     "File drop (upload only)" : "Göm fillista (endast uppladdning)",
-    "Email link to person" : "E-posta länk till person",
+    "Email link to person" : "Skicka länken som e-postmeddelande",
     "Send" : "Skicka",
     "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}",
     "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} delad via länk",
     "group" : "Grupp",
-    "remote" : "fjärr",
-    "email" : "epost",
+    "remote" : "extern",
+    "email" : "e-post",
     "Unshare" : "Sluta dela",
     "can reshare" : "kan dela vidare",
     "can edit" : "kan redigera",
@@ -136,23 +137,23 @@
     "can change" : "kan ändra",
     "can delete" : "kan radera",
     "access control" : "åtkomstkontroll",
-    "Could not unshare" : "Kunde inte odela",
+    "Could not unshare" : "Kunde inte ta bort delning",
     "Share details could not be loaded for this item." : "Delningsdetaljer kunde inte laddas för detta objekt.",
     "No users or groups found for {search}" : "Inga användare eller grupper funna för {search}",
     "No users found for {search}" : "Inga användare funna för {search}",
     "An error occurred. Please try again" : "Ett fel uppstod. Vänligen försök igen",
-    "{sharee} (group)" : "{sharee} (group)",
-    "{sharee} (remote)" : "{sharee} (remote)",
-    "{sharee} (email)" : "{sharee} (email)",
+    "{sharee} (group)" : "{sharee} (grupp)",
+    "{sharee} (remote)" : "{sharee} (externt)",
+    "{sharee} (email)" : "{sharee} (e-post)",
     "Share" : "Dela",
-    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Dela med andra personer på andra servrar genom att använda deras Federerade Cloud ID användarnamn@example.com/nextcloud",
-    "Share with users or by mail..." : "Dela med användare via epost...",
-    "Share with users or remote users..." : "Dela med användare eller fjärranvändare...",
-    "Share with users, remote users or by mail..." : "Dela med användare, fjärranvändare eller via epost...",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "Dela med andra personer på andra servrar genom att använda deras Federerade Moln-ID användarnamn@example.com/nextcloud",
+    "Share with users or by mail..." : "Dela med användare eller via e-post...",
+    "Share with users or remote users..." : "Dela med användare eller externanvändare...",
+    "Share with users, remote users or by mail..." : "Dela med användare, externanvändare eller via e-post...",
     "Share with users or groups..." : "Dela med användare eller grupper...",
     "Share with users, groups or by mail..." : "Dela med användare, grupper eller via epost",
-    "Share with users, groups or remote users..." : "Dela med användare, grupper eller fjärranvändare...",
-    "Share with users, groups, remote users or by mail..." : "Dela med användare, grupper, fjärranvändare eller via epost...",
+    "Share with users, groups or remote users..." : "Dela med användare, grupper eller externanvändare...",
+    "Share with users, groups, remote users or by mail..." : "Dela med användare, grupper, externanvändare eller via e-post...",
     "Share with users..." : "Dela med användare...",
     "Error removing share" : "Fel uppstod när delning försökte tas bort",
     "Non-existing tag #{tag}" : "Icke-existerande tag #{tag}",
@@ -161,13 +162,13 @@
     "({scope})" : "({scope})",
     "Delete" : "Radera",
     "Rename" : "Byt namn",
-    "Collaborative tags" : "Sammarbets taggar",
+    "Collaborative tags" : "Samverkanstaggar",
     "No tags found" : "Hittade inga taggar",
     "The object type is not specified." : "Objekttypen är inte specificerad.",
     "Enter new" : "Skriv nytt",
     "Add" : "Lägg till",
     "Edit tags" : "Redigera taggar",
-    "Error loading dialog template: {error}" : "Fel vid inläsning av dialogmall: {fel}",
+    "Error loading dialog template: {error}" : "Fel vid inläsning av dialogmall: {error}",
     "No tags selected for deletion." : "Inga taggar valda för borttagning.",
     "unknown text" : "okänd text",
     "Hello world!" : "Hej världen!",
@@ -175,7 +176,7 @@
     "Hello {name}, the weather is {weather}" : "Hej {name}, vädret är {weather}",
     "Hello {name}" : "Hej {name}",
     "new" : "ny",
-    "_download %n file_::_download %n files_" : ["Ladda ner %n fil","Ladda ner %n filer"],
+    "_download %n file_::_download %n files_" : ["Ladda ner %n fil","Ladda ned %n filer"],
     "The update is in progress, leaving this page might interrupt the process in some environments." : "Uppdateringen pågår, om sidan lämnas kan uppdateringen misslyckas. ",
     "Update to {version}" : "Uppdatera till {version}",
     "An error occurred." : "Ett fel inträffade.",
@@ -187,24 +188,24 @@
     "Searching other places" : "Söker på andra platser",
     "No search results in other folders for '{tag}{filter}{endtag}'" : "Inga sökresultat i andra mappar för '{tag}{filter}{endtag}'",
     "_{count} search result in another folder_::_{count} search results in other folders_" : ["{count} sökresultat i en annan mapp","{count} sökresultat i andra mappar"],
-    "Personal" : "Personligt",
+    "Personal" : "Personliga Inställningar",
     "Users" : "Användare",
-    "Apps" : "Program",
+    "Apps" : "Appar",
     "Admin" : "Admin",
     "Help" : "Hjälp",
     "Access forbidden" : "Åtkomst förbjuden",
     "File not found" : "Filen kunde inte hittas",
     "The specified document has not been found on the server." : "Det angivna dokumentet hittades inte på servern.",
     "You can click here to return to %s." : "Du kan klicka här för att återvända till %s.",
-    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej där!,\n\nVi vill bara meddela att %s delade %s med dig.\nTitta på den här: %s\n\n",
-    "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej där,\n\nVi vill bara meddela att %s delade %s med dig.\nTitta på den här: %s\n\n",
+    "The share will expire on %s." : "Delningen kommer att upphöra %s.",
     "Cheers!" : "Ha de fint!",
     "Internal Server Error" : "Internt serverfel",
     "The server encountered an internal error and was unable to complete your request." : "Servern påträffade ett internt fel och lmisslyckades att slutföra din begäran.",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Vänligen kontakta serveradministratören om detta fel återkommer flera gånger, vänligen inkludera nedanstående tekniska detaljeri din felrapport.",
     "More details can be found in the server log." : "Mer detaljer återfinns i serverns logg.",
     "Technical details" : "Tekniska detaljer",
-    "Remote Address: %s" : "Fjärradress: %s",
+    "Remote Address: %s" : "Extern adress: %s",
     "Request ID: %s" : "Begärd ID: %s",
     "Type: %s" : "Typ: %s",
     "Code: %s" : "Kod: %s",
@@ -228,17 +229,18 @@
     "Database name" : "Databasnamn",
     "Database tablespace" : "Databas tabellutrymme",
     "Database host" : "Databasserver",
-    "Performance warning" : "Prestanda varning",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "Vänligen ange portnumret tillsammans med hostnamnet (t.ex. localhost:5432).",
+    "Performance warning" : "Prestandavarning",
     "SQLite will be used as database." : "SQLite kommer att användas som databas",
-    "For larger installations we recommend to choose a different database backend." : "För större installationer rekommenderar vi at man väljer en annan databasmotor.",
-    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Speciellt när desktop klienten för filsynkronisering används så avråds användande av SQLite.",
-    "Finish setup" : "Avsluta installation",
+    "For larger installations we recommend to choose a different database backend." : "För större installationer rekommenderar vi att man väljer en annan databasmotor.",
+    "Especially when using the desktop client for file syncing the use of SQLite is discouraged." : "Speciellt när skrivbordsklienten för filsynkronisering används så avråds användande av SQLite.",
+    "Finish setup" : "Slutför installationen",
     "Finishing …" : "Avslutar ...",
     "Need help?" : "Behöver du hjälp?",
-    "See the documentation" : "Kolla dokumentationen",
+    "See the documentation" : "Läs dokumentationen",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Denna applikationen kräver JavaScript för att fungera korrekt. Var god {linkstart}aktivera JavaScript{linkend} och ladda om sidan.",
-    "Log out" : "Logga ut",
     "Search" : "Sök",
+    "Log out" : "Logga ut",
     "This action requires you to confirm your password:" : "Denna åtgärd kräver att du bekräftar ditt lösenord:",
     "Confirm your password" : "Bekräfta ditt lösenord",
     "Server side authentication failed!" : "Servern misslyckades med autentisering!",
@@ -246,7 +248,7 @@
     "An internal error occurred." : "Ett internt fel uppstod.",
     "Please try again or contact your administrator." : "Vänligen försök igen eller kontakta din administratör.",
     "Username or email" : "Användarnamn eller e-post",
-    "Wrong password. Reset it?" : "Fel lösenord. Vill du återställa?",
+    "Wrong password. Reset it?" : "Fel lösenord. Vill du återställa lösenordet?",
     "Wrong password." : "Fel lösenord.",
     "Log in" : "Logga in",
     "Stay logged in" : "Fortsätt vara inloggad.",
@@ -254,19 +256,19 @@
     "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}",
     "New password" : "Nytt lösenord",
     "New Password" : "Nytt lösenord",
-    "Reset password" : "Återställ lösenordet",
-    "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>",
+    "Reset password" : "Återställ lösenord",
+    "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>Tänkte bara informera dig om att %s delade <strong>%s</strong> med dig.<br><a href=\"%s\">Klicka här för att se!</a><br><br>",
     "This Nextcloud instance is currently in single user mode." : "Denna Nextcloud instans är för närvarande i enanvändarläge",
     "This means only administrators can use the instance." : "Detta betyder att endast administartörer kan använda instansen.",
-    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hör av dig till din systemadministratör ifall detta meddelande fortsätter eller visas oväntat.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hör av dig till din systemadministratör om detta meddelande fortsätter eller visas oväntat.",
     "Thank you for your patience." : "Tack för ditt tålamod.",
     "Two-factor authentication" : "Tvåfaktorsautentisering",
-    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Utökad säkerhet är aktiverat för ditt konto. Var vänlig verifiera med en andra faktor. ",
+    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "Utökad säkerhet är aktiverat för ditt konto. Var vänlig verifiera med tvåfaktorsautentisering.",
     "Cancel log in" : "Avbryt inloggning",
-    "Use backup code" : "Använd backupkod",
-    "Error while validating your second factor" : "Fel vid verifiering av din andra faktor.",
-    "You are accessing the server from an untrusted domain." : "Du ansluter till servern från en osäker domän.",
-    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Var god kontakta din administratör. Om du är en administratör för denna installationen konfigurera \"trusted_domains\" i inställnings i config/config.php. En exempelkonfiguration återfinns i confg/config.sample.php.",
+    "Use backup code" : "Använd reservkod",
+    "Error while validating your second factor" : "Fel vid verifiering av tvåfaktorsautentisering.",
+    "You are accessing the server from an untrusted domain." : "Du försöker ansluta från en icke tillåten domän.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Var god kontakta din administratör. Om du är en administratör för denna installation så behöver du konfigurera \"trusted_domains\" i config/config.php. En exempelkonfiguration återfinns i confg/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 pålitlig domän",
     "App update required" : "Appen behöver uppdateras",
@@ -275,7 +277,7 @@
     "These incompatible apps will be disabled:" : "Dessa inkompatibla 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",
+    "Start update" : "Påbörja uppdateringen",
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "För att undvika timeout vid större installationer kan du istället köra följande kommando från din installationskatalog:",
     "Detailed logs" : "Detaljerade loggar",
     "Update needed" : "Uppdatering krävs",
@@ -283,13 +285,13 @@
     "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "För hjälp, se <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">dokumentationen</a>.",
     "This %s instance is currently in maintenance mode, which may take a while." : "Denna %s instans befinner sig för närvarande i underhållsläge, vilket kan ta ett tag.",
     "This page will refresh itself when the %s instance is available again." : "Denna sida uppdaterar sig själv när %s instansen är tillgänglig igen.",
-    "Error loading tags" : "Fel vid inläsning utav taggar",
-    "Tag already exists" : "Tagg existerar redan",
+    "Error loading tags" : "Fel vid inläsning av taggar",
+    "Tag already exists" : "Taggen finns redan",
     "Error deleting tag(s)" : "Fel vid borttagning utav tagg(ar)",
     "Error tagging" : "Fel vid taggning",
-    "Error untagging" : "Fel vid avtaggning",
+    "Error untagging" : "Fel vid borttagning av tagg",
     "Error favoriting" : "Fel vid favorisering",
-    "Error unfavoriting" : "Fel vid avfavorisering ",
+    "Error unfavoriting" : "Fel vid borttagning av favorisering ",
     "Couldn't send mail to following users: %s " : "Gick inte att skicka e-post till följande användare: %s",
     "Sunday" : "Söndag",
     "Monday" : "Måndag",
@@ -336,23 +338,23 @@
     "Oct." : "Okt.",
     "Nov." : "Nov.",
     "Dec." : "Dec.",
+    "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?" : "Dina filer är krypterade. Om du inte angett någon återställningsnyckel, kommer det att vara omöjligt att få tillbaka dina data efter att lösenordet är återställt..<br />Om du är osäker på vad du ska göra, vänligen kontakta din administratör innan du fortsätter.<br />Är du verkligen helt säker på att du vill fortsätta?",
     "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." : "Servern har ingen fungerande internetuppkoppling. Detta betyder att vissa funktioner så som extern lagring, notifikationer om uppdateringar eller installationer utav tredjepartsapplikationer inte kommer fungera. Åtkomst av filer utifrån och att skicka notifieringar via epost kanske inte fungerar heller. Vi föreslår att internetanslutningen aktiveras för denna server om man vill använda samtliga funktioner.",
-    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfiguration för \"reverse proxy headers\" är felaktig eller så försöker du nå Owncloud från en betrodd proxy. Om du inte försöker nå Owncloud från en betrodd proxy, detta är en säkerhetsrisk och kan möjliggöra att en hacker att förfalska sin IP adress som är synlig för Owncloud. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
-    "Allow editing" : "Tillåt redigering",
-    "Hide file listing" : "Göm fillista",
+    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Konfiguration för \"reverse proxy headers\" är felaktig eller så försöker du nå Nextcloud från en betrodd proxy. Om du inte försöker nå Nextcloud från en betrodd proxy, detta är en säkerhetsrisk och kan möjliggöra att en hacker att förfalska sin IP adress som är synlig för Nextcloud. Vidare information kan finnas i vår <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">dokumentation</a>.",
+    "Hide file listing" : "Dölj filer i mappen",
     "Sending ..." : "Skickar ...",
     "Email sent" : "E-post skickat",
     "Send link via email" : "Skicka länk via e-post",
     "notify by email" : "informera via e-post",
     "can share" : "får dela",
     "create" : "skapa",
-    "change" : "ändra",
+    "change" : "redigera",
     "delete" : "radera",
-    "{sharee} (at {server})" : "{sharee} (at {server})",
+    "{sharee} (at {server})" : "{sharee} (på {server})",
     "Share with users…" : "Dela med användare...",
-    "Share with users, groups or remote users…" : "Dela med användare, grupper och fjärranvändare...",
+    "Share with users, groups or remote users…" : "Dela med användare, grupper eller externanvändare...",
     "Share with users or groups…" : "Dela med användare eller grupper...",
-    "Share with users or remote users…" : "Dela med användare eller fjärranvändare...",
+    "Share with users or remote users…" : "Dela med användare eller externanvändare...",
     "Warning" : "Varning",
     "Error while sending notification" : "Fel när notifikation skulle skickas",
     "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Uppgradering pågår, att lämna denna sidan kan störa processen i vissa miljöer",
@@ -363,20 +365,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Utökad säkerhet har aktiverats på ditt konto. Vänligen autentisera med en andra faktor.",
     "Cancel login" : "Avbryt inloggning",
     "Please authenticate using the selected factor." : "Vänligen autentisera med vald faktor.",
-    "An error occured while verifying the token" : "Ett fel uppstod vid verifiering av token.",
-    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Din webbserver är inte konfigurerad riktigt för att lösa \"{url}\". Vidare information kan hittas i vår <a target=\"_blank\" href=\"{docLink}\">documentation</a>.",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Ingen minnescache har blivit konfigurerad. För att förbättra din prestanda var god konfigurera memcache om tillgängligt. Vidare information kan finnas i vår <a target=\"_blank\" 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 target=\"_blank\" href=\"{docLink}\">documentation</a>." : "/dev/urandom är inte läsbar av PHP vilket definitivt inte är rekommenderat av säkerhetsskäl. Vidare information kan finnas i vår <a target=\"_blank\" href=\"{docLink}\">dokumentation</a>.",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "Du kör för närvarande PHP {version}. Vi rekommenderar dig att uppgradera din PHP version så att ta fördel utav <a target=\"_blank\" href=\"{phpLink}\">prestanda och säkerhetsuppdateringar från PHP Group</a> å fort som din distribution stödjer det.",
-    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>." : "Konfiguration för \"reverse proxy headers\" är felaktig eller så försöker du nå Nextcloud från en betrodd proxy. Om du inte försöker nå Nextcloud från en betrodd proxy, detta är en säkerhetsrisk och kan möjliggöra att en hacker att förfalska sin IP adress som är synlig för Nextcloud. Vidare information kan finnas i vår <a target=\"_blank\" href=\"{docLink}\">documentation</a>.",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached är konfigurerad som distribuerad cache, men fel PHP modul \"memcache\" är installerad. \\OC\\Memcache\\Memcached stödjer bara \"memcached\" och inte \"memcache\". Se wiki för  <a target=\"_blank\" href=\"{wikiLink}\">memcached för båda modulerna</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "Några filer passerade inte integritetskontrollen. Vidare information om hur man löser dessa problem kan finnas i vår dokumentation <a target=\"_blank\" href=\"{docLink}\">dokumentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">Lista över felaktiga filer…</a> / <a href=\"{rescanEndpoint}\">Sök igenom igen…</a>)",
-    "The \"Strict-Transport-Security\" HTTP header is not configured to at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\">security tips</a>." : "\"Strict-Transport-Security\" HTTP header är inte konfigurerad till minst \"{seconds}\" sekunder. För utökad säkerhet rekommenderas att HSTS aktiveras som beskrivs i våra <a href=\"{docUrl}\">säkerhetstips</a>.",
-    "An error occured. Please try again" : "Ett fel inträffade. Var god försök igen",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Dela med folk på andra ownClouds med följande syntax username@example.com/owncloud",
-    "not assignable" : "Inte tilldelbar",
-    "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information om hur servern bör konfigureras, se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
-    "An internal error occured." : "Ett internt fel uppstod. "
+    "An error occured while verifying the token" : "Ett fel uppstod vid verifiering av token."
 },"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
new file mode 100644
index 00000000000..09129861c82
--- /dev/null
+++ b/core/l10n/th_TH.js
@@ -0,0 +1,285 @@
+OC.L10N.register(
+    "core",
+    {
+    "Please select a file." : "กรุณาเลือกแฟ้ม",
+    "File is too big" : "ไฟล์มีขนาดใหญ่เกินไป",
+    "Invalid file provided" : "ระบุไฟล์ไม่ถูกต้อง",
+    "No image or file provided" : "ไม่มีรูปภาพหรือไฟล์ที่ระบุ",
+    "Unknown filetype" : "ไม่รู้จักชนิดของไฟล์",
+    "Invalid image" : "รูปภาพไม่ถูกต้อง",
+    "An error occurred. Please contact your admin." : "เกิดข้อผิดพลาด กรุณาติดต่อผู้ดูแลระบบของคุณ",
+    "No temporary profile picture available, try again" : "ไม่มีรูปภาพโปรไฟล์ชั่วคราว กรุณาลองใหม่อีกครั้ง",
+    "No crop data provided" : "ไม่มีการครอบตัดข้อมูลที่ระบุ",
+    "No valid crop data provided" : "ไม่ได้ระบุข้อมูลการครอบตัดที่ถูกต้อง",
+    "Crop is not square" : "การครอบตัดไม่เป็นสี่เหลี่ยม",
+    "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." : "ไม่สามารถส่งข้อมูลการตั้งค่าไปยังอีเมลของคุณ กรุณาตรวจสอบชื่อผู้ใช้ของคุณให้ถูกต้อง",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "ไม่สามารถส่งการตั้งค่าไปยังอีเมลเพราะไม่มีที่อยู่อีเมลสำหรับผู้ใช้นี้ กรุณาติดต่อผู้ดูแลระบบ",
+    "%s password reset" : "%s ตั้งรหัสผ่านใหม่",
+    "Couldn't send reset email. Please contact your administrator." : "ไม่สามารถส่งข้อมูลการตั้งค่าไปยังอีเมลของคุณ กรุณาติดต่อผู้ดูแลระบบ",
+    "Preparing update" : "เตรียมอัพเดท",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "เตือนการซ่อมแซม:",
+    "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "กรุณาใช้คำสั่งการปรับปรุงเพราะการปรับปรุงอัตโนมัติถูกปิดใช้งานใน config.php",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: กำลังตรวจสอบตาราง %s",
+    "Turned on maintenance mode" : "เปิดโหมดการบำรุงรักษา",
+    "Turned off maintenance mode" : "ปิดโหมดการบำรุงรักษา",
+    "Maintenance mode is kept active" : "โหมดการบำรุงรักษาจะถูกเก็บไว้ใช้งาน",
+    "Updating database schema" : "กำลังอัพเดทฐานข้อมูล schema",
+    "Updated database" : "อัพเดทฐานข้อมูลเรียบร้อยแล้ว",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "กำลังตรวจสอบว่าฐานข้อมูล schema สามารถอัพเดทได้หรือไม่ (นี้อาจใช้เวลานานขึ้นอยู่กับขนาดของฐานข้อมูล)",
+    "Checked database schema update" : "Schema อัพเดตของฐานข้อมูลถูกตรวจสอบ",
+    "Checking updates of apps" : "กำลังตรวจสอบการอัพเดทแอพพลิเคชัน",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "กำลังตรวจสอบว่าฐานข้อมูลสำหรับ schema สำหรับ %s ว่าสามารถอัพเดทได้หรือไม่ (นี้จะใช้เวลานานขึ้นอยู่กับขนาดของฐานข้อมูล)",
+    "Checked database schema update for apps" : "Schema อัพเดตของฐานข้อมูลสำหรับแอพฯ",
+    "Updated \"%s\" to %s" : "อัพเดท \"%s\" ไปยัง %s",
+    "Set log level to debug" : "ตั้งค่าระดับบันทึกเพื่อแก้ปัญหา",
+    "Reset log level" : "ตั้งค่าระดับบันทึกใหม่",
+    "Starting code integrity check" : "กำลังเริ่มต้นรหัสตรวจสอบความสมบูรณ์",
+    "Finished code integrity check" : "ตรวจสอบความสมบูรณ์ของรหัสเสร็จสิ้น",
+    "%s (3rdparty)" : "%s (บุคคลที่ 3)",
+    "%s (incompatible)" : "%s (เข้ากันไม่ได้)",
+    "Following apps have been disabled: %s" : "แอพฯดังต่อไปนี้ถูกปิดการใช้งาน: %s",
+    "Already up to date" : "มีอยู่แล้วถึงวันที่",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">มีปัญหาเกี่ยวกับการตรวจสอบความสมบูรณ์ของรหัส รายละเอียดเพิ่มเติม...</a>",
+    "Settings" : "ตั้งค่า",
+    "Problem loading page, reloading in 5 seconds" : "เกิดปัญหาขณะโหลดหน้าเว็บ จะรีโหลดหน้าเว็บภายใน 5 วินาที",
+    "Saving..." : "กำลังบันทึกข้อมูล...",
+    "Dismiss" : "ยกเลิก",
+    "Password" : "รหัสผ่าน",
+    "Cancel" : "ยกเลิก",
+    "seconds ago" : "วินาที ก่อนหน้านี้",
+    "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." : "ลิงค์ที่ใช้สำหรับตั้งค่ารหัสผ่านใหม่ ของคุณ ได้ถูกส่งไปยังอีเมลของคุณ หากคุณยังไม่ได้รับอีกเมล ลองไปดูที่โฟลเดอร์ สแปม/ถังขยะ ในอีเมลของคุณ <br>ทั้งนี้หากหาอีเมลไม่พบกรุณาติดต่อผู้ดูแลระบบ",
+    "I know what I'm doing" : "ฉันรู้ว่าฉันกำลังทำอะไรอยู่",
+    "Password can not be changed. Please contact your administrator." : "หากคุณไม่สามารถเปลี่ยนแปลงรหัสผ่าน กรุณาติดต่อผู้ดูแลระบบ",
+    "No" : "ไม่ตกลง",
+    "Yes" : "ตกลง",
+    "Choose" : "เลือก",
+    "Error loading file picker template: {error}" : "เกิดข้อผิดพลาดขณะกำลังโหลดไฟล์เทมเพลต: {error}",
+    "Ok" : "ตกลง",
+    "Error loading message template: {error}" : "เกิดข้อผิดพลาดขณะกำลังโหลดเทมเพลต: {error} ",
+    "read-only" : "อ่านอย่างเดียว",
+    "_{count} file conflict_::_{count} file conflicts_" : ["ไฟล์มีปัญหา {count} ไฟล์"],
+    "One file conflict" : "มีหนึ่งไฟล์ที่มีปัญหา",
+    "New Files" : "วางทับไฟล์เดิม",
+    "Already existing files" : "เขียนไฟล์ใหม่",
+    "Which files do you want to keep?" : "คุณต้องการเก็บไฟล์?",
+    "If you select both versions, the copied file will have a number added to its name." : "เลือกวางทับไฟล์เดิมหรือ เขียนไฟล์ใหม่จะเพิ่มตัวเลขไปยังชื่อของมัน",
+    "Continue" : "ดำเนินการต่อ",
+    "(all selected)" : "(เลือกทั้งหมด)",
+    "({count} selected)" : "(เลือกจำนวน {count})",
+    "Error loading file exists template" : "เกิดข้อผิดพลาดขณะโหลดไฟล์เทมเพลตที่มีอยู่",
+    "Very weak password" : "รหัสผ่านระดับต่ำมาก",
+    "Weak password" : "รหัสผ่านระดับต่ำ",
+    "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 อาจเสียหาย",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "ขณะนี้คุณกำลังใช้ PHP รุ่น {version} เราขอให้คุณอัพเดท <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">เพื่อเหตุผลด้านประสิทธิภาพและความปลอดภัยของ PHP</a>",
+    "Error occurred while checking server setup" : "เกิดข้อผิดพลาดขณะที่ทำการตรวจสอบการติดตั้งเซิร์ฟเวอร์",
+    "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 ไฟล์ไม่ทำงาน เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ของคุณในทางที่ข้อมูลไดเรกทอรีไม่สามารถเข้าถึงได้หรือคุณย้ายข้อมูลไดเรกทอรีไปยังนอกเว็บเซิร์ฟเวอร์หรือเอกสาร",
+    "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}\" นี่คือระบบการรักษาความปลอดภัยที่มีศักยภาพหรือลดความเสี่ยงที่จะเกิดขึ้นเราขอแนะนำให้ปรับการตั้งค่านี้",
+    "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}",
+    "Error" : "ข้อผิดพลาด",
+    "Error while sharing" : "เกิดข้อผิดพลาดขณะกำลังแชร์ข้อมูล",
+    "Error while unsharing" : "เกิดข้อผิดพลาดขณะกำลังยกเลิกการแชร์ข้อมูล",
+    "Error setting expiration date" : "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
+    "The public link will expire no later than {days} days after it is created" : "ลิงค์สาธารณะจะหมดอายุภายใน {days} วัน หลังจากที่มันถูกสร้างขึ้น",
+    "Set expiration date" : "กำหนดวันที่หมดอายุ",
+    "Expiration" : "การหมดอายุ",
+    "Expiration date" : "วันที่หมดอายุ",
+    "Choose a password for the public link" : "เลือกรหัสผ่านสำหรับลิงค์สาธารณะ",
+    "Resharing is not allowed" : "ไม่อนุญาตให้แชร์ข้อมูลที่ซ้ำกัน",
+    "Share link" : "แชร์ลิงค์",
+    "Link" : "ลิงค์",
+    "Password protect" : "ป้องกันด้วยรหัสผ่าน",
+    "Allow editing" : "อนุญาตให้แก้ไข",
+    "Email link to person" : "ส่งลิงก์ให้ทางอีเมล",
+    "Send" : "ส่ง",
+    "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
+    "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
+    "group" : "กลุ่มผู้ใช้งาน",
+    "remote" : "รีโมท",
+    "Unshare" : "ยกเลิกการแชร์",
+    "can edit" : "สามารถแก้ไข",
+    "access control" : "ควบคุมการเข้าถึง",
+    "Could not unshare" : "ไม่สามารถยกเลิกการแชร์ได้",
+    "Share details could not be loaded for this item." : "รายละเอียดการแชร์ไม่สามารถโหลดสำหรับรายการนี้",
+    "{sharee} (remote)" : "{sharee} (รีโมท)",
+    "Share" : "แชร์",
+    "Error removing share" : "พบข้อผิดพลาดในรายการที่แชร์ออก",
+    "Non-existing tag #{tag}" : "ไม่มีแท็กนี้อยู่ #{tag}",
+    "invisible" : "จะมองไม่เห็น",
+    "({scope})" : "({scope})",
+    "Delete" : "ลบ",
+    "Rename" : "เปลี่ยนชื่อ",
+    "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
+    "Enter new" : "ใส่ข้อมูลใหม่",
+    "Add" : "เพิ่ม",
+    "Edit tags" : "แก้ไขแท็ก",
+    "Error loading dialog template: {error}" : "เกิดข้อผิดพลาดขณะโหลดเทมเพลตไดอะล็อก: {error}",
+    "No tags selected for deletion." : "ไม่ได้เลือกแท็กที่ต้องการลบ",
+    "unknown text" : "ข้อความที่ไม่รู้จัก",
+    "Hello world!" : "สวัสดีทุกคน!",
+    "sunny" : "แดดมาก",
+    "Hello {name}, the weather is {weather}" : "สวัสดี {name} สภาพอากาศวันนี้มี {weather}",
+    "Hello {name}" : "สวัสดี {name}",
+    "_download %n file_::_download %n files_" : ["ดาวน์โหลด %n ไฟล์"],
+    "An error occurred." : "เกิดข้อผิดพลาด",
+    "Please reload the page." : "โปรดโหลดหน้าเว็บใหม่",
+    "Searching other places" : "กำลังค้นหาสถานที่อื่นๆ",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["ค้นหาพบ {count} ผลลัพธ์ในโฟลเดอร์อื่นๆ"],
+    "Personal" : "ส่วนตัว",
+    "Users" : "ผู้ใช้งาน",
+    "Apps" : "แอปฯ",
+    "Admin" : "ผู้ดูแล",
+    "Help" : "ช่วยเหลือ",
+    "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
+    "File not found" : "ไม่พบไฟล์",
+    "The specified document has not been found on the server." : "ไม่พบเอกสารที่ระบุบนเซิร์ฟเวอร์",
+    "You can click here to return to %s." : "คุณสามารถคลิกที่นี่เพื่อกลับไปยัง %s",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "นี่คุณ,\nอยากให้คุณทราบว่า %s ได้แชร์ %s กับคุณ\nคลิกดูที่นี่: %s\n",
+    "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s",
+    "Cheers!" : "ไชโย!",
+    "Internal Server Error" : "เกิดข้อผิดพลาดภายในเซิร์ฟเวอร์",
+    "The server encountered an internal error and was unable to complete your request." : "พบข้อผิดพลาดภายในเซิร์ฟเวอร์และไม่สามารถดำเนินการตามคำขอของคุณ",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "กรุณาติดต่อผู้ดูแลเซิร์ฟเวอร์ถ้าพบข้อผิดพลาดนี้หลายครั้ง กรุณาระบุรายละเอียดทางเทคนิคที่ด้านล่างในรายงานของคุณ",
+    "More details can be found in the server log." : "รายละเอียดเพิ่มเติมสามารถดูได้ที่บันทึกของระบบเซิร์ฟเวอร์",
+    "Technical details" : "รายละเอียดทางเทคนิค",
+    "Remote Address: %s" : "ที่อยู่รีโมท: %s",
+    "Request ID: %s" : "คำขอ ID: %s",
+    "Type: %s" : "ชนิด: %s",
+    "Code: %s" : "โค้ด: %s",
+    "Message: %s" : "ข้อความ: %s",
+    "File: %s" : "ไฟล์: %s",
+    "Line: %s" : "ไลน์: %s",
+    "Trace" : "ร่องรอย",
+    "Security warning" : "คำเตือนการรักษาความปลอดภัย",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "ข้อมูลไดเรกทอรีและไฟล์ของคุณ อาจไม่สามารถเข้าถึงได้จากอินเทอร์เน็ตเพราะ htaccess ไฟล์ไม่ทำงาน",
+    "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Storage & database" : "พื้นที่จัดเก็บข้อมูลและฐานข้อมูล",
+    "Data folder" : "โฟลเดอร์เก็บข้อมูล",
+    "Configure the database" : "ตั้งค่าฐานข้อมูล",
+    "Only %s is available." : "เฉพาะ %s สามารถใช้ได้",
+    "Install and activate additional PHP modules to choose other database types." : "ติดตั้งและเปิดใช้งานโมดูล PHP เพิ่มเติมเพื่อเลือกชนิดฐานข้อมูลอื่นๆ",
+    "For more details check out the documentation." : "สำหรับรายละเอียดเพิ่มเติมสามารถตรวจสอบได้ที่ <a href=\"%s\" target=\"_blank\">เอกสาร</a>",
+    "Database user" : "ชื่อผู้ใช้งานฐานข้อมูล",
+    "Database password" : "รหัสผ่านฐานข้อมูล",
+    "Database name" : "ชื่อฐานข้อมูล",
+    "Database tablespace" : "พื้นที่ตารางในฐานข้อมูล",
+    "Database host" : "Database host",
+    "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",
+    "Finish setup" : "ติดตั้งเลย",
+    "Finishing …" : "เสร็จสิ้น ...",
+    "Need help?" : "ต้องการความช่วยเหลือ?",
+    "See the documentation" : "ดูได้จากเอกสาร",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "โปรแกรมนี้ต้องการ JavaScript สำหรับการดำเนินงานที่ถูกต้อง กรุณา {linkstart}เปิดใช้งาน JavaScript{linkend} และโหลดหน้าเว็บ",
+    "Search" : "ค้นหา",
+    "Log out" : "ออกจากระบบ",
+    "Server side authentication failed!" : "การรับรองความถูกต้องจากเซิร์ฟเวอร์ล้มเหลว!",
+    "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ",
+    "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ",
+    "Wrong password. Reset it?" : "รหัสผ่านผิด รีเซ็ตรหัสผ่าน?",
+    "Wrong password." : "รหัสผ่านผิดพลาด",
+    "Log in" : "เข้าสู่ระบบ",
+    "Stay logged in" : "จดจำฉัน",
+    "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ",
+    "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
+    "New password" : "รหัสผ่านใหม่",
+    "New Password" : "รหัสผ่านใหม่",
+    "Reset password" : "เปลี่ยนรหัสผ่านใหม่",
+    "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 Nextcloud instance is currently in single user mode." : "ขณะนี้ Nextcloud อยู่ในโหมดผู้ใช้คนเดียว",
+    "This means only administrators can use the instance." : "ซึ่งหมายความว่าผู้ดูแลระบบสามารถใช้อินสแตนซ์",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "ติดต่อผู้ดูแลระบบของคุณหากข้อความนี้ยังคงมีอยู่หรือปรากฏโดยไม่คาดคิด",
+    "Thank you for your patience." : "ขอบคุณสำหรับความอดทนของคุณ เราจะนำความคิดเห็นของท่านมาปรับปรุงระบบให้ดียิ่งขึ้น",
+    "You are accessing the server from an untrusted domain." : "คุณกำลังเข้าถึงเซิร์ฟเวอร์จากโดเมนที่ไม่น่าเชื่อถือ",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "กรุณาติดต่อผู้ดูแลระบบ หากคุณเป็นผู้ดูแลระบบ นี้ตัวอย่างการกำหนดค่า \"trusted_domains\" ใน\nconfig/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\" เป็นโดเมนที่เชื่อถือ",
+    "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" : "เริ่มต้นอัพเดท",
+    "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 สามารถใช้ได้อีกครั้ง",
+    "Error loading tags" : "เกิดข้อผิดพลาดขณะโหลดแท็ก",
+    "Tag already exists" : "มีแท็กอยู่แล้ว",
+    "Error deleting tag(s)" : "เกิดข้อผิดพลาดขณะลบแท็ก",
+    "Error tagging" : "เกิดข้อผิดพลาดขณะติดแท็ก",
+    "Error untagging" : "เกิดข้อผิดพลาดขณะยกเลิกการติดแท็ก",
+    "Error favoriting" : "เกิดข้อผิดพลาดขณะเลือกที่ชื่นชอบ",
+    "Error unfavoriting" : "เกิดข้อผิดพลาดขณะยกเลิกการเลือกที่ชื่นชอบ",
+    "Couldn't send mail to following users: %s " : "ไม่สามารถส่งอีเมลไปยังผู้ใช้: %s",
+    "Sunday" : "วันอาทิตย์",
+    "Monday" : "วันจันทร์",
+    "Tuesday" : "วันอังคาร",
+    "Wednesday" : "วันพุธ",
+    "Thursday" : "วันพฤหัสบดี",
+    "Friday" : "วันศุกร์",
+    "Saturday" : "วันเสาร์",
+    "Sun." : "อา.",
+    "Mon." : "จ.",
+    "Tue." : "อ.",
+    "Wed." : "พ.",
+    "Thu." : "พฤ.",
+    "Fri." : "ศ.",
+    "Sat." : "ส.",
+    "Su" : "อา",
+    "Mo" : "จัน",
+    "Tu" : "อัง",
+    "We" : "พุธ",
+    "Th" : "พฤ",
+    "Fr" : "ศุก",
+    "Sa" : "เสา",
+    "January" : "มกราคม",
+    "February" : "กุมภาพันธ์",
+    "March" : "มีนาคม",
+    "April" : "เมษายน",
+    "May" : "พฤษภาคม",
+    "June" : "มิถุนายน",
+    "July" : "กรกฏาคม",
+    "August" : "สิงหาคม",
+    "September" : "กันยายน",
+    "October" : "ตุลาคม",
+    "November" : "พฤศจิกายน",
+    "December" : "ธันวาคม",
+    "Jan." : "ม.ค.",
+    "Feb." : "ก.พ.",
+    "Mar." : "มี.ค.",
+    "Apr." : "เม.ย.",
+    "May." : "พ.ค.",
+    "Jun." : "มิ.ย.",
+    "Jul." : "ก.ค.",
+    "Aug." : "ส.ค.",
+    "Sep." : "ก.ย.",
+    "Oct." : "ต.ค.",
+    "Nov." : "พ.ย.",
+    "Dec." : "ธ.ค.",
+    "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?" : "ไฟล์ของคุณจะถูกเข้ารหัส หากคุณยังไม่ได้เปิดใช้งานรหัสการกู้คืน คุณจะได้รับข้อมูลของคุณกลับมาหลังจากที่รหัสผ่านของคุณถูกรีเซ็ต<br /> หากคุณไม่แน่ใจว่าควรทำอย่างไรโปรดติดต่อผู้ดูแลระบบของคุณก่อนที่คุณจะดำเนินการต่อไป <br /> คุณต้องการดำเนินการต่อ?",
+    "Sending ..." : "กำลังส่ง...",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "notify by email" : "แจ้งเตือนทางอีเมล",
+    "can share" : "สามารถแชร์ได้",
+    "create" : "สร้าง",
+    "change" : "เปลี่ยนแปลง",
+    "delete" : "ลบ",
+    "Share with users, groups or remote users…" : "แชร์กับผู้ใช้หรือกลุ่มหรือผู้ใช้โดยการรีโมท ...",
+    "Share with users or remote users…" : "แชร์กับผู้ใช้หรือผู้ใช้โดยการรีโมท ...",
+    "Warning" : "คำเตือน",
+    "Error while sending notification" : "เกิดข้อผิดพลาดขณะกำลังส่งการแจ้งเตือน",
+    "No search results in other folders" : "ไม่พบผลลัพธ์การค้นหาในโฟลเดอร์อื่นๆ"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
new file mode 100644
index 00000000000..589a776139f
--- /dev/null
+++ b/core/l10n/th_TH.json
@@ -0,0 +1,283 @@
+{ "translations": {
+    "Please select a file." : "กรุณาเลือกแฟ้ม",
+    "File is too big" : "ไฟล์มีขนาดใหญ่เกินไป",
+    "Invalid file provided" : "ระบุไฟล์ไม่ถูกต้อง",
+    "No image or file provided" : "ไม่มีรูปภาพหรือไฟล์ที่ระบุ",
+    "Unknown filetype" : "ไม่รู้จักชนิดของไฟล์",
+    "Invalid image" : "รูปภาพไม่ถูกต้อง",
+    "An error occurred. Please contact your admin." : "เกิดข้อผิดพลาด กรุณาติดต่อผู้ดูแลระบบของคุณ",
+    "No temporary profile picture available, try again" : "ไม่มีรูปภาพโปรไฟล์ชั่วคราว กรุณาลองใหม่อีกครั้ง",
+    "No crop data provided" : "ไม่มีการครอบตัดข้อมูลที่ระบุ",
+    "No valid crop data provided" : "ไม่ได้ระบุข้อมูลการครอบตัดที่ถูกต้อง",
+    "Crop is not square" : "การครอบตัดไม่เป็นสี่เหลี่ยม",
+    "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." : "ไม่สามารถส่งข้อมูลการตั้งค่าไปยังอีเมลของคุณ กรุณาตรวจสอบชื่อผู้ใช้ของคุณให้ถูกต้อง",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "ไม่สามารถส่งการตั้งค่าไปยังอีเมลเพราะไม่มีที่อยู่อีเมลสำหรับผู้ใช้นี้ กรุณาติดต่อผู้ดูแลระบบ",
+    "%s password reset" : "%s ตั้งรหัสผ่านใหม่",
+    "Couldn't send reset email. Please contact your administrator." : "ไม่สามารถส่งข้อมูลการตั้งค่าไปยังอีเมลของคุณ กรุณาติดต่อผู้ดูแลระบบ",
+    "Preparing update" : "เตรียมอัพเดท",
+    "[%d / %d]: %s" : "[%d / %d]: %s",
+    "Repair warning: " : "เตือนการซ่อมแซม:",
+    "Repair error: " : "เกิดข้อผิดพลาดในการซ่อมแซม:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "กรุณาใช้คำสั่งการปรับปรุงเพราะการปรับปรุงอัตโนมัติถูกปิดใช้งานใน config.php",
+    "[%d / %d]: Checking table %s" : "[%d / %d]: กำลังตรวจสอบตาราง %s",
+    "Turned on maintenance mode" : "เปิดโหมดการบำรุงรักษา",
+    "Turned off maintenance mode" : "ปิดโหมดการบำรุงรักษา",
+    "Maintenance mode is kept active" : "โหมดการบำรุงรักษาจะถูกเก็บไว้ใช้งาน",
+    "Updating database schema" : "กำลังอัพเดทฐานข้อมูล schema",
+    "Updated database" : "อัพเดทฐานข้อมูลเรียบร้อยแล้ว",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "กำลังตรวจสอบว่าฐานข้อมูล schema สามารถอัพเดทได้หรือไม่ (นี้อาจใช้เวลานานขึ้นอยู่กับขนาดของฐานข้อมูล)",
+    "Checked database schema update" : "Schema อัพเดตของฐานข้อมูลถูกตรวจสอบ",
+    "Checking updates of apps" : "กำลังตรวจสอบการอัพเดทแอพพลิเคชัน",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "กำลังตรวจสอบว่าฐานข้อมูลสำหรับ schema สำหรับ %s ว่าสามารถอัพเดทได้หรือไม่ (นี้จะใช้เวลานานขึ้นอยู่กับขนาดของฐานข้อมูล)",
+    "Checked database schema update for apps" : "Schema อัพเดตของฐานข้อมูลสำหรับแอพฯ",
+    "Updated \"%s\" to %s" : "อัพเดท \"%s\" ไปยัง %s",
+    "Set log level to debug" : "ตั้งค่าระดับบันทึกเพื่อแก้ปัญหา",
+    "Reset log level" : "ตั้งค่าระดับบันทึกใหม่",
+    "Starting code integrity check" : "กำลังเริ่มต้นรหัสตรวจสอบความสมบูรณ์",
+    "Finished code integrity check" : "ตรวจสอบความสมบูรณ์ของรหัสเสร็จสิ้น",
+    "%s (3rdparty)" : "%s (บุคคลที่ 3)",
+    "%s (incompatible)" : "%s (เข้ากันไม่ได้)",
+    "Following apps have been disabled: %s" : "แอพฯดังต่อไปนี้ถูกปิดการใช้งาน: %s",
+    "Already up to date" : "มีอยู่แล้วถึงวันที่",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">มีปัญหาเกี่ยวกับการตรวจสอบความสมบูรณ์ของรหัส รายละเอียดเพิ่มเติม...</a>",
+    "Settings" : "ตั้งค่า",
+    "Problem loading page, reloading in 5 seconds" : "เกิดปัญหาขณะโหลดหน้าเว็บ จะรีโหลดหน้าเว็บภายใน 5 วินาที",
+    "Saving..." : "กำลังบันทึกข้อมูล...",
+    "Dismiss" : "ยกเลิก",
+    "Password" : "รหัสผ่าน",
+    "Cancel" : "ยกเลิก",
+    "seconds ago" : "วินาที ก่อนหน้านี้",
+    "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." : "ลิงค์ที่ใช้สำหรับตั้งค่ารหัสผ่านใหม่ ของคุณ ได้ถูกส่งไปยังอีเมลของคุณ หากคุณยังไม่ได้รับอีกเมล ลองไปดูที่โฟลเดอร์ สแปม/ถังขยะ ในอีเมลของคุณ <br>ทั้งนี้หากหาอีเมลไม่พบกรุณาติดต่อผู้ดูแลระบบ",
+    "I know what I'm doing" : "ฉันรู้ว่าฉันกำลังทำอะไรอยู่",
+    "Password can not be changed. Please contact your administrator." : "หากคุณไม่สามารถเปลี่ยนแปลงรหัสผ่าน กรุณาติดต่อผู้ดูแลระบบ",
+    "No" : "ไม่ตกลง",
+    "Yes" : "ตกลง",
+    "Choose" : "เลือก",
+    "Error loading file picker template: {error}" : "เกิดข้อผิดพลาดขณะกำลังโหลดไฟล์เทมเพลต: {error}",
+    "Ok" : "ตกลง",
+    "Error loading message template: {error}" : "เกิดข้อผิดพลาดขณะกำลังโหลดเทมเพลต: {error} ",
+    "read-only" : "อ่านอย่างเดียว",
+    "_{count} file conflict_::_{count} file conflicts_" : ["ไฟล์มีปัญหา {count} ไฟล์"],
+    "One file conflict" : "มีหนึ่งไฟล์ที่มีปัญหา",
+    "New Files" : "วางทับไฟล์เดิม",
+    "Already existing files" : "เขียนไฟล์ใหม่",
+    "Which files do you want to keep?" : "คุณต้องการเก็บไฟล์?",
+    "If you select both versions, the copied file will have a number added to its name." : "เลือกวางทับไฟล์เดิมหรือ เขียนไฟล์ใหม่จะเพิ่มตัวเลขไปยังชื่อของมัน",
+    "Continue" : "ดำเนินการต่อ",
+    "(all selected)" : "(เลือกทั้งหมด)",
+    "({count} selected)" : "(เลือกจำนวน {count})",
+    "Error loading file exists template" : "เกิดข้อผิดพลาดขณะโหลดไฟล์เทมเพลตที่มีอยู่",
+    "Very weak password" : "รหัสผ่านระดับต่ำมาก",
+    "Weak password" : "รหัสผ่านระดับต่ำ",
+    "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 อาจเสียหาย",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "ขณะนี้คุณกำลังใช้ PHP รุ่น {version} เราขอให้คุณอัพเดท <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">เพื่อเหตุผลด้านประสิทธิภาพและความปลอดภัยของ PHP</a>",
+    "Error occurred while checking server setup" : "เกิดข้อผิดพลาดขณะที่ทำการตรวจสอบการติดตั้งเซิร์ฟเวอร์",
+    "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 ไฟล์ไม่ทำงาน เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ของคุณในทางที่ข้อมูลไดเรกทอรีไม่สามารถเข้าถึงได้หรือคุณย้ายข้อมูลไดเรกทอรีไปยังนอกเว็บเซิร์ฟเวอร์หรือเอกสาร",
+    "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}\" นี่คือระบบการรักษาความปลอดภัยที่มีศักยภาพหรือลดความเสี่ยงที่จะเกิดขึ้นเราขอแนะนำให้ปรับการตั้งค่านี้",
+    "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}",
+    "Error" : "ข้อผิดพลาด",
+    "Error while sharing" : "เกิดข้อผิดพลาดขณะกำลังแชร์ข้อมูล",
+    "Error while unsharing" : "เกิดข้อผิดพลาดขณะกำลังยกเลิกการแชร์ข้อมูล",
+    "Error setting expiration date" : "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
+    "The public link will expire no later than {days} days after it is created" : "ลิงค์สาธารณะจะหมดอายุภายใน {days} วัน หลังจากที่มันถูกสร้างขึ้น",
+    "Set expiration date" : "กำหนดวันที่หมดอายุ",
+    "Expiration" : "การหมดอายุ",
+    "Expiration date" : "วันที่หมดอายุ",
+    "Choose a password for the public link" : "เลือกรหัสผ่านสำหรับลิงค์สาธารณะ",
+    "Resharing is not allowed" : "ไม่อนุญาตให้แชร์ข้อมูลที่ซ้ำกัน",
+    "Share link" : "แชร์ลิงค์",
+    "Link" : "ลิงค์",
+    "Password protect" : "ป้องกันด้วยรหัสผ่าน",
+    "Allow editing" : "อนุญาตให้แก้ไข",
+    "Email link to person" : "ส่งลิงก์ให้ทางอีเมล",
+    "Send" : "ส่ง",
+    "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
+    "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
+    "group" : "กลุ่มผู้ใช้งาน",
+    "remote" : "รีโมท",
+    "Unshare" : "ยกเลิกการแชร์",
+    "can edit" : "สามารถแก้ไข",
+    "access control" : "ควบคุมการเข้าถึง",
+    "Could not unshare" : "ไม่สามารถยกเลิกการแชร์ได้",
+    "Share details could not be loaded for this item." : "รายละเอียดการแชร์ไม่สามารถโหลดสำหรับรายการนี้",
+    "{sharee} (remote)" : "{sharee} (รีโมท)",
+    "Share" : "แชร์",
+    "Error removing share" : "พบข้อผิดพลาดในรายการที่แชร์ออก",
+    "Non-existing tag #{tag}" : "ไม่มีแท็กนี้อยู่ #{tag}",
+    "invisible" : "จะมองไม่เห็น",
+    "({scope})" : "({scope})",
+    "Delete" : "ลบ",
+    "Rename" : "เปลี่ยนชื่อ",
+    "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
+    "Enter new" : "ใส่ข้อมูลใหม่",
+    "Add" : "เพิ่ม",
+    "Edit tags" : "แก้ไขแท็ก",
+    "Error loading dialog template: {error}" : "เกิดข้อผิดพลาดขณะโหลดเทมเพลตไดอะล็อก: {error}",
+    "No tags selected for deletion." : "ไม่ได้เลือกแท็กที่ต้องการลบ",
+    "unknown text" : "ข้อความที่ไม่รู้จัก",
+    "Hello world!" : "สวัสดีทุกคน!",
+    "sunny" : "แดดมาก",
+    "Hello {name}, the weather is {weather}" : "สวัสดี {name} สภาพอากาศวันนี้มี {weather}",
+    "Hello {name}" : "สวัสดี {name}",
+    "_download %n file_::_download %n files_" : ["ดาวน์โหลด %n ไฟล์"],
+    "An error occurred." : "เกิดข้อผิดพลาด",
+    "Please reload the page." : "โปรดโหลดหน้าเว็บใหม่",
+    "Searching other places" : "กำลังค้นหาสถานที่อื่นๆ",
+    "_{count} search result in another folder_::_{count} search results in other folders_" : ["ค้นหาพบ {count} ผลลัพธ์ในโฟลเดอร์อื่นๆ"],
+    "Personal" : "ส่วนตัว",
+    "Users" : "ผู้ใช้งาน",
+    "Apps" : "แอปฯ",
+    "Admin" : "ผู้ดูแล",
+    "Help" : "ช่วยเหลือ",
+    "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
+    "File not found" : "ไม่พบไฟล์",
+    "The specified document has not been found on the server." : "ไม่พบเอกสารที่ระบุบนเซิร์ฟเวอร์",
+    "You can click here to return to %s." : "คุณสามารถคลิกที่นี่เพื่อกลับไปยัง %s",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "นี่คุณ,\nอยากให้คุณทราบว่า %s ได้แชร์ %s กับคุณ\nคลิกดูที่นี่: %s\n",
+    "The share will expire on %s." : "การแชร์จะหมดอายุในวันที่ %s",
+    "Cheers!" : "ไชโย!",
+    "Internal Server Error" : "เกิดข้อผิดพลาดภายในเซิร์ฟเวอร์",
+    "The server encountered an internal error and was unable to complete your request." : "พบข้อผิดพลาดภายในเซิร์ฟเวอร์และไม่สามารถดำเนินการตามคำขอของคุณ",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "กรุณาติดต่อผู้ดูแลเซิร์ฟเวอร์ถ้าพบข้อผิดพลาดนี้หลายครั้ง กรุณาระบุรายละเอียดทางเทคนิคที่ด้านล่างในรายงานของคุณ",
+    "More details can be found in the server log." : "รายละเอียดเพิ่มเติมสามารถดูได้ที่บันทึกของระบบเซิร์ฟเวอร์",
+    "Technical details" : "รายละเอียดทางเทคนิค",
+    "Remote Address: %s" : "ที่อยู่รีโมท: %s",
+    "Request ID: %s" : "คำขอ ID: %s",
+    "Type: %s" : "ชนิด: %s",
+    "Code: %s" : "โค้ด: %s",
+    "Message: %s" : "ข้อความ: %s",
+    "File: %s" : "ไฟล์: %s",
+    "Line: %s" : "ไลน์: %s",
+    "Trace" : "ร่องรอย",
+    "Security warning" : "คำเตือนการรักษาความปลอดภัย",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "ข้อมูลไดเรกทอรีและไฟล์ของคุณ อาจไม่สามารถเข้าถึงได้จากอินเทอร์เน็ตเพราะ htaccess ไฟล์ไม่ทำงาน",
+    "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Storage & database" : "พื้นที่จัดเก็บข้อมูลและฐานข้อมูล",
+    "Data folder" : "โฟลเดอร์เก็บข้อมูล",
+    "Configure the database" : "ตั้งค่าฐานข้อมูล",
+    "Only %s is available." : "เฉพาะ %s สามารถใช้ได้",
+    "Install and activate additional PHP modules to choose other database types." : "ติดตั้งและเปิดใช้งานโมดูล PHP เพิ่มเติมเพื่อเลือกชนิดฐานข้อมูลอื่นๆ",
+    "For more details check out the documentation." : "สำหรับรายละเอียดเพิ่มเติมสามารถตรวจสอบได้ที่ <a href=\"%s\" target=\"_blank\">เอกสาร</a>",
+    "Database user" : "ชื่อผู้ใช้งานฐานข้อมูล",
+    "Database password" : "รหัสผ่านฐานข้อมูล",
+    "Database name" : "ชื่อฐานข้อมูล",
+    "Database tablespace" : "พื้นที่ตารางในฐานข้อมูล",
+    "Database host" : "Database host",
+    "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",
+    "Finish setup" : "ติดตั้งเลย",
+    "Finishing …" : "เสร็จสิ้น ...",
+    "Need help?" : "ต้องการความช่วยเหลือ?",
+    "See the documentation" : "ดูได้จากเอกสาร",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "โปรแกรมนี้ต้องการ JavaScript สำหรับการดำเนินงานที่ถูกต้อง กรุณา {linkstart}เปิดใช้งาน JavaScript{linkend} และโหลดหน้าเว็บ",
+    "Search" : "ค้นหา",
+    "Log out" : "ออกจากระบบ",
+    "Server side authentication failed!" : "การรับรองความถูกต้องจากเซิร์ฟเวอร์ล้มเหลว!",
+    "Please contact your administrator." : "กรุณาติดต่อผู้ดูแลระบบ",
+    "Please try again or contact your administrator." : "โปรดลองอีกครั้งหรือติดต่อผู้ดูแลระบบ",
+    "Wrong password. Reset it?" : "รหัสผ่านผิด รีเซ็ตรหัสผ่าน?",
+    "Wrong password." : "รหัสผ่านผิดพลาด",
+    "Log in" : "เข้าสู่ระบบ",
+    "Stay logged in" : "จดจำฉัน",
+    "Alternative Logins" : "ทางเลือกการเข้าสู่ระบบ",
+    "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
+    "New password" : "รหัสผ่านใหม่",
+    "New Password" : "รหัสผ่านใหม่",
+    "Reset password" : "เปลี่ยนรหัสผ่านใหม่",
+    "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 Nextcloud instance is currently in single user mode." : "ขณะนี้ Nextcloud อยู่ในโหมดผู้ใช้คนเดียว",
+    "This means only administrators can use the instance." : "ซึ่งหมายความว่าผู้ดูแลระบบสามารถใช้อินสแตนซ์",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "ติดต่อผู้ดูแลระบบของคุณหากข้อความนี้ยังคงมีอยู่หรือปรากฏโดยไม่คาดคิด",
+    "Thank you for your patience." : "ขอบคุณสำหรับความอดทนของคุณ เราจะนำความคิดเห็นของท่านมาปรับปรุงระบบให้ดียิ่งขึ้น",
+    "You are accessing the server from an untrusted domain." : "คุณกำลังเข้าถึงเซิร์ฟเวอร์จากโดเมนที่ไม่น่าเชื่อถือ",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "กรุณาติดต่อผู้ดูแลระบบ หากคุณเป็นผู้ดูแลระบบ นี้ตัวอย่างการกำหนดค่า \"trusted_domains\" ใน\nconfig/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\" เป็นโดเมนที่เชื่อถือ",
+    "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" : "เริ่มต้นอัพเดท",
+    "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 สามารถใช้ได้อีกครั้ง",
+    "Error loading tags" : "เกิดข้อผิดพลาดขณะโหลดแท็ก",
+    "Tag already exists" : "มีแท็กอยู่แล้ว",
+    "Error deleting tag(s)" : "เกิดข้อผิดพลาดขณะลบแท็ก",
+    "Error tagging" : "เกิดข้อผิดพลาดขณะติดแท็ก",
+    "Error untagging" : "เกิดข้อผิดพลาดขณะยกเลิกการติดแท็ก",
+    "Error favoriting" : "เกิดข้อผิดพลาดขณะเลือกที่ชื่นชอบ",
+    "Error unfavoriting" : "เกิดข้อผิดพลาดขณะยกเลิกการเลือกที่ชื่นชอบ",
+    "Couldn't send mail to following users: %s " : "ไม่สามารถส่งอีเมลไปยังผู้ใช้: %s",
+    "Sunday" : "วันอาทิตย์",
+    "Monday" : "วันจันทร์",
+    "Tuesday" : "วันอังคาร",
+    "Wednesday" : "วันพุธ",
+    "Thursday" : "วันพฤหัสบดี",
+    "Friday" : "วันศุกร์",
+    "Saturday" : "วันเสาร์",
+    "Sun." : "อา.",
+    "Mon." : "จ.",
+    "Tue." : "อ.",
+    "Wed." : "พ.",
+    "Thu." : "พฤ.",
+    "Fri." : "ศ.",
+    "Sat." : "ส.",
+    "Su" : "อา",
+    "Mo" : "จัน",
+    "Tu" : "อัง",
+    "We" : "พุธ",
+    "Th" : "พฤ",
+    "Fr" : "ศุก",
+    "Sa" : "เสา",
+    "January" : "มกราคม",
+    "February" : "กุมภาพันธ์",
+    "March" : "มีนาคม",
+    "April" : "เมษายน",
+    "May" : "พฤษภาคม",
+    "June" : "มิถุนายน",
+    "July" : "กรกฏาคม",
+    "August" : "สิงหาคม",
+    "September" : "กันยายน",
+    "October" : "ตุลาคม",
+    "November" : "พฤศจิกายน",
+    "December" : "ธันวาคม",
+    "Jan." : "ม.ค.",
+    "Feb." : "ก.พ.",
+    "Mar." : "มี.ค.",
+    "Apr." : "เม.ย.",
+    "May." : "พ.ค.",
+    "Jun." : "มิ.ย.",
+    "Jul." : "ก.ค.",
+    "Aug." : "ส.ค.",
+    "Sep." : "ก.ย.",
+    "Oct." : "ต.ค.",
+    "Nov." : "พ.ย.",
+    "Dec." : "ธ.ค.",
+    "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?" : "ไฟล์ของคุณจะถูกเข้ารหัส หากคุณยังไม่ได้เปิดใช้งานรหัสการกู้คืน คุณจะได้รับข้อมูลของคุณกลับมาหลังจากที่รหัสผ่านของคุณถูกรีเซ็ต<br /> หากคุณไม่แน่ใจว่าควรทำอย่างไรโปรดติดต่อผู้ดูแลระบบของคุณก่อนที่คุณจะดำเนินการต่อไป <br /> คุณต้องการดำเนินการต่อ?",
+    "Sending ..." : "กำลังส่ง...",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "notify by email" : "แจ้งเตือนทางอีเมล",
+    "can share" : "สามารถแชร์ได้",
+    "create" : "สร้าง",
+    "change" : "เปลี่ยนแปลง",
+    "delete" : "ลบ",
+    "Share with users, groups or remote users…" : "แชร์กับผู้ใช้หรือกลุ่มหรือผู้ใช้โดยการรีโมท ...",
+    "Share with users or remote users…" : "แชร์กับผู้ใช้หรือผู้ใช้โดยการรีโมท ...",
+    "Warning" : "คำเตือน",
+    "Error while sending notification" : "เกิดข้อผิดพลาดขณะกำลังส่งการแจ้งเตือน",
+    "No search results in other folders" : "ไม่พบผลลัพธ์การค้นหาในโฟลเดอร์อื่นๆ"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index a4bf07acd53..f938e97716a 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -52,7 +52,6 @@ OC.L10N.register(
     "Cancel" : "İptal",
     "seconds ago" : "saniyeler önce",
     "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." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
-    "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?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
     "I know what I'm doing" : "Ne yaptığımı biliyorum",
     "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "No" : "Hayır",
@@ -109,6 +108,7 @@ OC.L10N.register(
     "Share link" : "Paylaşma bağlantısı",
     "Link" : "Bağlantı",
     "Password protect" : "Parola koruması",
+    "Allow editing" : "Düzenlemeye izin ver",
     "Email link to person" : "Bağlantıyı e-posta ile gönder",
     "Send" : "Gönder",
     "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
@@ -204,8 +204,8 @@ OC.L10N.register(
     "Need help?" : "Yardım mı lazım?",
     "See the documentation" : "Belgelendirmeye bak",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Bu uygulama düzgün çalışabilmesi için JavaScript gerektirir. Lütfen {linkstart}JavaScript'i etkinleştirin{linkend} ve sayfayı yeniden yükleyin.",
-    "Log out" : "Çıkış yap",
     "Search" : "Ara",
+    "Log out" : "Çıkış yap",
     "Server side authentication failed!" : "Sunucu taraflı yetkilendirme başarısız!",
     "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
     "An internal error occurred." : "Dahili bir hata oluştu.",
@@ -296,8 +296,8 @@ OC.L10N.register(
     "Oct." : "Eki.",
     "Nov." : "Kas.",
     "Dec." : "Ara.",
+    "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?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ters vekil sunucu başlık yapılandırmanız hatalı veya ownCloud'a güvenilen bir vekil sunucudan erişiyorsunuz. Eğer erişiminiz güvenilen bir vekil sunucu aracılığıyla gerçekleşmiyorsa bu bir güvenlik sorunudur ve bir saldırganın IP adresini farklıymış gibi göstermesine neden olabilir. Daha fazla bilgiyi <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">belgelendirmemizde</a> bulabilirsiniz.",
-    "Allow editing" : "Düzenlemeye izin ver",
     "Hide file listing" : "Dosya listelemesini gizle",
     "Sending ..." : "Gönderiliyor...",
     "Email sent" : "E-posta gönderildi",
@@ -319,7 +319,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Hesabınız için gelişmiş güvenlik etkinleştirildi. Lütfen ikinci etkeni kullanarak kimlik doğrulaması yapın.",
     "Cancel login" : "Girişi iptal et",
     "Please authenticate using the selected factor." : "Lütfen seçilen etkeni kullanarak kimlik doğrulaması yapın.",
-    "An error occured while verifying the token" : "Anahtarı(token) doğrularken bir hata oluştu",
-    "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ş"
+    "An error occured while verifying the token" : "Anahtarı(token) doğrularken bir hata oluştu"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index bbca4a23402..79c15a5ecee 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -50,7 +50,6 @@
     "Cancel" : "İptal",
     "seconds ago" : "saniyeler önce",
     "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." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
-    "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?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
     "I know what I'm doing" : "Ne yaptığımı biliyorum",
     "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "No" : "Hayır",
@@ -107,6 +106,7 @@
     "Share link" : "Paylaşma bağlantısı",
     "Link" : "Bağlantı",
     "Password protect" : "Parola koruması",
+    "Allow editing" : "Düzenlemeye izin ver",
     "Email link to person" : "Bağlantıyı e-posta ile gönder",
     "Send" : "Gönder",
     "Shared with you and the group {group} by {owner}" : "{owner} tarafından sizinle ve {group} ile paylaştırılmış",
@@ -202,8 +202,8 @@
     "Need help?" : "Yardım mı lazım?",
     "See the documentation" : "Belgelendirmeye bak",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Bu uygulama düzgün çalışabilmesi için JavaScript gerektirir. Lütfen {linkstart}JavaScript'i etkinleştirin{linkend} ve sayfayı yeniden yükleyin.",
-    "Log out" : "Çıkış yap",
     "Search" : "Ara",
+    "Log out" : "Çıkış yap",
     "Server side authentication failed!" : "Sunucu taraflı yetkilendirme başarısız!",
     "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
     "An internal error occurred." : "Dahili bir hata oluştu.",
@@ -294,8 +294,8 @@
     "Oct." : "Eki.",
     "Nov." : "Kas.",
     "Dec." : "Ara.",
+    "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?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
     "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "Ters vekil sunucu başlık yapılandırmanız hatalı veya ownCloud'a güvenilen bir vekil sunucudan erişiyorsunuz. Eğer erişiminiz güvenilen bir vekil sunucu aracılığıyla gerçekleşmiyorsa bu bir güvenlik sorunudur ve bir saldırganın IP adresini farklıymış gibi göstermesine neden olabilir. Daha fazla bilgiyi <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">belgelendirmemizde</a> bulabilirsiniz.",
-    "Allow editing" : "Düzenlemeye izin ver",
     "Hide file listing" : "Dosya listelemesini gizle",
     "Sending ..." : "Gönderiliyor...",
     "Email sent" : "E-posta gönderildi",
@@ -317,7 +317,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "Hesabınız için gelişmiş güvenlik etkinleştirildi. Lütfen ikinci etkeni kullanarak kimlik doğrulaması yapın.",
     "Cancel login" : "Girişi iptal et",
     "Please authenticate using the selected factor." : "Lütfen seçilen etkeni kullanarak kimlik doğrulaması yapın.",
-    "An error occured while verifying the token" : "Anahtarı(token) doğrularken bir hata oluştu",
-    "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ş"
+    "An error occured while verifying the token" : "Anahtarı(token) doğrularken bir hata oluştu"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index 0a69151727f..aef131f69fe 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -52,7 +52,6 @@ OC.L10N.register(
     "Cancel" : "Скасувати",
     "seconds ago" : "секунди тому",
     "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." : "Посилання для скидання вашого паролю було надіслано на ваш email. Якщо ви не отримали його найближчим часом, перевірте теку зі спамом.<br>Якщо і там немає, спитайте вашого місцевого адміністратора.",
-    "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?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
     "I know what I'm doing" : "Я знаю що роблю",
     "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
     "No" : "Ні",
@@ -96,6 +95,7 @@ OC.L10N.register(
     "Share link" : "Поділитись посиланням",
     "Link" : "Посилання",
     "Password protect" : "Захистити паролем",
+    "Allow editing" : "Дозволити редагування",
     "Email link to person" : "Надіслати посилання електронною поштою",
     "Send" : "Надіслати",
     "Shared with you and the group {group} by {owner}" : " {owner} опублікував для Вас та для групи {group}",
@@ -187,8 +187,8 @@ OC.L10N.register(
     "Need help?" : "Потрібна допомога?",
     "See the documentation" : "Дивіться документацію",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ця програма вимагає увімкнений JavaScript для коректної роботи. Будь ласка, {linkstart} Увімкніть JavaScript {linkend}  та перезавантажте сторінку.",
-    "Log out" : "Вихід",
     "Search" : "Пошук",
+    "Log out" : "Вихід",
     "Server side authentication failed!" : "Невдала аутентифікація з сервером!",
     "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.",
     "An internal error occurred." : "Виникла внутрішня помилка.",
@@ -278,7 +278,7 @@ OC.L10N.register(
     "Oct." : "Жов.",
     "Nov." : "Лис.",
     "Dec." : "Гру.",
-    "Allow editing" : "Дозволити редагування",
+    "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?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
     "Sending ..." : "Надсилання...",
     "Email sent" : "Лист надіслано",
     "Send link via email" : "Надіслати посилання електронною поштою",
@@ -296,7 +296,6 @@ OC.L10N.register(
     "Error while sending notification" : "Помилка під час надсилання повідомлення",
     "No search results in other folders" : "В інших теках нічого не знайдено",
     "Two-step verification" : "Дворівнева перевірка",
-    "An error occured while verifying the token" : "При верифікації токена виникла помилка",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud"
+    "An error occured while verifying the token" : "При верифікації токена виникла помилка"
 },
 "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/core/l10n/uk.json b/core/l10n/uk.json
index 2f43606aad3..da69ffaea29 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -50,7 +50,6 @@
     "Cancel" : "Скасувати",
     "seconds ago" : "секунди тому",
     "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." : "Посилання для скидання вашого паролю було надіслано на ваш email. Якщо ви не отримали його найближчим часом, перевірте теку зі спамом.<br>Якщо і там немає, спитайте вашого місцевого адміністратора.",
-    "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?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
     "I know what I'm doing" : "Я знаю що роблю",
     "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
     "No" : "Ні",
@@ -94,6 +93,7 @@
     "Share link" : "Поділитись посиланням",
     "Link" : "Посилання",
     "Password protect" : "Захистити паролем",
+    "Allow editing" : "Дозволити редагування",
     "Email link to person" : "Надіслати посилання електронною поштою",
     "Send" : "Надіслати",
     "Shared with you and the group {group} by {owner}" : " {owner} опублікував для Вас та для групи {group}",
@@ -185,8 +185,8 @@
     "Need help?" : "Потрібна допомога?",
     "See the documentation" : "Дивіться документацію",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "Ця програма вимагає увімкнений JavaScript для коректної роботи. Будь ласка, {linkstart} Увімкніть JavaScript {linkend}  та перезавантажте сторінку.",
-    "Log out" : "Вихід",
     "Search" : "Пошук",
+    "Log out" : "Вихід",
     "Server side authentication failed!" : "Невдала аутентифікація з сервером!",
     "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.",
     "An internal error occurred." : "Виникла внутрішня помилка.",
@@ -276,7 +276,7 @@
     "Oct." : "Жов.",
     "Nov." : "Лис.",
     "Dec." : "Гру.",
-    "Allow editing" : "Дозволити редагування",
+    "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?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
     "Sending ..." : "Надсилання...",
     "Email sent" : "Лист надіслано",
     "Send link via email" : "Надіслати посилання електронною поштою",
@@ -294,7 +294,6 @@
     "Error while sending notification" : "Помилка під час надсилання повідомлення",
     "No search results in other folders" : "В інших теках нічого не знайдено",
     "Two-step verification" : "Дворівнева перевірка",
-    "An error occured while verifying the token" : "При верифікації токена виникла помилка",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "Поширити серед людей інших ownCloud'ів, використовуючи синтаксис ім'я_користувача@файли.укр/owncloud"
+    "An error occured while verifying the token" : "При верифікації токена виникла помилка"
 },"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/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 77d541ca71a..4157cb3d1c3 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -1,39 +1,41 @@
 OC.L10N.register(
     "core",
     {
-    "Please select a file." : "请选择一个文件",
+    "Please select a file." : "请选择一个文件.",
     "File is too big" : "文件太大",
+    "The selected file is not an image." : "所选文件不是一张图片.",
+    "The selected file cannot be read." : "无法读取所选文件.",
     "Invalid file provided" : "提供了无效文件",
     "No image or file provided" : "没有提供图片或文件",
     "Unknown filetype" : "未知的文件类型",
     "Invalid image" : "无效的图像",
-    "An error occurred. Please contact your admin." : "发生了一个错误，请联系管理员。",
-    "No temporary profile picture available, try again" : "没有临时概览页图片可用，请重试",
-    "No crop data provided" : "没有提供相应数据",
+    "An error occurred. Please contact your admin." : "发生了一个错误, 请联系管理员.",
+    "No temporary profile picture available, try again" : "没有临时个人页图片可用, 请重试",
+    "No crop data provided" : "没有提供剪裁数据",
     "No valid crop data provided" : "没有提供有效的裁剪数据",
     "Crop is not square" : "裁剪的不是正方形",
-    "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." : "无法发送重置邮件，请检查您的用户名是否正确。",
-    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
+    "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." : "无法发送重置邮件, 请检查您的用户名是否正确.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "该用户没有设置电子邮件地址, 无发送重置邮件. 请联系管理员.",
     "%s password reset" : "重置 %s 的密码",
-    "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。",
+    "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件, 请联系管理员.",
     "Preparing update" : "正在准备更新",
     "[%d / %d]: %s" : "[%d / %d]: %s",
-    "Repair warning: " : "修复警告：",
-    "Repair error: " : "修复错误：",
-    "Please use the command line updater because automatic updating is disabled in the config.php." : "由于自动更新在 config.php 中已禁用，请使用命令行更新。",
+    "Repair warning: " : "修复警告:",
+    "Repair error: " : "修复错误:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "由于自动更新在 config.php 中已禁用, 请使用命令行更新.",
     "[%d / %d]: Checking table %s" : "[%d / %d]: 检查数据表 %s",
     "Turned on maintenance mode" : "启用维护模式",
     "Turned off maintenance mode" : "关闭维护模式",
-    "Maintenance mode is kept active" : "维护模式已被启用",
-    "Updating database schema" : "正在更新数据库架构",
+    "Maintenance mode is kept active" : "维护模式已启用",
+    "Updating database schema" : "正在更新数据库结构",
     "Updated database" : "数据库已更新",
-    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "检查数据库架构是否可以更新 (这可能需要很长的时间，这取决于数据库大小)",
-    "Checked database schema update" : "已经检查数据库架构更新",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "检查数据库结构是否可以更新 (这可能需要很长的时间, 这取决于数据库大小)",
+    "Checked database schema update" : "已经检查数据库结构更新",
     "Checking updates of apps" : "检查更新应用",
-    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "检查 %s 的数据库架构是否可以更新 (这可能需要很长的时间，这取决于数据库大小)",
-    "Checked database schema update for apps" : "已经检查应用的数据库架构更新",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "检查 %s 的数据库结构是否可以更新 (这可能需要很长的时间, 这取决于数据库大小)",
+    "Checked database schema update for apps" : "已经检查应用的数据库结构更新",
     "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s",
     "Set log level to debug" : "设置日志级别为 调试",
     "Reset log level" : "重设日志级别",
@@ -41,86 +43,120 @@ OC.L10N.register(
     "Finished code integrity check" : "代码完整性检查完成",
     "%s (3rdparty)" : "%s (第三方)",
     "%s (incompatible)" : "%s (不兼容)",
-    "Following apps have been disabled: %s" : "下列应用已经被禁用：%s",
+    "Following apps have been disabled: %s" : "下列应用已经被禁用: %s",
     "Already up to date" : "已经是最新",
-    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">代码完整性检查出现异常，点击查看详细信息...</a>",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">代码完整性检查出现异常, 点击查看详细信息...</a>",
     "Settings" : "设置",
-    "Problem loading page, reloading in 5 seconds" : "加载页面出现问题，在 5 秒内重新载入",
+    "Connection to server lost" : "与服务器的连接断开",
+    "Problem loading page, reloading in 5 seconds" : "加载页面出现问题, 在 5 秒内重新加载",
     "Saving..." : "保存中...",
     "Dismiss" : "忽略",
+    "This action requires you to confirm your password" : "请您确认您的密码",
+    "Authentication required" : "授权请求",
     "Password" : "密码",
     "Cancel" : "取消",
+    "Confirm" : "确认",
+    "Failed to authenticate, try again" : "授权失败, 请重试",
     "seconds ago" : "几秒前",
-    "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." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。",
-    "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?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？",
+    "Logging in …" : "正在登录...",
+    "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." : "密码重置邮件已经发送到您的电子邮箱中. 如果您长时间没能收到邮件, 请检查您邮箱的垃圾/广告文件夹 <br>如果未能收到邮件请联系管理员.",
+    "Your files are encrypted. 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?" : "您的文件已经加密. 当您的密码重置后没有任何方式能恢复您的数据. <br />如果您不确定, 请在继续前联系您的管理员.<br/>您是否真的要继续?",
     "I know what I'm doing" : "我知道我在做什么",
-    "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
+    "Password can not be changed. Please contact your administrator." : "无法修改密码, 请联系管理员.",
     "No" : "否",
     "Yes" : "是",
+    "No files in here" : "未找到文件",
     "Choose" : "选择",
-    "Error loading file picker template: {error}" : "加载文件分拣模板出错: {error}",
+    "Error loading file picker template: {error}" : "加载文件选择模板出错: {error}",
     "Ok" : "确定",
     "Error loading message template: {error}" : "加载消息模板出错: {error}",
     "read-only" : "只读",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} 个文件冲突"],
-    "One file conflict" : "1个文件冲突",
+    "One file conflict" : "1 个文件冲突",
     "New Files" : "新文件",
     "Already existing files" : "已经存在的文件",
-    "Which files do you want to keep?" : "想要保留哪一个文件呢？",
-    "If you select both versions, the copied file will have a number added to its name." : "如果同时选择了两个版本，复制的文件名将会增加上一个数字。",
+    "Which files do you want to keep?" : "请选择需要保留的文件?",
+    "If you select both versions, the copied file will have a number added to its name." : "如果同时选择了两个版本, 副本的文件名中将会追加数字.",
     "Continue" : "继续",
     "(all selected)" : "(选中全部)",
-    "({count} selected)" : "(选择了{count}个)",
+    "({count} selected)" : "(选择了 {count} 个)",
     "Error loading file exists template" : "加载文件存在性模板失败",
+    "Pending" : "等待",
     "Very weak password" : "非常弱的密码",
     "Weak password" : "弱密码",
     "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 set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "您的web服务器未正确设置以解析 \"{url}\"。您可以在我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>中找到更多可用信息。",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom 无法被 PHP 读取，出于安全原因，这是强烈不推荐的。请查看<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>了解详情。",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "你的 PHP 版本 ({version}) 不再被 <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\"> PHP </a>支持。我们建议您升级您的PHP版本，以便获得 PHP 性能和安全提升。",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached 配置为分布式缓存，但是已经安装的 PHP 模块是 \"memcache\" 。 \\OC\\Memcache\\Memcached 仅支持 \"memcached\" 而不是 \"memcache\"。点击 <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\"> memcached wiki 了解两个模块的不同</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "一些文件没有通过完整性检查。如何解决此问题的详细信息可以查看我们的 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">无效文件列表…</a> / <a href=\"{rescanEndpoint}\">重新扫描…</a>)",
-    "Error occurred while checking server setup" : "当检查服务器启动时出错",
-    "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 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。",
-    "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 at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP 严格传输安全（Strict-Transport-Security）报头未配置到至少“{seconds}”秒。处于增强安全性考虑，我们推荐按照<a href=\"{docUrl}\" rel=\"noreferrer\">安全提示</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。",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "由于 WebDAV 接口似乎被破坏, 因此你的 Web 服务器没有正确地设置允许文件同步。",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "您的 Web 服务器未正确设置以解析 \"{url}\". 您可以在我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>中找到更多可用信息.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "此服务器没有可用的互联网连接: 多个节点无法访问. 这意味着某些功能比如挂载外部存储, 更新通知以及安装第三方应用将无法工作. 远程访问文件和发送通知邮件可能也不工作. 如果您想使用所有的功能, 我们建议启用互联网连接.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "内存缓存未配置. 如果可用, 请配置 memcache 以增强性能. 更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP 无法访问 /dev/urandom, 由于安全原因, 这是强烈不推荐的. 更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "您当前的 PHP 版本 {version}. 我们建议您尽快升级您的 PHP 版本, 以便获得<a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">来自 PHP 官方的性能和安全</a>的提升.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "反向代理配置错误, 或者您正在通过可信的代理访问 Nextcloud. 如果您不是通过可信代理访问 Nextcloud, 这将是一个安全问题, 并允许攻击者通过伪装 IP 地址访问 Nextcloud. 更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached 当前配置为分布式缓存, 但是当前安装的 PHP 模块是 \"memcache\".  \\OC\\Memcache\\Memcached 仅支持 \"memcached\" 而不是 \"memcache\". 点击<a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki</a>了解两者的不同.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "一些文件没有通过完整性检查. 了解如何解决该问题请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">无效的文件列表…</a> / <a href=\"{rescanEndpoint}\">重新扫描…</a>)",
+    "Error occurred while checking server setup" : "检查服务器设置时出错",
+    "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 服务器根目录之外.",
+    "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 at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP 请求头 \"Strict-Transport-Security\" 没有配置为至少 “{seconds}” 秒. 出于增强安全性考虑, 我们推荐按照<a href=\"{docUrl}\" rel=\"noreferrer\">安全提示</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}分享",
+    "Shared with {recipients}" : "由 {recipients} 分享",
     "Error" : "错误",
     "Error while sharing" : "共享时出错",
     "Error while unsharing" : "取消共享时出错",
     "Error setting expiration date" : "设置过期日期时出错",
-    "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
+    "The public link will expire no later than {days} days after it is created" : "该共享链接将在创建后 {days} 天失效",
     "Set expiration date" : "设置过期日期",
     "Expiration" : "过期",
     "Expiration date" : "过期日期",
     "Choose a password for the public link" : "为共享链接设置密码",
+    "Copied!" : "已经复制!",
+    "Copy" : "复制",
+    "Not supported!" : "无法支持!",
+    "Press ⌘-C to copy." : "按 ⌘ + C 进行复制.",
+    "Press Ctrl-C to copy." : "按  Ctrl + C 进行复制.",
     "Resharing is not allowed" : "不允许二次共享",
     "Share link" : "分享链接",
     "Link" : "链接",
     "Password protect" : "密码保护",
+    "Allow upload and editing" : "允许上传和编辑",
+    "Allow editing" : "允许编辑",
+    "File drop (upload only)" : "文件拖拽 (仅上传)",
     "Email link to person" : "发送链接到个人",
     "Send" : "发送",
-    "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组",
-    "Shared with you by {owner}" : "{owner} 与您共享",
+    "Shared with you and the group {group} by {owner}" : "{owner} 分享给您及 {group} 分组",
+    "Shared with you by {owner}" : "{owner} 分享给您",
+    "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} 通过链接分享",
     "group" : "群组",
-    "remote" : "远程",
+    "remote" : "外部",
+    "email" : "邮件",
     "Unshare" : "取消共享",
-    "can edit" : "可以修改",
+    "can reshare" : "允许重新分享",
+    "can edit" : "允许修改",
+    "can create" : "允许创建",
+    "can change" : "允许改变",
+    "can delete" : "允许删除",
     "access control" : "访问控制",
     "Could not unshare" : "无法共享",
     "Share details could not be loaded for this item." : "无法加载这个项目的分享详情",
     "No users or groups found for {search}" : "{search} 条件下没有找到用户或用户组",
     "No users found for {search}" : "没有找到 {search} 用户",
-    "An error occurred. Please try again" : "发生错误。请重试。",
-    "{sharee} (group)" : "{sharee} (组)",
-    "{sharee} (remote)" : "{sharee} (远程)",
+    "An error occurred. Please try again" : "发生错误. 请重试.",
+    "{sharee} (group)" : "{sharee} (分组)",
+    "{sharee} (remote)" : "{sharee} (外部)",
+    "{sharee} (email)" : "{sharee} (邮件)",
     "Share" : "分享",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "使用联合云ID与其他服务器的用户分享, 如 用户名@example.com/nextcloud",
+    "Share with users or by mail..." : "通过邮件分享...",
+    "Share with users or remote users..." : "分享给其他用户或外部用户...",
+    "Share with users, remote users or by mail..." : "通过邮件分享给其他用户或外部用户...",
+    "Share with users or groups..." : "分享给其他用户或分组...",
+    "Share with users, groups or by mail..." : "通过邮件分享给其他用户或分组...",
+    "Share with users, groups or remote users..." : "分享给其他用户, 分组或外部用户...",
+    "Share with users, groups, remote users or by mail..." : "通过邮件分享给其他用户, 分组或外部用户...",
+    "Share with users..." : "分享给其他用户...",
     "Error removing share" : "移除分享时出错",
     "Non-existing tag #{tag}" : "标签 #{tag} 不存在",
     "restricted" : "受限",
@@ -129,23 +165,30 @@ OC.L10N.register(
     "Delete" : "删除",
     "Rename" : "重命名",
     "Collaborative tags" : "协作标签",
-    "The object type is not specified." : "未指定对象类型。",
+    "No tags found" : "标签未找到",
+    "The object type is not specified." : "未指定对象类型.",
     "Enter new" : "输入新...",
     "Add" : "增加",
     "Edit tags" : "编辑标签",
     "Error loading dialog template: {error}" : "加载对话框模板出错: {error}",
-    "No tags selected for deletion." : "请选择要删除的标签。",
+    "No tags selected for deletion." : "没有选择删除的标签",
     "unknown text" : "未知文字",
     "Hello world!" : "Hello world!",
     "sunny" : "晴",
-    "Hello {name}, the weather is {weather}" : "您好 {name}，今天天气是{weather}",
+    "Hello {name}, the weather is {weather}" : "您好 {name}, 今天天气是 {weather}",
     "Hello {name}" : "你好 {name}",
     "new" : "新建",
     "_download %n file_::_download %n files_" : ["下载 %n 个文件"],
-    "An error occurred." : "发生了一个错误",
-    "Please reload the page." : "请重新加载页面。",
-    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "更新不成功。有关此问题的更多信息请<a href=\"{url}\">查看我们的论坛帖子</a>。",
-    "Searching other places" : "搜索其他地方",
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "正在更新, 在某些环境下离开当前页面可能会中断.",
+    "Update to {version}" : "升级到 {version}",
+    "An error occurred." : "发生错误",
+    "Please reload the page." : "请重新加载页面",
+    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "更新不成功. 有关此问题的更多信息请<a href=\"{url}\">查看我们的论坛帖子</a>。",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "升级成功. 请将此问题报告给 <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud 社区</a>.",
+    "Continue to Nextcloud" : "继续访问 Nextcloud",
+    "The update was successful. Redirecting you to Nextcloud now." : "升级成功. 正在重新访问 Nextcloud.",
+    "Searching other places" : "搜索其他位置",
+    "No search results in other folders for '{tag}{filter}{endtag}'" : "在其他文件夹内未找到含有 '{tag}{filter}{endtag}' 的结果",
     "_{count} search result in another folder_::_{count} search results in other folders_" : ["在其他文件夹中找到 {count} 条搜索结果"],
     "Personal" : "个人",
     "Users" : "用户",
@@ -154,88 +197,96 @@ OC.L10N.register(
     "Help" : "帮助",
     "Access forbidden" : "访问禁止",
     "File not found" : "文件未找到",
-    "The specified document has not been found on the server." : "在服务器上没找到指定的文件。",
-    "You can click here to return to %s." : "你可以点击这里返回 %s。",
+    "The specified document has not been found on the server." : "在服务器上没找到指定的文件.",
+    "You can click here to return to %s." : "你可以点击这里返回 %s.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "嗨、你好,\n\n只想让你知道 %s 分享了 %s 给你。\n现在查看: %s\n",
-    "The share will expire on %s." : "此分享将在 %s 过期。",
+    "The share will expire on %s." : "此分享将在 %s 过期.",
     "Cheers!" : "干杯！",
     "Internal Server Error" : "内部服务器错误",
-    "The server encountered an internal error and was unable to complete your request." : "服务器发送一个内部错误并且无法完成你的请求。",
-    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "请联系服务器管理员，如果多次出现这个错误，请把下面的技术细节包含在您的报告里。",
-    "More details can be found in the server log." : "更多细节能在服务器日志中找到。",
+    "The server encountered an internal error and was unable to complete your request." : "服务器发生一个内部错误并且无法完成你的请求.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "如果多次出现这个错误, 请联系服务器管理员, 请把下面的技术细节包含在您的报告中.",
+    "More details can be found in the server log." : "更多细节可以在服务器日志中找到.",
     "Technical details" : "技术细节",
-    "Remote Address: %s" : "远程地址： %s",
+    "Remote Address: %s" : "远程地址: %s",
     "Request ID: %s" : "请求 ID: %s",
-    "Type: %s" : "类型：%s",
+    "Type: %s" : "类型: %s",
     "Code: %s" : "代码: %s",
     "Message: %s" : "消息: %s",
     "File: %s" : "文件: %s",
     "Line: %s" : "行: %s",
     "Trace" : "追踪",
     "Security warning" : "安全警告",
-    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "关于如何正确配置服务器，请参见 <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">此文档</a>.。",
-    "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "因为 .htaccess 文件没有工作, 您的数据目录和文件可从互联网被访问. ",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "了解如何正确配置服务器, 请参见 <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">文档</a>.",
+    "Create an <strong>admin account</strong>" : "创建 <strong>管理员账号</strong>",
     "Username" : "用户名",
     "Storage & database" : "存储 & 数据库",
     "Data folder" : "数据目录",
     "Configure the database" : "配置数据库",
     "Only %s is available." : "仅 %s 可用。",
-    "Install and activate additional PHP modules to choose other database types." : "安装或激活额外的 PHP 模块以选择其他数据库类型。",
-    "For more details check out the documentation." : "请查阅文档获得详细信息。",
+    "Install and activate additional PHP modules to choose other database types." : "安装并激活额外的 PHP 模块以选择其他数据库类型.",
+    "For more details check out the documentation." : "请查阅文档获得详细信息.",
     "Database user" : "数据库用户",
     "Database password" : "数据库密码",
     "Database name" : "数据库名",
     "Database tablespace" : "数据库表空间",
     "Database host" : "数据库主机",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "请填写主机名称和端口号 (示例, localhost:5432).",
     "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 。",
+    "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.",
     "Finish setup" : "安装完成",
-    "Finishing …" : "正在结束 ...",
-    "Need help?" : "需要帮助？",
+    "Finishing …" : "正在完成...",
+    "Need help?" : "需要帮助?",
     "See the documentation" : "查看文档",
-    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "对于正确的操作，该应用要求 JavaScript 。请 {linkstart} 打开 JavaScript {linkend} ，然后重新载入页面。",
-    "Log out" : "注销",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "对于正确的操作, 该应用需要使用 JavaScript. 请 {linkstart}启用 JavaScript{linkend}, 并重新加载页面.",
     "Search" : "搜索",
-    "Server side authentication failed!" : "服务端验证失败！",
-    "Please contact your administrator." : "请联系你的管理员。",
-    "An internal error occurred." : "发生了内部错误。",
-    "Please try again or contact your administrator." : "请重试或联系管理员。",
+    "Log out" : "注销",
+    "This action requires you to confirm your password:" : "此操作需要确认您的密码:",
+    "Confirm your password" : "确认您的密码",
+    "Server side authentication failed!" : "服务端认证失败!",
+    "Please contact your administrator." : "请联系您的管理员.",
+    "An internal error occurred." : "发生了内部错误.",
+    "Please try again or contact your administrator." : "请重试或联系您的管理员.",
     "Username or email" : "用户名或邮箱",
-    "Wrong password. Reset it?" : "密码错误。要重置么？",
+    "Wrong password. Reset it?" : "密码错误. 是否要重置?",
     "Wrong password." : "密码错误",
     "Log in" : "登录",
     "Stay logged in" : "保持登录",
     "Alternative Logins" : "其他登录方式",
-    "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}",
+    "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码: {link}",
     "New password" : "新密码",
     "New Password" : "新密码",
     "Reset password" : "重置密码",
     "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 Nextcloud instance is currently in single user mode." : "当前Nextcloud实例运行在单用户模式下。",
-    "This means only administrators can use the instance." : "这意味着只有管理员才能在实例上操作。",
-    "Contact your system administrator if this message persists or appeared unexpectedly." : "如果这个消息一直存在或不停出现，请联系你的系统管理员。",
-    "Thank you for your patience." : "感谢让你久等了。",
-    "You are accessing the server from an untrusted domain." : "您正在访问来自不信任域名的服务器。",
-    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" 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\"为信任域",
+    "This Nextcloud instance is currently in single user mode." : "当前 Nextcloud 实例运行在单用户模式下.",
+    "This means only administrators can use the instance." : "这意味着只有管理员才能在实例上操作.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "如果这个消息一直存在或不停出现, 请联系你的系统管理员.",
+    "Thank you for your patience." : "感谢您久等了.",
+    "Two-factor authentication" : "双重认证",
+    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "您的帐户已启用增强安全性, 请使用第二因子验证.",
+    "Cancel log in" : "取消登录",
+    "Use backup code" : "使用备用口令",
+    "Error while validating your second factor" : "验证您的第二项时出错",
+    "You are accessing the server from an untrusted domain." : "您正在访问来自不信任域名的服务器.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" 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\" 为信任域名",
     "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." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
+    "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" : "开始更新",
-    "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:" : "为避免较大安装时的超时, 您可以在安装目录下执行下述的命令:",
     "Detailed logs" : "详细日志",
     "Update needed" : "需要更新",
-    "Please use the command line updater because you have a big instance." : "请使用命令行更新。",
-    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "获取更多帮助，请查看  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">文档</a>.",
-    "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 再次可用时这个页面将刷新。",
+    "Please use the command line updater because you have a big instance." : "由于您的实例较大, 请使用命令行更新.",
+    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "获取更多帮助, 请查看 <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">文档</a>.",
+    "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 再次可用时此页面将刷新.",
     "Error loading tags" : "加载标签出错",
     "Tag already exists" : "标签已存在",
     "Error deleting tag(s)" : "删除标签时出错",
@@ -251,20 +302,20 @@ OC.L10N.register(
     "Thursday" : "星期四",
     "Friday" : "星期五",
     "Saturday" : "星期六",
-    "Sun." : "日",
+    "Sun." : "周日",
     "Mon." : "周一",
     "Tue." : "周二",
     "Wed." : "周三",
     "Thu." : "周四",
     "Fri." : "周五",
     "Sat." : "周六",
-    "Su" : "Su",
-    "Mo" : "Mo",
-    "Tu" : "Tu",
-    "We" : "We",
-    "Th" : "Th",
-    "Fr" : "Fr",
-    "Sa" : "Sa",
+    "Su" : "日",
+    "Mo" : "一",
+    "Tu" : "二",
+    "We" : "三",
+    "Th" : "四",
+    "Fr" : "五",
+    "Sa" : "六",
     "January" : "一月",
     "February" : "二月",
     "March" : "三月",
@@ -289,8 +340,10 @@ OC.L10N.register(
     "Oct." : "十月",
     "Nov." : "十一月",
     "Dec." : "十二月",
-    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "反向代理头配置不正确，或者您正从一个受信任的代理访问ownCloud。如果你不是通过受信任的代理访问 ownCloud，这将引发一个安全问题，可能由于 ownCloud IP 地址可见导致欺骗攻击。更多信息可以查看我们的 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>。",
-    "Allow editing" : "允许编辑",
+    "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?" : "您的文件已经加密. 如果您没有启用恢复密钥, 当您的密码重置后没有任何方式能恢复您的数据. <br />如果您不确定, 请在继续前联系您的管理员.<br/>您是否真的要继续?",
+    "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." : "此服务器没有可用的互联网连接. 这意味着某些功能比如挂载外部存储, 更新通知以及安装第三方应用将无法工作. 远程访问文件和发送通知邮件可能也不工作. 如果您想使用所有的功能, 我们建议启用互联网连接.",
+    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "反向代理配置错误, 或者您正在通过可信的代理访问 ownCloud. 如果您不是通过可信代理访问 ownCloud, 这将是一个安全问题, 并允许攻击者通过伪装 IP 地址访问 ownCloud. 更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>.",
+    "Hide file listing" : "隐藏列出的文件",
     "Sending ..." : "正在发送...",
     "Email sent" : "邮件已发送",
     "Send link via email" : "通过邮件发送链接",
@@ -300,18 +353,20 @@ OC.L10N.register(
     "change" : "更改",
     "delete" : "删除",
     "{sharee} (at {server})" : "{sharee} (位于 {server})",
-    "Share with users…" : "与用户分享...",
-    "Share with users, groups or remote users…" : "与用户，组或远程用户分享...",
-    "Share with users or groups…" : "与用户或组分享...",
-    "Share with users or remote users…" : "与用户或远程用户分享...",
+    "Share with users…" : "分享给其他用户...",
+    "Share with users, groups or remote users…" : "分享给其他用户, 分组或外部用户...",
+    "Share with users or groups…" : "分享给其他用户或分组...",
+    "Share with users or remote users…" : "分享给其他用户或外部用户...",
     "Warning" : "警告",
     "Error while sending notification" : "发送通知时出现错误",
-    "No search results in other folders" : "在其他文件夹中没有得到任何搜索结果",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "正在升级, 在某些环境下离开当前页面可能会中断.",
+    "Updating to {version}" : "升级到 {version}",
+    "The update was successful. There were warnings." : "更新成功. 更新过程中出现一些警告.",
+    "No search results in other folders" : "在其他文件夹内未找到任何结果",
     "Two-step verification" : "两步验证",
-    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "您的帐户已启用增强安全性，请使用第二因子验证。",
+    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "您的帐户已启用增强安全性, 请使用第二因子验证.",
     "Cancel login" : "取消登录",
-    "Please authenticate using the selected factor." : "请使用所选择的因素验证。",
-    "An error occured while verifying the token" : "在验证令牌时出错",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "使用语法 username@example.com/owncloud 分享给其他 ownCloud 上的用户"
+    "Please authenticate using the selected factor." : "请使用所选择的方式验证.",
+    "An error occured while verifying the token" : "验证令牌时出错"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index 8a1af692c4f..b99348b05ee 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -1,37 +1,39 @@
 { "translations": {
-    "Please select a file." : "请选择一个文件",
+    "Please select a file." : "请选择一个文件.",
     "File is too big" : "文件太大",
+    "The selected file is not an image." : "所选文件不是一张图片.",
+    "The selected file cannot be read." : "无法读取所选文件.",
     "Invalid file provided" : "提供了无效文件",
     "No image or file provided" : "没有提供图片或文件",
     "Unknown filetype" : "未知的文件类型",
     "Invalid image" : "无效的图像",
-    "An error occurred. Please contact your admin." : "发生了一个错误，请联系管理员。",
-    "No temporary profile picture available, try again" : "没有临时概览页图片可用，请重试",
-    "No crop data provided" : "没有提供相应数据",
+    "An error occurred. Please contact your admin." : "发生了一个错误, 请联系管理员.",
+    "No temporary profile picture available, try again" : "没有临时个人页图片可用, 请重试",
+    "No crop data provided" : "没有提供剪裁数据",
     "No valid crop data provided" : "没有提供有效的裁剪数据",
     "Crop is not square" : "裁剪的不是正方形",
-    "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." : "无法发送重置邮件，请检查您的用户名是否正确。",
-    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
+    "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." : "无法发送重置邮件, 请检查您的用户名是否正确.",
+    "Could not send reset email because there is no email address for this username. Please contact your administrator." : "该用户没有设置电子邮件地址, 无发送重置邮件. 请联系管理员.",
     "%s password reset" : "重置 %s 的密码",
-    "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件，请联系管理员。",
+    "Couldn't send reset email. Please contact your administrator." : "未能成功发送重置邮件, 请联系管理员.",
     "Preparing update" : "正在准备更新",
     "[%d / %d]: %s" : "[%d / %d]: %s",
-    "Repair warning: " : "修复警告：",
-    "Repair error: " : "修复错误：",
-    "Please use the command line updater because automatic updating is disabled in the config.php." : "由于自动更新在 config.php 中已禁用，请使用命令行更新。",
+    "Repair warning: " : "修复警告:",
+    "Repair error: " : "修复错误:",
+    "Please use the command line updater because automatic updating is disabled in the config.php." : "由于自动更新在 config.php 中已禁用, 请使用命令行更新.",
     "[%d / %d]: Checking table %s" : "[%d / %d]: 检查数据表 %s",
     "Turned on maintenance mode" : "启用维护模式",
     "Turned off maintenance mode" : "关闭维护模式",
-    "Maintenance mode is kept active" : "维护模式已被启用",
-    "Updating database schema" : "正在更新数据库架构",
+    "Maintenance mode is kept active" : "维护模式已启用",
+    "Updating database schema" : "正在更新数据库结构",
     "Updated database" : "数据库已更新",
-    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "检查数据库架构是否可以更新 (这可能需要很长的时间，这取决于数据库大小)",
-    "Checked database schema update" : "已经检查数据库架构更新",
+    "Checking whether the database schema can be updated (this can take a long time depending on the database size)" : "检查数据库结构是否可以更新 (这可能需要很长的时间, 这取决于数据库大小)",
+    "Checked database schema update" : "已经检查数据库结构更新",
     "Checking updates of apps" : "检查更新应用",
-    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "检查 %s 的数据库架构是否可以更新 (这可能需要很长的时间，这取决于数据库大小)",
-    "Checked database schema update for apps" : "已经检查应用的数据库架构更新",
+    "Checking whether the database schema for %s can be updated (this can take a long time depending on the database size)" : "检查 %s 的数据库结构是否可以更新 (这可能需要很长的时间, 这取决于数据库大小)",
+    "Checked database schema update for apps" : "已经检查应用的数据库结构更新",
     "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s",
     "Set log level to debug" : "设置日志级别为 调试",
     "Reset log level" : "重设日志级别",
@@ -39,86 +41,120 @@
     "Finished code integrity check" : "代码完整性检查完成",
     "%s (3rdparty)" : "%s (第三方)",
     "%s (incompatible)" : "%s (不兼容)",
-    "Following apps have been disabled: %s" : "下列应用已经被禁用：%s",
+    "Following apps have been disabled: %s" : "下列应用已经被禁用: %s",
     "Already up to date" : "已经是最新",
-    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">代码完整性检查出现异常，点击查看详细信息...</a>",
+    "<a href=\"{docUrl}\">There were problems with the code integrity check. More information…</a>" : "<a href=\"{docUrl}\">代码完整性检查出现异常, 点击查看详细信息...</a>",
     "Settings" : "设置",
-    "Problem loading page, reloading in 5 seconds" : "加载页面出现问题，在 5 秒内重新载入",
+    "Connection to server lost" : "与服务器的连接断开",
+    "Problem loading page, reloading in 5 seconds" : "加载页面出现问题, 在 5 秒内重新加载",
     "Saving..." : "保存中...",
     "Dismiss" : "忽略",
+    "This action requires you to confirm your password" : "请您确认您的密码",
+    "Authentication required" : "授权请求",
     "Password" : "密码",
     "Cancel" : "取消",
+    "Confirm" : "确认",
+    "Failed to authenticate, try again" : "授权失败, 请重试",
     "seconds ago" : "几秒前",
-    "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." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。",
-    "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?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？",
+    "Logging in …" : "正在登录...",
+    "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." : "密码重置邮件已经发送到您的电子邮箱中. 如果您长时间没能收到邮件, 请检查您邮箱的垃圾/广告文件夹 <br>如果未能收到邮件请联系管理员.",
+    "Your files are encrypted. 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?" : "您的文件已经加密. 当您的密码重置后没有任何方式能恢复您的数据. <br />如果您不确定, 请在继续前联系您的管理员.<br/>您是否真的要继续?",
     "I know what I'm doing" : "我知道我在做什么",
-    "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
+    "Password can not be changed. Please contact your administrator." : "无法修改密码, 请联系管理员.",
     "No" : "否",
     "Yes" : "是",
+    "No files in here" : "未找到文件",
     "Choose" : "选择",
-    "Error loading file picker template: {error}" : "加载文件分拣模板出错: {error}",
+    "Error loading file picker template: {error}" : "加载文件选择模板出错: {error}",
     "Ok" : "确定",
     "Error loading message template: {error}" : "加载消息模板出错: {error}",
     "read-only" : "只读",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} 个文件冲突"],
-    "One file conflict" : "1个文件冲突",
+    "One file conflict" : "1 个文件冲突",
     "New Files" : "新文件",
     "Already existing files" : "已经存在的文件",
-    "Which files do you want to keep?" : "想要保留哪一个文件呢？",
-    "If you select both versions, the copied file will have a number added to its name." : "如果同时选择了两个版本，复制的文件名将会增加上一个数字。",
+    "Which files do you want to keep?" : "请选择需要保留的文件?",
+    "If you select both versions, the copied file will have a number added to its name." : "如果同时选择了两个版本, 副本的文件名中将会追加数字.",
     "Continue" : "继续",
     "(all selected)" : "(选中全部)",
-    "({count} selected)" : "(选择了{count}个)",
+    "({count} selected)" : "(选择了 {count} 个)",
     "Error loading file exists template" : "加载文件存在性模板失败",
+    "Pending" : "等待",
     "Very weak password" : "非常弱的密码",
     "Weak password" : "弱密码",
     "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 set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "您的web服务器未正确设置以解析 \"{url}\"。您可以在我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>中找到更多可用信息。",
-    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "内存缓存未配置。如果可用，请配置 memcache 来增强性能。更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "/dev/urandom 无法被 PHP 读取，出于安全原因，这是强烈不推荐的。请查看<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>了解详情。",
-    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "你的 PHP 版本 ({version}) 不再被 <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\"> PHP </a>支持。我们建议您升级您的PHP版本，以便获得 PHP 性能和安全提升。",
-    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached 配置为分布式缓存，但是已经安装的 PHP 模块是 \"memcache\" 。 \\OC\\Memcache\\Memcached 仅支持 \"memcached\" 而不是 \"memcache\"。点击 <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\"> memcached wiki 了解两个模块的不同</a>.",
-    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "一些文件没有通过完整性检查。如何解决此问题的详细信息可以查看我们的 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">无效文件列表…</a> / <a href=\"{rescanEndpoint}\">重新扫描…</a>)",
-    "Error occurred while checking server setup" : "当检查服务器启动时出错",
-    "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 文件不工作。我们强烈建议你配置你的网页服务器，使数据目录不再可访问，或者将数据目录移动到网页服务器根文档目录之外。",
-    "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 at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP 严格传输安全（Strict-Transport-Security）报头未配置到至少“{seconds}”秒。处于增强安全性考虑，我们推荐按照<a href=\"{docUrl}\" rel=\"noreferrer\">安全提示</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。",
+    "Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken." : "由于 WebDAV 接口似乎被破坏, 因此你的 Web 服务器没有正确地设置允许文件同步。",
+    "Your web server is not set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "您的 Web 服务器未正确设置以解析 \"{url}\". 您可以在我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>中找到更多可用信息.",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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." : "此服务器没有可用的互联网连接: 多个节点无法访问. 这意味着某些功能比如挂载外部存储, 更新通知以及安装第三方应用将无法工作. 远程访问文件和发送通知邮件可能也不工作. 如果您想使用所有的功能, 我们建议启用互联网连接.",
+    "No memory cache has been configured. To enhance your performance please configure a memcache if available. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "内存缓存未配置. 如果可用, 请配置 memcache 以增强性能. 更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" 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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "PHP 无法访问 /dev/urandom, 由于安全原因, 这是强烈不推荐的. 更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>.",
+    "You are currently running PHP {version}. We encourage you to upgrade your PHP version to take advantage of <a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">performance and security updates provided by the PHP Group</a> as soon as your distribution supports it." : "您当前的 PHP 版本 {version}. 我们建议您尽快升级您的 PHP 版本, 以便获得<a target=\"_blank\" rel=\"noreferrer\" href=\"{phpLink}\">来自 PHP 官方的性能和安全</a>的提升.",
+    "The reverse proxy headers configuration is incorrect, or you are accessing Nextcloud from a trusted proxy. If you are not accessing Nextcloud from a trusted proxy, this is a security issue and can allow an attacker to spoof their IP address as visible to Nextcloud. Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "反向代理配置错误, 或者您正在通过可信的代理访问 Nextcloud. 如果您不是通过可信代理访问 Nextcloud, 这将是一个安全问题, 并允许攻击者通过伪装 IP 地址访问 Nextcloud. 更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>.",
+    "Memcached is configured as distributed cache, but the wrong PHP module \"memcache\" is installed. \\OC\\Memcache\\Memcached only supports \"memcached\" and not \"memcache\". See the <a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki about both modules</a>." : "Memcached 当前配置为分布式缓存, 但是当前安装的 PHP 模块是 \"memcache\".  \\OC\\Memcache\\Memcached 仅支持 \"memcached\" 而不是 \"memcache\". 点击<a target=\"_blank\" rel=\"noreferrer\" href=\"{wikiLink}\">memcached wiki</a>了解两者的不同.",
+    "Some files have not passed the integrity check. Further information on how to resolve this issue can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">List of invalid files…</a> / <a href=\"{rescanEndpoint}\">Rescan…</a>)" : "一些文件没有通过完整性检查. 了解如何解决该问题请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>. (<a href=\"{codeIntegrityDownloadEndpoint}\">无效的文件列表…</a> / <a href=\"{rescanEndpoint}\">重新扫描…</a>)",
+    "Error occurred while checking server setup" : "检查服务器设置时出错",
+    "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 服务器根目录之外.",
+    "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 at least \"{seconds}\" seconds. For enhanced security we recommend enabling HSTS as described in our <a href=\"{docUrl}\" rel=\"noreferrer\">security tips</a>." : "HTTP 请求头 \"Strict-Transport-Security\" 没有配置为至少 “{seconds}” 秒. 出于增强安全性考虑, 我们推荐按照<a href=\"{docUrl}\" rel=\"noreferrer\">安全提示</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}分享",
+    "Shared with {recipients}" : "由 {recipients} 分享",
     "Error" : "错误",
     "Error while sharing" : "共享时出错",
     "Error while unsharing" : "取消共享时出错",
     "Error setting expiration date" : "设置过期日期时出错",
-    "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
+    "The public link will expire no later than {days} days after it is created" : "该共享链接将在创建后 {days} 天失效",
     "Set expiration date" : "设置过期日期",
     "Expiration" : "过期",
     "Expiration date" : "过期日期",
     "Choose a password for the public link" : "为共享链接设置密码",
+    "Copied!" : "已经复制!",
+    "Copy" : "复制",
+    "Not supported!" : "无法支持!",
+    "Press ⌘-C to copy." : "按 ⌘ + C 进行复制.",
+    "Press Ctrl-C to copy." : "按  Ctrl + C 进行复制.",
     "Resharing is not allowed" : "不允许二次共享",
     "Share link" : "分享链接",
     "Link" : "链接",
     "Password protect" : "密码保护",
+    "Allow upload and editing" : "允许上传和编辑",
+    "Allow editing" : "允许编辑",
+    "File drop (upload only)" : "文件拖拽 (仅上传)",
     "Email link to person" : "发送链接到个人",
     "Send" : "发送",
-    "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组",
-    "Shared with you by {owner}" : "{owner} 与您共享",
+    "Shared with you and the group {group} by {owner}" : "{owner} 分享给您及 {group} 分组",
+    "Shared with you by {owner}" : "{owner} 分享给您",
+    "{{shareInitiatorDisplayName}} shared via link" : "{{shareInitiatorDisplayName}} 通过链接分享",
     "group" : "群组",
-    "remote" : "远程",
+    "remote" : "外部",
+    "email" : "邮件",
     "Unshare" : "取消共享",
-    "can edit" : "可以修改",
+    "can reshare" : "允许重新分享",
+    "can edit" : "允许修改",
+    "can create" : "允许创建",
+    "can change" : "允许改变",
+    "can delete" : "允许删除",
     "access control" : "访问控制",
     "Could not unshare" : "无法共享",
     "Share details could not be loaded for this item." : "无法加载这个项目的分享详情",
     "No users or groups found for {search}" : "{search} 条件下没有找到用户或用户组",
     "No users found for {search}" : "没有找到 {search} 用户",
-    "An error occurred. Please try again" : "发生错误。请重试。",
-    "{sharee} (group)" : "{sharee} (组)",
-    "{sharee} (remote)" : "{sharee} (远程)",
+    "An error occurred. Please try again" : "发生错误. 请重试.",
+    "{sharee} (group)" : "{sharee} (分组)",
+    "{sharee} (remote)" : "{sharee} (外部)",
+    "{sharee} (email)" : "{sharee} (邮件)",
     "Share" : "分享",
+    "Share with people on other servers using their Federated Cloud ID username@example.com/nextcloud" : "使用联合云ID与其他服务器的用户分享, 如 用户名@example.com/nextcloud",
+    "Share with users or by mail..." : "通过邮件分享...",
+    "Share with users or remote users..." : "分享给其他用户或外部用户...",
+    "Share with users, remote users or by mail..." : "通过邮件分享给其他用户或外部用户...",
+    "Share with users or groups..." : "分享给其他用户或分组...",
+    "Share with users, groups or by mail..." : "通过邮件分享给其他用户或分组...",
+    "Share with users, groups or remote users..." : "分享给其他用户, 分组或外部用户...",
+    "Share with users, groups, remote users or by mail..." : "通过邮件分享给其他用户, 分组或外部用户...",
+    "Share with users..." : "分享给其他用户...",
     "Error removing share" : "移除分享时出错",
     "Non-existing tag #{tag}" : "标签 #{tag} 不存在",
     "restricted" : "受限",
@@ -127,23 +163,30 @@
     "Delete" : "删除",
     "Rename" : "重命名",
     "Collaborative tags" : "协作标签",
-    "The object type is not specified." : "未指定对象类型。",
+    "No tags found" : "标签未找到",
+    "The object type is not specified." : "未指定对象类型.",
     "Enter new" : "输入新...",
     "Add" : "增加",
     "Edit tags" : "编辑标签",
     "Error loading dialog template: {error}" : "加载对话框模板出错: {error}",
-    "No tags selected for deletion." : "请选择要删除的标签。",
+    "No tags selected for deletion." : "没有选择删除的标签",
     "unknown text" : "未知文字",
     "Hello world!" : "Hello world!",
     "sunny" : "晴",
-    "Hello {name}, the weather is {weather}" : "您好 {name}，今天天气是{weather}",
+    "Hello {name}, the weather is {weather}" : "您好 {name}, 今天天气是 {weather}",
     "Hello {name}" : "你好 {name}",
     "new" : "新建",
     "_download %n file_::_download %n files_" : ["下载 %n 个文件"],
-    "An error occurred." : "发生了一个错误",
-    "Please reload the page." : "请重新加载页面。",
-    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "更新不成功。有关此问题的更多信息请<a href=\"{url}\">查看我们的论坛帖子</a>。",
-    "Searching other places" : "搜索其他地方",
+    "The update is in progress, leaving this page might interrupt the process in some environments." : "正在更新, 在某些环境下离开当前页面可能会中断.",
+    "Update to {version}" : "升级到 {version}",
+    "An error occurred." : "发生错误",
+    "Please reload the page." : "请重新加载页面",
+    "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "更新不成功. 有关此问题的更多信息请<a href=\"{url}\">查看我们的论坛帖子</a>。",
+    "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud community</a>." : "升级成功. 请将此问题报告给 <a href=\"https://github.com/nextcloud/server/issues\" target=\"_blank\">Nextcloud 社区</a>.",
+    "Continue to Nextcloud" : "继续访问 Nextcloud",
+    "The update was successful. Redirecting you to Nextcloud now." : "升级成功. 正在重新访问 Nextcloud.",
+    "Searching other places" : "搜索其他位置",
+    "No search results in other folders for '{tag}{filter}{endtag}'" : "在其他文件夹内未找到含有 '{tag}{filter}{endtag}' 的结果",
     "_{count} search result in another folder_::_{count} search results in other folders_" : ["在其他文件夹中找到 {count} 条搜索结果"],
     "Personal" : "个人",
     "Users" : "用户",
@@ -152,88 +195,96 @@
     "Help" : "帮助",
     "Access forbidden" : "访问禁止",
     "File not found" : "文件未找到",
-    "The specified document has not been found on the server." : "在服务器上没找到指定的文件。",
-    "You can click here to return to %s." : "你可以点击这里返回 %s。",
+    "The specified document has not been found on the server." : "在服务器上没找到指定的文件.",
+    "You can click here to return to %s." : "你可以点击这里返回 %s.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "嗨、你好,\n\n只想让你知道 %s 分享了 %s 给你。\n现在查看: %s\n",
-    "The share will expire on %s." : "此分享将在 %s 过期。",
+    "The share will expire on %s." : "此分享将在 %s 过期.",
     "Cheers!" : "干杯！",
     "Internal Server Error" : "内部服务器错误",
-    "The server encountered an internal error and was unable to complete your request." : "服务器发送一个内部错误并且无法完成你的请求。",
-    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "请联系服务器管理员，如果多次出现这个错误，请把下面的技术细节包含在您的报告里。",
-    "More details can be found in the server log." : "更多细节能在服务器日志中找到。",
+    "The server encountered an internal error and was unable to complete your request." : "服务器发生一个内部错误并且无法完成你的请求.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "如果多次出现这个错误, 请联系服务器管理员, 请把下面的技术细节包含在您的报告中.",
+    "More details can be found in the server log." : "更多细节可以在服务器日志中找到.",
     "Technical details" : "技术细节",
-    "Remote Address: %s" : "远程地址： %s",
+    "Remote Address: %s" : "远程地址: %s",
     "Request ID: %s" : "请求 ID: %s",
-    "Type: %s" : "类型：%s",
+    "Type: %s" : "类型: %s",
     "Code: %s" : "代码: %s",
     "Message: %s" : "消息: %s",
     "File: %s" : "文件: %s",
     "Line: %s" : "行: %s",
     "Trace" : "追踪",
     "Security warning" : "安全警告",
-    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
-    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "关于如何正确配置服务器，请参见 <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">此文档</a>.。",
-    "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "因为 .htaccess 文件没有工作, 您的数据目录和文件可从互联网被访问. ",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">documentation</a>." : "了解如何正确配置服务器, 请参见 <a href=\"%s\" target=\"_blank\" rel=\"noreferrer\">文档</a>.",
+    "Create an <strong>admin account</strong>" : "创建 <strong>管理员账号</strong>",
     "Username" : "用户名",
     "Storage & database" : "存储 & 数据库",
     "Data folder" : "数据目录",
     "Configure the database" : "配置数据库",
     "Only %s is available." : "仅 %s 可用。",
-    "Install and activate additional PHP modules to choose other database types." : "安装或激活额外的 PHP 模块以选择其他数据库类型。",
-    "For more details check out the documentation." : "请查阅文档获得详细信息。",
+    "Install and activate additional PHP modules to choose other database types." : "安装并激活额外的 PHP 模块以选择其他数据库类型.",
+    "For more details check out the documentation." : "请查阅文档获得详细信息.",
     "Database user" : "数据库用户",
     "Database password" : "数据库密码",
     "Database name" : "数据库名",
     "Database tablespace" : "数据库表空间",
     "Database host" : "数据库主机",
+    "Please specify the port number along with the host name (e.g., localhost:5432)." : "请填写主机名称和端口号 (示例, localhost:5432).",
     "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 。",
+    "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.",
     "Finish setup" : "安装完成",
-    "Finishing …" : "正在结束 ...",
-    "Need help?" : "需要帮助？",
+    "Finishing …" : "正在完成...",
+    "Need help?" : "需要帮助?",
     "See the documentation" : "查看文档",
-    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "对于正确的操作，该应用要求 JavaScript 。请 {linkstart} 打开 JavaScript {linkend} ，然后重新载入页面。",
-    "Log out" : "注销",
+    "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "对于正确的操作, 该应用需要使用 JavaScript. 请 {linkstart}启用 JavaScript{linkend}, 并重新加载页面.",
     "Search" : "搜索",
-    "Server side authentication failed!" : "服务端验证失败！",
-    "Please contact your administrator." : "请联系你的管理员。",
-    "An internal error occurred." : "发生了内部错误。",
-    "Please try again or contact your administrator." : "请重试或联系管理员。",
+    "Log out" : "注销",
+    "This action requires you to confirm your password:" : "此操作需要确认您的密码:",
+    "Confirm your password" : "确认您的密码",
+    "Server side authentication failed!" : "服务端认证失败!",
+    "Please contact your administrator." : "请联系您的管理员.",
+    "An internal error occurred." : "发生了内部错误.",
+    "Please try again or contact your administrator." : "请重试或联系您的管理员.",
     "Username or email" : "用户名或邮箱",
-    "Wrong password. Reset it?" : "密码错误。要重置么？",
+    "Wrong password. Reset it?" : "密码错误. 是否要重置?",
     "Wrong password." : "密码错误",
     "Log in" : "登录",
     "Stay logged in" : "保持登录",
     "Alternative Logins" : "其他登录方式",
-    "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}",
+    "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码: {link}",
     "New password" : "新密码",
     "New Password" : "新密码",
     "Reset password" : "重置密码",
     "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 Nextcloud instance is currently in single user mode." : "当前Nextcloud实例运行在单用户模式下。",
-    "This means only administrators can use the instance." : "这意味着只有管理员才能在实例上操作。",
-    "Contact your system administrator if this message persists or appeared unexpectedly." : "如果这个消息一直存在或不停出现，请联系你的系统管理员。",
-    "Thank you for your patience." : "感谢让你久等了。",
-    "You are accessing the server from an untrusted domain." : "您正在访问来自不信任域名的服务器。",
-    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" 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\"为信任域",
+    "This Nextcloud instance is currently in single user mode." : "当前 Nextcloud 实例运行在单用户模式下.",
+    "This means only administrators can use the instance." : "这意味着只有管理员才能在实例上操作.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "如果这个消息一直存在或不停出现, 请联系你的系统管理员.",
+    "Thank you for your patience." : "感谢您久等了.",
+    "Two-factor authentication" : "双重认证",
+    "Enhanced security is enabled for your account. Please authenticate using a second factor." : "您的帐户已启用增强安全性, 请使用第二因子验证.",
+    "Cancel log in" : "取消登录",
+    "Use backup code" : "使用备用口令",
+    "Error while validating your second factor" : "验证您的第二项时出错",
+    "You are accessing the server from an untrusted domain." : "您正在访问来自不信任域名的服务器.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domains\" 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\" 为信任域名",
     "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." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
+    "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" : "开始更新",
-    "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:" : "为避免较大安装时的超时, 您可以在安装目录下执行下述的命令:",
     "Detailed logs" : "详细日志",
     "Update needed" : "需要更新",
-    "Please use the command line updater because you have a big instance." : "请使用命令行更新。",
-    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "获取更多帮助，请查看  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">文档</a>.",
-    "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 再次可用时这个页面将刷新。",
+    "Please use the command line updater because you have a big instance." : "由于您的实例较大, 请使用命令行更新.",
+    "For help, see the  <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">documentation</a>." : "获取更多帮助, 请查看 <a target=\"_blank\" rel=\"noreferrer\" href=\"%s\">文档</a>.",
+    "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 再次可用时此页面将刷新.",
     "Error loading tags" : "加载标签出错",
     "Tag already exists" : "标签已存在",
     "Error deleting tag(s)" : "删除标签时出错",
@@ -249,20 +300,20 @@
     "Thursday" : "星期四",
     "Friday" : "星期五",
     "Saturday" : "星期六",
-    "Sun." : "日",
+    "Sun." : "周日",
     "Mon." : "周一",
     "Tue." : "周二",
     "Wed." : "周三",
     "Thu." : "周四",
     "Fri." : "周五",
     "Sat." : "周六",
-    "Su" : "Su",
-    "Mo" : "Mo",
-    "Tu" : "Tu",
-    "We" : "We",
-    "Th" : "Th",
-    "Fr" : "Fr",
-    "Sa" : "Sa",
+    "Su" : "日",
+    "Mo" : "一",
+    "Tu" : "二",
+    "We" : "三",
+    "Th" : "四",
+    "Fr" : "五",
+    "Sa" : "六",
     "January" : "一月",
     "February" : "二月",
     "March" : "三月",
@@ -287,8 +338,10 @@
     "Oct." : "十月",
     "Nov." : "十一月",
     "Dec." : "十二月",
-    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "反向代理头配置不正确，或者您正从一个受信任的代理访问ownCloud。如果你不是通过受信任的代理访问 ownCloud，这将引发一个安全问题，可能由于 ownCloud IP 地址可见导致欺骗攻击。更多信息可以查看我们的 <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>。",
-    "Allow editing" : "允许编辑",
+    "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?" : "您的文件已经加密. 如果您没有启用恢复密钥, 当您的密码重置后没有任何方式能恢复您的数据. <br />如果您不确定, 请在继续前联系您的管理员.<br/>您是否真的要继续?",
+    "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." : "此服务器没有可用的互联网连接. 这意味着某些功能比如挂载外部存储, 更新通知以及安装第三方应用将无法工作. 远程访问文件和发送通知邮件可能也不工作. 如果您想使用所有的功能, 我们建议启用互联网连接.",
+    "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 target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "反向代理配置错误, 或者您正在通过可信的代理访问 ownCloud. 如果您不是通过可信代理访问 ownCloud, 这将是一个安全问题, 并允许攻击者通过伪装 IP 地址访问 ownCloud. 更多信息请查看我们的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">文档</a>.",
+    "Hide file listing" : "隐藏列出的文件",
     "Sending ..." : "正在发送...",
     "Email sent" : "邮件已发送",
     "Send link via email" : "通过邮件发送链接",
@@ -298,18 +351,20 @@
     "change" : "更改",
     "delete" : "删除",
     "{sharee} (at {server})" : "{sharee} (位于 {server})",
-    "Share with users…" : "与用户分享...",
-    "Share with users, groups or remote users…" : "与用户，组或远程用户分享...",
-    "Share with users or groups…" : "与用户或组分享...",
-    "Share with users or remote users…" : "与用户或远程用户分享...",
+    "Share with users…" : "分享给其他用户...",
+    "Share with users, groups or remote users…" : "分享给其他用户, 分组或外部用户...",
+    "Share with users or groups…" : "分享给其他用户或分组...",
+    "Share with users or remote users…" : "分享给其他用户或外部用户...",
     "Warning" : "警告",
     "Error while sending notification" : "发送通知时出现错误",
-    "No search results in other folders" : "在其他文件夹中没有得到任何搜索结果",
+    "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "正在升级, 在某些环境下离开当前页面可能会中断.",
+    "Updating to {version}" : "升级到 {version}",
+    "The update was successful. There were warnings." : "更新成功. 更新过程中出现一些警告.",
+    "No search results in other folders" : "在其他文件夹内未找到任何结果",
     "Two-step verification" : "两步验证",
-    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "您的帐户已启用增强安全性，请使用第二因子验证。",
+    "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "您的帐户已启用增强安全性, 请使用第二因子验证.",
     "Cancel login" : "取消登录",
-    "Please authenticate using the selected factor." : "请使用所选择的因素验证。",
-    "An error occured while verifying the token" : "在验证令牌时出错",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "使用语法 username@example.com/owncloud 分享给其他 ownCloud 上的用户"
+    "Please authenticate using the selected factor." : "请使用所选择的方式验证.",
+    "An error occured while verifying the token" : "验证令牌时出错"
 },"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 ba1d0f6b3cd..81b2e43f908 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -49,15 +49,20 @@ OC.L10N.register(
     "Problem loading page, reloading in 5 seconds" : "載入頁面出錯，5 秒後重新整理",
     "Saving..." : "儲存中...",
     "Dismiss" : "知道了",
+    "Authentication required" : "需要認證",
     "Password" : "密碼",
     "Cancel" : "取消",
+    "Confirm" : "確認",
+    "Failed to authenticate, try again" : "認證失敗，再試一次。",
     "seconds ago" : "幾秒前",
+    "Logging in …" : "載入中......",
     "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." : "重設密碼的連結已經 email 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。",
-    "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?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
+    "Your files are encrypted. 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?" : "您的檔案是加密的，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
     "I know what I'm doing" : "我知道我在幹嘛",
     "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員",
     "No" : "否",
     "Yes" : "是",
+    "No files in here" : "沒有任何檔案",
     "Choose" : "選擇",
     "Error loading file picker template: {error}" : "載入檔案選擇器樣板出錯： {error}",
     "Ok" : "好",
@@ -73,6 +78,7 @@ OC.L10N.register(
     "(all selected)" : "（已全選）",
     "({count} selected)" : "（已選 {count} 項）",
     "Error loading file exists template" : "載入檔案存在樣板出錯",
+    "Pending" : "等候中",
     "Very weak password" : "密碼強度非常弱",
     "Weak password" : "密碼強度弱",
     "So-so password" : "密碼強度普通",
@@ -80,6 +86,7 @@ OC.L10N.register(
     "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 set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "您的網頁伺服器並未正確設定來解析 \"{url}\" ，請查看我們的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">說明文件</a>以瞭解更多",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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" : "檢查伺服器設定時發生錯誤",
     "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 檔案並未生效，我們強烈建議您設定您的網頁伺服器，拒絕資料目錄的公開存取，或者將您的資料目錄移出網頁伺服器根目錄。",
     "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}\"不一樣，這是一個潛在安全性或者隱私上的風險，因此我們建議您調整此設定",
@@ -104,6 +111,7 @@ OC.L10N.register(
     "Link" : "連結",
     "Password protect" : "密碼保護",
     "Allow upload and editing" : "允許上傳及編輯",
+    "Allow editing" : "允許編輯",
     "Email link to person" : "將連結 email 給別人",
     "Send" : "寄出",
     "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
@@ -202,8 +210,8 @@ OC.L10N.register(
     "Need help?" : "需要幫助？",
     "See the documentation" : "閱讀說明文件",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "這個應用程式需要啟用 Javascript 才能正常運作，請{linkstart}啟用Javascript{linkend}然後重新整理頁面。",
-    "Log out" : "登出",
     "Search" : "搜尋",
+    "Log out" : "登出",
     "Server side authentication failed!" : "伺服器端認證失敗！",
     "Please contact your administrator." : "請聯絡系統管理員",
     "An internal error occurred." : "發生內部錯誤",
@@ -297,7 +305,7 @@ OC.L10N.register(
     "Oct." : "十月",
     "Nov." : "十一月",
     "Dec." : "十二月",
-    "Allow editing" : "允許編輯",
+    "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?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
     "Hide file listing" : "隱藏檔案列表",
     "Sending ..." : "正在傳送…",
     "Email sent" : "Email 已寄出",
@@ -322,11 +330,6 @@ OC.L10N.register(
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "您的帳號已啟用進階安全機制，請使用第二階段來認證",
     "Cancel login" : "取消登入",
     "Please authenticate using the selected factor." : "請以選擇的二階段方式認證",
-    "An error occured while verifying the token" : "驗證 token 時發生錯誤",
-    "An error occured. Please try again" : "發生錯誤，請重試",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "與其他在ownCloud上的人們分享，請使用此格式 username@example.com/owncloud",
-    "not assignable" : "不可指定",
-    "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 至版本 {version} ，需要一些時間",
-    "An internal error occured." : "發生內部錯誤"
+    "An error occured while verifying the token" : "驗證 token 時發生錯誤"
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index d47d9f63e3a..8dd18be415a 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -47,15 +47,20 @@
     "Problem loading page, reloading in 5 seconds" : "載入頁面出錯，5 秒後重新整理",
     "Saving..." : "儲存中...",
     "Dismiss" : "知道了",
+    "Authentication required" : "需要認證",
     "Password" : "密碼",
     "Cancel" : "取消",
+    "Confirm" : "確認",
+    "Failed to authenticate, try again" : "認證失敗，再試一次。",
     "seconds ago" : "幾秒前",
+    "Logging in …" : "載入中......",
     "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." : "重設密碼的連結已經 email 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。",
-    "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?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
+    "Your files are encrypted. 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?" : "您的檔案是加密的，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
     "I know what I'm doing" : "我知道我在幹嘛",
     "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員",
     "No" : "否",
     "Yes" : "是",
+    "No files in here" : "沒有任何檔案",
     "Choose" : "選擇",
     "Error loading file picker template: {error}" : "載入檔案選擇器樣板出錯： {error}",
     "Ok" : "好",
@@ -71,6 +76,7 @@
     "(all selected)" : "（已全選）",
     "({count} selected)" : "（已選 {count} 項）",
     "Error loading file exists template" : "載入檔案存在樣板出錯",
+    "Pending" : "等候中",
     "Very weak password" : "密碼強度非常弱",
     "Weak password" : "密碼強度弱",
     "So-so password" : "密碼強度普通",
@@ -78,6 +84,7 @@
     "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 set up properly to resolve \"{url}\". Further information can be found in our <a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">documentation</a>." : "您的網頁伺服器並未正確設定來解析 \"{url}\" ，請查看我們的<a target=\"_blank\" rel=\"noreferrer\" href=\"{docLink}\">說明文件</a>以瞭解更多",
+    "This server has no working Internet connection: Multiple endpoints could not be reached. 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" : "檢查伺服器設定時發生錯誤",
     "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 檔案並未生效，我們強烈建議您設定您的網頁伺服器，拒絕資料目錄的公開存取，或者將您的資料目錄移出網頁伺服器根目錄。",
     "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}\"不一樣，這是一個潛在安全性或者隱私上的風險，因此我們建議您調整此設定",
@@ -102,6 +109,7 @@
     "Link" : "連結",
     "Password protect" : "密碼保護",
     "Allow upload and editing" : "允許上傳及編輯",
+    "Allow editing" : "允許編輯",
     "Email link to person" : "將連結 email 給別人",
     "Send" : "寄出",
     "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
@@ -200,8 +208,8 @@
     "Need help?" : "需要幫助？",
     "See the documentation" : "閱讀說明文件",
     "This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page." : "這個應用程式需要啟用 Javascript 才能正常運作，請{linkstart}啟用Javascript{linkend}然後重新整理頁面。",
-    "Log out" : "登出",
     "Search" : "搜尋",
+    "Log out" : "登出",
     "Server side authentication failed!" : "伺服器端認證失敗！",
     "Please contact your administrator." : "請聯絡系統管理員",
     "An internal error occurred." : "發生內部錯誤",
@@ -295,7 +303,7 @@
     "Oct." : "十月",
     "Nov." : "十一月",
     "Dec." : "十二月",
-    "Allow editing" : "允許編輯",
+    "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?" : "您的檔案是加密的，如果您沒有啟用救援金鑰，當您重設密碼之後將無法存取您的資料。<br/>如果不確定該怎麼做，請聯絡您的系統管理員。<br/>您確定要繼續嗎？",
     "Hide file listing" : "隱藏檔案列表",
     "Sending ..." : "正在傳送…",
     "Email sent" : "Email 已寄出",
@@ -320,11 +328,6 @@
     "Enhanced security has been enabled for your account. Please authenticate using a second factor." : "您的帳號已啟用進階安全機制，請使用第二階段來認證",
     "Cancel login" : "取消登入",
     "Please authenticate using the selected factor." : "請以選擇的二階段方式認證",
-    "An error occured while verifying the token" : "驗證 token 時發生錯誤",
-    "An error occured. Please try again" : "發生錯誤，請重試",
-    "Share with people on other ownClouds using the syntax username@example.com/owncloud" : "與其他在ownCloud上的人們分享，請使用此格式 username@example.com/owncloud",
-    "not assignable" : "不可指定",
-    "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 至版本 {version} ，需要一些時間",
-    "An internal error occured." : "發生內部錯誤"
+    "An error occured while verifying the token" : "驗證 token 時發生錯誤"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/routes.php b/core/routes.php
index 2b8080a3b7b..5d61d58e037 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -55,10 +55,10 @@ $application->registerRoutes($this, [
 		['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
 		['name' => 'Preview#getPreview', 'url' => '/core/preview', 'verb' => 'GET'],
 		['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
+		['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],
 	],
 	'ocs' => [
 		['root' => '/cloud', 'name' => 'OCS#getCapabilities', 'url' => '/capabilities', 'verb' => 'GET'],
-		['root' => '/cloud', 'name' => 'OCS#getCurrentUser', 'url' => '/user', 'verb' => 'GET'],
 		['root' => '', 'name' => 'OCS#getConfig', 'url' => '/config', 'verb' => 'GET'],
 		['root' => '/person', 'name' => 'OCS#personCheck', 'url' => '/check', 'verb' => 'POST'],
 		['root' => '/identityproof', 'name' => 'OCS#getIdentityProof', 'url' => '/key/{cloudId}', 'verb' => 'GET'],
diff --git a/core/search/js/search.js b/core/search/js/search.js
index 4dd29ef917f..44a69842374 100644
--- a/core/search/js/search.js
+++ b/core/search/js/search.js
@@ -405,6 +405,10 @@ $(document).ready(function() {
 			OC.Search = new OCA.Search($('#searchbox'), $('#searchresults'));
 		});
 	}
+	$('#searchbox + .icon-close-white').click(function() {
+		OC.Search.clear();
+		$('#searchbox').focus();
+	});
 });
 
 /**
diff --git a/core/templates/installation.php b/core/templates/installation.php
index d3f5021821d..2f645454128 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -142,6 +142,9 @@ script('core', [
 					value="<?php p($_['dbhost']); ?>"
 					autocomplete="off" autocapitalize="off" autocorrect="off">
 			</p>
+			<p class="info">
+				<?php p($l->t( 'Please specify the port number along with the host name (e.g., localhost:5432).' )); ?>
+			</p>
 		</div>
 		</fieldset>
 		<?php endif; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2db333c1977..4842a94897d 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -42,67 +42,71 @@
 		<div id="notification"></div>
 	</div>
 	<header role="banner"><div id="header">
-			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
-				id="nextcloud" tabindex="1">
-				<div class="logo-icon">
-					<h1 class="hidden-visually">
-						<?php p($theme->getName()); ?>
-					</h1>
-				</div>
-			</a>
+			<div id="header-left">
+				<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
+					id="nextcloud" tabindex="1">
+					<div class="logo-icon">
+						<h1 class="hidden-visually">
+							<?php p($theme->getName()); ?>
+						</h1>
+					</div>
+				</a>
 
-			<a href="#" class="header-appname-container menutoggle" tabindex="2">
-				<h1 class="header-appname">
-					<?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
-				</h1>
-				<div class="icon-caret"></div>
-			</a>
+				<a href="#" class="header-appname-container menutoggle" tabindex="2">
+					<h1 class="header-appname">
+						<?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
+					</h1>
+					<div class="icon-caret"></div>
+				</a>
+			</div>
 
 			<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
-			<div id="settings">
-				<div id="expand" tabindex="6" role="link" class="menutoggle">
-					<?php if ($_['enableAvatars']): ?>
-					<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
-						<?php if ($_['userAvatarSet']): ?>
-							<img alt="" width="32" height="32"
-							src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
-							srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']]));?> 4x"
-							>
+			<div id="header-right">
+				<form class="searchbox" action="#" method="post" role="search" novalidate>
+					<label for="searchbox" class="hidden-visually">
+						<?php p($l->t('Search'));?>
+					</label>
+					<input id="searchbox" type="search" name="query"
+						value="" required
+						autocomplete="off" tabindex="5">
+					<button class="icon-close-white" type="reset"></button>
+				</form>
+				<div id="settings">
+					<div id="expand" tabindex="6" role="link" class="menutoggle">
+						<?php if ($_['enableAvatars']): ?>
+						<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
+							<?php if ($_['userAvatarSet']): ?>
+								<img alt="" width="32" height="32"
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
+								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']]));?> 4x"
+								>
+							<?php endif; ?>
+						</div>
 						<?php endif; ?>
+						<span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
+						<div class="icon-caret"></div>
+					</div>
+					<div id="expanddiv">
+					<ul>
+					<?php foreach($_['settingsnavigation'] as $entry):?>
+						<li>
+							<a href="<?php print_unescaped($entry['href']); ?>"
+								<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
+								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
+								<?php p($entry['name']) ?>
+							</a>
+						</li>
+					<?php endforeach; ?>
+						<li>
+							<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
+								<img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg') . '?v=' . $_['versionHash']); ?>">
+								<?php p($l->t('Log out'));?>
+							</a>
+						</li>
+					</ul>
 					</div>
-					<?php endif; ?>
-					<span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
-					<div class="icon-caret"></div>
-				</div>
-				<div id="expanddiv">
-				<ul>
-				<?php foreach($_['settingsnavigation'] as $entry):?>
-					<li>
-						<a href="<?php print_unescaped($entry['href']); ?>"
-							<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
-							<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
-							<?php p($entry['name']) ?>
-						</a>
-					</li>
-				<?php endforeach; ?>
-					<li>
-						<a id="logout" <?php print_unescaped(OC_User::getLogoutAttribute()); ?>>
-							<img alt="" src="<?php print_unescaped(image_path('', 'actions/logout.svg') . '?v=' . $_['versionHash']); ?>">
-							<?php p($l->t('Log out'));?>
-						</a>
-					</li>
-				</ul>
 				</div>
 			</div>
-
-			<form class="searchbox" action="#" method="post" role="search" novalidate>
-				<label for="searchbox" class="hidden-visually">
-					<?php p($l->t('Search'));?>
-				</label>
-				<input id="searchbox" type="search" name="query"
-					value="" required
-					autocomplete="off" tabindex="5">
-			</form>
 		</div></header>
 
 		<nav role="navigation"><div id="navigation">
@@ -147,12 +151,12 @@
 		</div></nav>
 
 		<div id="sudo-login-background" class="hidden"></div>
-		<div id="sudo-login-form" class="hidden">
+		<form id="sudo-login-form" class="hidden">
 			<?php p($l->t('This action requires you to confirm your password:')); ?><br>
-			<input type="password" class="question" autocomplete="off" name="question" value=" <?php /* Hack against firefox ignoring autocomplete="off" */ ?>"
+			<input type="password" class="question" autocomplete="new-password" name="question" value=" <?php /* Hack against browsers ignoring autocomplete="off" */ ?>"
 				placeholder="<?php p($l->t('Confirm your password')); ?>" />
 			<input class="confirm icon-confirm" title="<?php p($l->t('Confirm')); ?>" value="" type="submit">
-		</div>
+		</form>
 
 		<div id="content-wrapper">
 			<div id="content" class="app-<?php p($_['appid']) ?>" role="main">
diff --git a/core/templates/login.php b/core/templates/login.php
index c200dfe366b..221242c0dcb 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -68,7 +68,6 @@ script('core', [
 		<input type="submit" id="submit" class="login primary icon-confirm-white" title="" value="<?php p($l->t('Log in')); ?>" disabled="disabled" />
 
 		<div class="login-additional">
-			<?php if ($_['rememberLoginAllowed'] === true) : ?>
 			<div class="remember-login-container">
 				<?php if ($_['rememberLoginState'] === 0) { ?>
 				<input type="checkbox" name="remember_login" value="1" id="remember_login" class="checkbox checkbox--white">
@@ -77,7 +76,6 @@ script('core', [
 				<?php } ?>
 				<label for="remember_login"><?php p($l->t('Stay logged in')); ?></label>
 			</div>
-			<?php endif; ?>
 		</div>
 
 		<input type="hidden" name="timezone_offset" id="timezone_offset"/>
diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php
index 20b92be9520..4f3741b5dfe 100644
--- a/core/templates/twofactorshowchallenge.php
+++ b/core/templates/twofactorshowchallenge.php
@@ -3,6 +3,8 @@
 /** @var $_ array */
 /* @var $error boolean */
 $error = $_['error'];
+/* @var $error_message string */
+$error_message = $_['error_message'];
 /* @var $provider OCP\Authentication\TwoFactorAuth\IProvider */
 $provider = $_['provider'];
 /* @var $template string */
@@ -12,7 +14,11 @@ $template = $_['template'];
 <div class="warning">
 		<h2 class="two-factor-header"><?php p($provider->getDisplayName()); ?></h2>
 		<?php if ($error): ?>
-		<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
+			<?php if($error_message): ?>
+				<p><strong><?php p($error_message); ?></strong></p>
+			<?php else: ?>
+				<p><strong><?php p($l->t('Error while validating your second factor')); ?></strong></p>
+			<?php endif; ?>
 		<?php endif; ?>
 		<?php print_unescaped($template); ?>
 </div>
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index fe078fdd291..19bd084f76e 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -1,12 +1,14 @@
 test/
 src/
 bower.json
+component.json
 .jshintrc
 .travis.yml
 CHANGELOG*
 Gemfile
 gruntfile.js
 Gruntfile.js
+Gulpfile.js
 Makefile
 package.json
 README*
@@ -156,3 +158,17 @@ autosize/**
 !autosize/dist/autosize.js
 !autosize/.bower.json
 !autosize/LICENCE.md
+
+#marked
+marked/bin
+marked/doc
+marked/index.js
+marked/lib
+marked/man
+
+# DOMPurity
+DOMPurify/**
+!DOMPurify/dist
+!DOMPurify/dist/purify.min.js
+!DOMPurify/.bower.json
+!DOMPurify/LICENSE
\ No newline at end of file
diff --git a/core/vendor/DOMPurify/.bower.json b/core/vendor/DOMPurify/.bower.json
new file mode 100644
index 00000000000..45f4fa47258
--- /dev/null
+++ b/core/vendor/DOMPurify/.bower.json
@@ -0,0 +1,42 @@
+{
+  "name": "DOMPurify",
+  "version": "0.8.4",
+  "homepage": "https://github.com/cure53/DOMPurify",
+  "author": "Cure53 <info@cure53.de>",
+  "description": "A DOM-only, super-fast, uber-tolerant XSS sanitizer for HTML, MathML and SVG",
+  "main": "src/purify.js",
+  "keywords": [
+    "dom",
+    "xss",
+    "cross site scripting",
+    "html",
+    "svg",
+    "mathml",
+    "sanitizer",
+    "filter",
+    "sanitize",
+    "security",
+    "secure"
+  ],
+  "license": [
+    "MPL-2.0",
+    "Apache-2.0"
+  ],
+  "ignore": [
+    "**/.*",
+    "demos",
+    "scripts",
+    "test",
+    "website"
+  ],
+  "_release": "0.8.4",
+  "_resolution": {
+    "type": "version",
+    "tag": "0.8.4",
+    "commit": "9be8f9def3124ccf2db71b7711027b55f9b90f48"
+  },
+  "_source": "https://github.com/cure53/DOMPurify.git",
+  "_target": "^0.8.4",
+  "_originalSource": "DOMPurify",
+  "_direct": true
+}
\ No newline at end of file
diff --git a/core/vendor/DOMPurify/LICENSE b/core/vendor/DOMPurify/LICENSE
new file mode 100644
index 00000000000..e099aad0f09
--- /dev/null
+++ b/core/vendor/DOMPurify/LICENSE
@@ -0,0 +1,378 @@
+DOMPurify
+Copyright 2015 Mario Heiderich
+
+DOMPurify is free software; you can redistribute it and/or modify it under the
+terms of either:
+
+a) the Apache License Version 2.0, or
+b) the Mozilla Public License Version 2.0
+
+-----------------------------------------------------------------------------
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-----------------------------------------------------------------------------
+Mozilla Public License, version 2.0
+
+1. Definitions
+
+1.1. “Contributor”
+
+     means each individual or legal entity that creates, contributes to the
+     creation of, or owns Covered Software.
+
+1.2. “Contributor Version”
+
+     means the combination of the Contributions of others (if any) used by a
+     Contributor and that particular Contributor’s Contribution.
+
+1.3. “Contribution”
+
+     means Covered Software of a particular Contributor.
+
+1.4. “Covered Software”
+
+     means Source Code Form to which the initial Contributor has attached the
+     notice in Exhibit A, the Executable Form of such Source Code Form, and
+     Modifications of such Source Code Form, in each case including portions
+     thereof.
+
+1.5. “Incompatible With Secondary Licenses”
+     means
+
+     a. that the initial Contributor has attached the notice described in
+        Exhibit B to the Covered Software; or
+
+     b. that the Covered Software was made available under the terms of version
+        1.1 or earlier of the License, but not also under the terms of a
+        Secondary License.
+
+1.6. “Executable Form”
+
+     means any form of the work other than Source Code Form.
+
+1.7. “Larger Work”
+
+     means a work that combines Covered Software with other material, in a separate
+     file or files, that is not Covered Software.
+
+1.8. “License”
+
+     means this document.
+
+1.9. “Licensable”
+
+     means having the right to grant, to the maximum extent possible, whether at the
+     time of the initial grant or subsequently, any and all of the rights conveyed by
+     this License.
+
+1.10. “Modifications”
+
+     means any of the following:
+
+     a. any file in Source Code Form that results from an addition to, deletion
+        from, or modification of the contents of Covered Software; or
+
+     b. any new file in Source Code Form that contains any Covered Software.
+
+1.11. “Patent Claims” of a Contributor
+
+      means any patent claim(s), including without limitation, method, process,
+      and apparatus claims, in any patent Licensable by such Contributor that
+      would be infringed, but for the grant of the License, by the making,
+      using, selling, offering for sale, having made, import, or transfer of
+      either its Contributions or its Contributor Version.
+
+1.12. “Secondary License”
+
+      means either the GNU General Public License, Version 2.0, the GNU Lesser
+      General Public License, Version 2.1, the GNU Affero General Public
+      License, Version 3.0, or any later versions of those licenses.
+
+1.13. “Source Code Form”
+
+      means the form of the work preferred for making modifications.
+
+1.14. “You” (or “Your”)
+
+      means an individual or a legal entity exercising rights under this
+      License. For legal entities, “You” includes any entity that controls, is
+      controlled by, or is under common control with You. For purposes of this
+      definition, “control” means (a) the power, direct or indirect, to cause
+      the direction or management of such entity, whether by contract or
+      otherwise, or (b) ownership of more than fifty percent (50%) of the
+      outstanding shares or beneficial ownership of such entity.
+
+
+2. License Grants and Conditions
+
+2.1. Grants
+
+     Each Contributor hereby grants You a world-wide, royalty-free,
+     non-exclusive license:
+
+     a. under intellectual property rights (other than patent or trademark)
+        Licensable by such Contributor to use, reproduce, make available,
+        modify, display, perform, distribute, and otherwise exploit its
+        Contributions, either on an unmodified basis, with Modifications, or as
+        part of a Larger Work; and
+
+     b. under Patent Claims of such Contributor to make, use, sell, offer for
+        sale, have made, import, and otherwise transfer either its Contributions
+        or its Contributor Version.
+
+2.2. Effective Date
+
+     The licenses granted in Section 2.1 with respect to any Contribution become
+     effective for each Contribution on the date the Contributor first distributes
+     such Contribution.
+
+2.3. Limitations on Grant Scope
+
+     The licenses granted in this Section 2 are the only rights granted under this
+     License. No additional rights or licenses will be implied from the distribution
+     or licensing of Covered Software under this License. Notwithstanding Section
+     2.1(b) above, no patent license is granted by a Contributor:
+
+     a. for any code that a Contributor has removed from Covered Software; or
+
+     b. for infringements caused by: (i) Your and any other third party’s
+        modifications of Covered Software, or (ii) the combination of its
+        Contributions with other software (except as part of its Contributor
+        Version); or
+
+     c. under Patent Claims infringed by Covered Software in the absence of its
+        Contributions.
+
+     This License does not grant any rights in the trademarks, service marks, or
+     logos of any Contributor (except as may be necessary to comply with the
+     notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+     No Contributor makes additional grants as a result of Your choice to
+     distribute the Covered Software under a subsequent version of this License
+     (see Section 10.2) or under the terms of a Secondary License (if permitted
+     under the terms of Section 3.3).
+
+2.5. Representation
+
+     Each Contributor represents that the Contributor believes its Contributions
+     are its original creation(s) or it has sufficient rights to grant the
+     rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+     This License is not intended to limit any rights You have under applicable
+     copyright doctrines of fair use, fair dealing, or other equivalents.
+
+2.7. Conditions
+
+     Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
+     Section 2.1.
+
+
+3. Responsibilities
+
+3.1. Distribution of Source Form
+
+     All distribution of Covered Software in Source Code Form, including any
+     Modifications that You create or to which You contribute, must be under the
+     terms of this License. You must inform recipients that the Source Code Form
+     of the Covered Software is governed by the terms of this License, and how
+     they can obtain a copy of this License. You may not attempt to alter or
+     restrict the recipients’ rights in the Source Code Form.
+
+3.2. Distribution of Executable Form
+
+     If You distribute Covered Software in Executable Form then:
+
+     a. such Covered Software must also be made available in Source Code Form,
+        as described in Section 3.1, and You must inform recipients of the
+        Executable Form how they can obtain a copy of such Source Code Form by
+        reasonable means in a timely manner, at a charge no more than the cost
+        of distribution to the recipient; and
+
+     b. You may distribute such Executable Form under the terms of this License,
+        or sublicense it under different terms, provided that the license for
+        the Executable Form does not attempt to limit or alter the recipients’
+        rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+     You may create and distribute a Larger Work under terms of Your choice,
+     provided that You also comply with the requirements of this License for the
+     Covered Software. If the Larger Work is a combination of Covered Software
+     with a work governed by one or more Secondary Licenses, and the Covered
+     Software is not Incompatible With Secondary Licenses, this License permits
+     You to additionally distribute such Covered Software under the terms of
+     such Secondary License(s), so that the recipient of the Larger Work may, at
+     their option, further distribute the Covered Software under the terms of
+     either this License or such Secondary License(s).
+
+3.4. Notices
+
+     You may not remove or alter the substance of any license notices (including
+     copyright notices, patent notices, disclaimers of warranty, or limitations
+     of liability) contained within the Source Code Form of the Covered
+     Software, except that You may alter any license notices to the extent
+     required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+     You may choose to offer, and to charge a fee for, warranty, support,
+     indemnity or liability obligations to one or more recipients of Covered
+     Software. However, You may do so only on Your own behalf, and not on behalf
+     of any Contributor. You must make it absolutely clear that any such
+     warranty, support, indemnity, or liability obligation is offered by You
+     alone, and You hereby agree to indemnify every Contributor for any
+     liability incurred by such Contributor as a result of warranty, support,
+     indemnity or liability terms You offer. You may include additional
+     disclaimers of warranty and limitations of liability specific to any
+     jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+
+   If it is impossible for You to comply with any of the terms of this License
+   with respect to some or all of the Covered Software due to statute, judicial
+   order, or regulation then You must: (a) comply with the terms of this License
+   to the maximum extent possible; and (b) describe the limitations and the code
+   they affect. Such description must be placed in a text file included with all
+   distributions of the Covered Software under this License. Except to the
+   extent prohibited by statute or regulation, such description must be
+   sufficiently detailed for a recipient of ordinary skill to be able to
+   understand it.
+
+5. Termination
+
+5.1. The rights granted under this License will terminate automatically if You
+     fail to comply with any of its terms. However, if You become compliant,
+     then the rights granted under this License from a particular Contributor
+     are reinstated (a) provisionally, unless and until such Contributor
+     explicitly and finally terminates Your grants, and (b) on an ongoing basis,
+     if such Contributor fails to notify You of the non-compliance by some
+     reasonable means prior to 60 days after You have come back into compliance.
+     Moreover, Your grants from a particular Contributor are reinstated on an
+     ongoing basis if such Contributor notifies You of the non-compliance by
+     some reasonable means, this is the first time You have received notice of
+     non-compliance with this License from such Contributor, and You become
+     compliant prior to 30 days after Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+     infringement claim (excluding declaratory judgment actions, counter-claims,
+     and cross-claims) alleging that a Contributor Version directly or
+     indirectly infringes any patent, then the rights granted to You by any and
+     all Contributors for the Covered Software under Section 2.1 of this License
+     shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
+     license agreements (excluding distributors and resellers) which have been
+     validly granted by You or Your distributors under this License prior to
+     termination shall survive termination.
+
+6. Disclaimer of Warranty
+
+   Covered Software is provided under this License on an “as is” basis, without
+   warranty of any kind, either expressed, implied, or statutory, including,
+   without limitation, warranties that the Covered Software is free of defects,
+   merchantable, fit for a particular purpose or non-infringing. The entire
+   risk as to the quality and performance of the Covered Software is with You.
+   Should any Covered Software prove defective in any respect, You (not any
+   Contributor) assume the cost of any necessary servicing, repair, or
+   correction. This disclaimer of warranty constitutes an essential part of this
+   License. No use of  any Covered Software is authorized under this License
+   except under this disclaimer.
+
+7. Limitation of Liability
+
+   Under no circumstances and under no legal theory, whether tort (including
+   negligence), contract, or otherwise, shall any Contributor, or anyone who
+   distributes Covered Software as permitted above, be liable to You for any
+   direct, indirect, special, incidental, or consequential damages of any
+   character including, without limitation, damages for lost profits, loss of
+   goodwill, work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses, even if such party shall have been
+   informed of the possibility of such damages. This limitation of liability
+   shall not apply to liability for death or personal injury resulting from such
+   party’s negligence to the extent applicable law prohibits such limitation.
+   Some jurisdictions do not allow the exclusion or limitation of incidental or
+   consequential damages, so this exclusion and limitation may not apply to You.
+
+8. Litigation
+
+   Any litigation relating to this License may be brought only in the courts of
+   a jurisdiction where the defendant maintains its principal place of business
+   and such litigation shall be governed by laws of that jurisdiction, without
+   reference to its conflict-of-law provisions. Nothing in this Section shall
+   prevent a party’s ability to bring cross-claims or counter-claims.
+
+9. Miscellaneous
+
+   This License represents the complete agreement concerning the subject matter
+   hereof. If any provision of this License is held to be unenforceable, such
+   provision shall be reformed only to the extent necessary to make it
+   enforceable. Any law or regulation which provides that the language of a
+   contract shall be construed against the drafter shall not be used to construe
+   this License against a Contributor.
+
+
+10. Versions of the License
+
+10.1. New Versions
+
+      Mozilla Foundation is the license steward. Except as provided in Section
+      10.3, no one other than the license steward has the right to modify or
+      publish new versions of this License. Each version will be given a
+      distinguishing version number.
+
+10.2. Effect of New Versions
+
+      You may distribute the Covered Software under the terms of the version of
+      the License under which You originally received the Covered Software, or
+      under the terms of any subsequent version published by the license
+      steward.
+
+10.3. Modified Versions
+
+      If you create software not governed by this License, and you want to
+      create a new license for such software, you may create and use a modified
+      version of this License if you rename the license and remove any
+      references to the name of the license steward (except to note that such
+      modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
+      If You choose to distribute Source Code Form that is Incompatible With
+      Secondary Licenses under the terms of this version of the License, the
+      notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+
+      This Source Code Form is subject to the
+      terms of the Mozilla Public License, v.
+      2.0. If a copy of the MPL was not
+      distributed with this file, You can
+      obtain one at
+      http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular file, then
+You may include the notice in a location (such as a LICENSE file in a relevant
+directory) where a recipient would be likely to look for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - “Incompatible With Secondary Licenses” Notice
+
+      This Source Code Form is “Incompatible
+      With Secondary Licenses”, as defined by
+      the Mozilla Public License, v. 2.0.
+
diff --git a/core/vendor/DOMPurify/dist/purify.min.js b/core/vendor/DOMPurify/dist/purify.min.js
new file mode 100644
index 00000000000..d95d80fc231
--- /dev/null
+++ b/core/vendor/DOMPurify/dist/purify.min.js
@@ -0,0 +1,2 @@
+(function(e){"use strict";var t=typeof window==="undefined"?null:window;if(typeof define==="function"&&define.amd){define(function(){return e(t)})}else if(typeof module!=="undefined"){module.exports=e(t)}else{t.DOMPurify=e(t)}})(function e(t){"use strict";var r=function(t){return e(t)};r.version="0.8.4";r.removed=[];if(!t||!t.document||t.document.nodeType!==9){r.isSupported=false;return r}var n=t.document;var a=n;var i=t.DocumentFragment;var o=t.HTMLTemplateElement;var l=t.NodeFilter;var s=t.NamedNodeMap||t.MozNamedAttrMap;var f=t.Text;var c=t.Comment;var u=t.DOMParser;if(typeof o==="function"){var d=n.createElement("template");if(d.content&&d.content.ownerDocument){n=d.content.ownerDocument}}var m=n.implementation;var p=n.createNodeIterator;var v=n.getElementsByTagName;var h=n.createDocumentFragment;var g=a.importNode;var y={};r.isSupported=typeof m.createHTMLDocument!=="undefined"&&n.documentMode!==9;var b=function(e,t){var r=t.length;while(r--){if(typeof t[r]==="string"){t[r]=t[r].toLowerCase()}e[t[r]]=true}return e};var T=function(e){var t={};var r;for(r in e){if(e.hasOwnProperty(r)){t[r]=e[r]}}return t};var x=null;var k=b({},["a","abbr","acronym","address","area","article","aside","audio","b","bdi","bdo","big","blink","blockquote","body","br","button","canvas","caption","center","cite","code","col","colgroup","content","data","datalist","dd","decorator","del","details","dfn","dir","div","dl","dt","element","em","fieldset","figcaption","figure","font","footer","form","h1","h2","h3","h4","h5","h6","head","header","hgroup","hr","html","i","img","input","ins","kbd","label","legend","li","main","map","mark","marquee","menu","menuitem","meter","nav","nobr","ol","optgroup","option","output","p","pre","progress","q","rp","rt","ruby","s","samp","section","select","shadow","small","source","spacer","span","strike","strong","style","sub","summary","sup","table","tbody","td","template","textarea","tfoot","th","thead","time","tr","track","tt","u","ul","var","video","wbr","svg","altglyph","altglyphdef","altglyphitem","animatecolor","animatemotion","animatetransform","circle","clippath","defs","desc","ellipse","filter","font","g","glyph","glyphref","hkern","image","line","lineargradient","marker","mask","metadata","mpath","path","pattern","polygon","polyline","radialgradient","rect","stop","switch","symbol","text","textpath","title","tref","tspan","view","vkern","feBlend","feColorMatrix","feComponentTransfer","feComposite","feConvolveMatrix","feDiffuseLighting","feDisplacementMap","feFlood","feFuncA","feFuncB","feFuncG","feFuncR","feGaussianBlur","feMerge","feMergeNode","feMorphology","feOffset","feSpecularLighting","feTile","feTurbulence","math","menclose","merror","mfenced","mfrac","mglyph","mi","mlabeledtr","mmuliscripts","mn","mo","mover","mpadded","mphantom","mroot","mrow","ms","mpspace","msqrt","mystyle","msub","msup","msubsup","mtable","mtd","mtext","mtr","munder","munderover","#text"]);var A=null;var w=b({},["accept","action","align","alt","autocomplete","background","bgcolor","border","cellpadding","cellspacing","checked","cite","class","clear","color","cols","colspan","coords","datetime","default","dir","disabled","download","enctype","face","for","headers","height","hidden","high","href","hreflang","id","ismap","label","lang","list","loop","low","max","maxlength","media","method","min","multiple","name","noshade","novalidate","nowrap","open","optimum","pattern","placeholder","poster","preload","pubdate","radiogroup","readonly","rel","required","rev","reversed","rows","rowspan","spellcheck","scope","selected","shape","size","span","srclang","start","src","step","style","summary","tabindex","title","type","usemap","valign","value","width","xmlns","accent-height","accumulate","additivive","alignment-baseline","ascent","attributename","attributetype","azimuth","basefrequency","baseline-shift","begin","bias","by","clip","clip-path","clip-rule","color","color-interpolation","color-interpolation-filters","color-profile","color-rendering","cx","cy","d","dx","dy","diffuseconstant","direction","display","divisor","dur","edgemode","elevation","end","fill","fill-opacity","fill-rule","filter","flood-color","flood-opacity","font-family","font-size","font-size-adjust","font-stretch","font-style","font-variant","font-weight","fx","fy","g1","g2","glyph-name","glyphref","gradientunits","gradienttransform","image-rendering","in","in2","k","k1","k2","k3","k4","kerning","keypoints","keysplines","keytimes","lengthadjust","letter-spacing","kernelmatrix","kernelunitlength","lighting-color","local","marker-end","marker-mid","marker-start","markerheight","markerunits","markerwidth","maskcontentunits","maskunits","max","mask","mode","min","numoctaves","offset","operator","opacity","order","orient","orientation","origin","overflow","paint-order","path","pathlength","patterncontentunits","patterntransform","patternunits","points","preservealpha","r","rx","ry","radius","refx","refy","repeatcount","repeatdur","restart","result","rotate","scale","seed","shape-rendering","specularconstant","specularexponent","spreadmethod","stddeviation","stitchtiles","stop-color","stop-opacity","stroke-dasharray","stroke-dashoffset","stroke-linecap","stroke-linejoin","stroke-miterlimit","stroke-opacity","stroke","stroke-width","surfacescale","targetx","targety","transform","text-anchor","text-decoration","text-rendering","textlength","u1","u2","unicode","values","viewbox","visibility","vert-adv-y","vert-origin-x","vert-origin-y","word-spacing","wrap","writing-mode","xchannelselector","ychannelselector","x","x1","x2","y","y1","y2","z","zoomandpan","accent","accentunder","bevelled","close","columnsalign","columnlines","columnspan","denomalign","depth","display","displaystyle","fence","frame","largeop","length","linethickness","lspace","lquote","mathbackground","mathcolor","mathsize","mathvariant","maxsize","minsize","movablelimits","notation","numalign","open","rowalign","rowlines","rowspacing","rowspan","rspace","rquote","scriptlevel","scriptminsize","scriptsizemultiplier","selection","separator","separators","stretchy","subscriptshift","supscriptshift","symmetric","voffset","xlink:href","xml:id","xlink:title","xml:space","xmlns:xlink"]);var E=null;var S=null;var M=true;var O=false;var N=false;var L=false;var D=/\{\{[\s\S]*|[\s\S]*\}\}/gm;var _=/<%[\s\S]*|[\s\S]*%>/gm;var C=false;var z=false;var R=false;var F=false;var H=true;var B=true;var W=b({},["audio","head","math","script","style","svg","video"]);var j=b({},["audio","video","img","source"]);var G=b({},["alt","class","for","id","label","name","pattern","placeholder","summary","title","value","style","xmlns"]);var I=null;var q=n.createElement("form");var P=function(e){if(typeof e!=="object"){e={}}x="ALLOWED_TAGS"in e?b({},e.ALLOWED_TAGS):k;A="ALLOWED_ATTR"in e?b({},e.ALLOWED_ATTR):w;E="FORBID_TAGS"in e?b({},e.FORBID_TAGS):{};S="FORBID_ATTR"in e?b({},e.FORBID_ATTR):{};M=e.ALLOW_DATA_ATTR!==false;O=e.ALLOW_UNKNOWN_PROTOCOLS||false;N=e.SAFE_FOR_JQUERY||false;L=e.SAFE_FOR_TEMPLATES||false;C=e.WHOLE_DOCUMENT||false;z=e.RETURN_DOM||false;R=e.RETURN_DOM_FRAGMENT||false;F=e.RETURN_DOM_IMPORT||false;H=e.SANITIZE_DOM!==false;B=e.KEEP_CONTENT!==false;if(L){M=false}if(R){z=true}if(e.ADD_TAGS){if(x===k){x=T(x)}b(x,e.ADD_TAGS)}if(e.ADD_ATTR){if(A===w){A=T(A)}b(A,e.ADD_ATTR)}if(B){x["#text"]=true}if(Object&&"freeze"in Object){Object.freeze(e)}I=e};var U=function(e){r.removed.push({element:e});try{e.parentNode.removeChild(e)}catch(t){e.outerHTML=""}};var V=function(e,t){r.removed.push({attribute:t.getAttributeNode(e),from:t});t.removeAttribute(e)};var K=function(e){var t,r;try{t=(new u).parseFromString(e,"text/html")}catch(n){}if(!t||!t.documentElement){t=m.createHTMLDocument("");r=t.body;r.parentNode.removeChild(r.parentNode.firstElementChild);r.outerHTML=e}if(typeof t.getElementsByTagName==="function"){return t.getElementsByTagName(C?"html":"body")[0]}return v.call(t,C?"html":"body")[0]};var J=function(e){return p.call(e.ownerDocument||e,e,l.SHOW_ELEMENT|l.SHOW_COMMENT|l.SHOW_TEXT,function(){return l.FILTER_ACCEPT},false)};var Q=function(e){if(e instanceof f||e instanceof c){return false}if(typeof e.nodeName!=="string"||typeof e.textContent!=="string"||typeof e.removeChild!=="function"||!(e.attributes instanceof s)||typeof e.removeAttribute!=="function"||typeof e.setAttribute!=="function"){return true}return false};var X=function(e){var t,n;ne("beforeSanitizeElements",e,null);if(Q(e)){U(e);return true}t=e.nodeName.toLowerCase();ne("uponSanitizeElement",e,{tagName:t,allowedTags:x});if(!x[t]||E[t]){if(B&&!W[t]&&typeof e.insertAdjacentHTML==="function"){try{e.insertAdjacentHTML("AfterEnd",e.innerHTML)}catch(a){}}U(e);return true}if(N&&!e.firstElementChild&&(!e.content||!e.content.firstElementChild)&&/</g.test(e.textContent)){r.removed.push({element:e.cloneNode()});e.innerHTML=e.textContent.replace(/</g,"&lt;")}if(L&&e.nodeType===3){n=e.textContent;n=n.replace(D," ");n=n.replace(_," ");if(e.textContent!==n){r.removed.push({element:e.cloneNode()});e.textContent=n}}ne("afterSanitizeElements",e,null);return false};var Y=/^data-[\-\w.\u00B7-\uFFFF]/;var Z=/^(?:(?:(?:f|ht)tps?|mailto|tel):|[^a-z]|[a-z+.\-]+(?:[^a-z+.\-:]|$))/i;var $=/^(?:\w+script|data):/i;var ee=/[\x00-\x20\xA0\u1680\u180E\u2000-\u2029\u205f\u3000]/g;var te=function(e){var a,i,o,l,s,f,c,u;ne("beforeSanitizeAttributes",e,null);f=e.attributes;if(!f){return}c={attrName:"",attrValue:"",keepAttr:true,allowedAttributes:A};u=f.length;while(u--){a=f[u];i=a.name;o=a.value;l=i.toLowerCase();c.attrName=l;c.attrValue=o;c.keepAttr=true;ne("uponSanitizeAttribute",e,c);o=c.attrValue;if(l==="name"&&e.nodeName==="IMG"&&f.id){s=f.id;f=Array.prototype.slice.apply(f);V("id",e);V(i,e);if(f.indexOf(s)>u){e.setAttribute("id",s.value)}}else{if(i==="id"){e.setAttribute(i,"")}V(i,e)}if(!c.keepAttr){continue}if(H&&(l==="id"||l==="name")&&(o in t||o in n||o in q)){continue}if(L){o=o.replace(D," ");o=o.replace(_," ")}if(M&&Y.test(l)){}else if(!A[l]||S[l]){continue}else if(G[l]){}else if(Z.test(o.replace(ee,""))){}else if(l==="src"&&o.indexOf("data:")===0&&j[e.nodeName.toLowerCase()]){}else if(O&&!$.test(o.replace(ee,""))){}else if(!o){}else{continue}try{e.setAttribute(i,o);r.removed.pop()}catch(d){}}ne("afterSanitizeAttributes",e,null)};var re=function(e){var t;var r=J(e);ne("beforeSanitizeShadowDOM",e,null);while(t=r.nextNode()){ne("uponSanitizeShadowNode",t,null);if(X(t)){continue}if(t.content instanceof i){re(t.content)}te(t)}ne("afterSanitizeShadowDOM",e,null)};var ne=function(e,t,n){if(!y[e]){return}y[e].forEach(function(e){e.call(r,t,n,I)})};r.sanitize=function(e,n){var o,l,s,f,c;if(!e){e=""}if(typeof e!=="string"){if(typeof e.toString!=="function"){throw new TypeError("toString is not a function")}else{e=e.toString()}}if(!r.isSupported){if(typeof t.toStaticHTML==="object"||typeof t.toStaticHTML==="function"){return t.toStaticHTML(e)}return e}P(n);r.removed=[];if(!z&&!C&&e.indexOf("<")===-1){return e}o=K(e);if(!o){return z?null:""}f=J(o);while(l=f.nextNode()){if(l.nodeType===3&&l===s){continue}if(X(l)){continue}if(l.content instanceof i){re(l.content)}te(l);s=l}if(z){if(R){c=h.call(o.ownerDocument);while(o.firstChild){c.appendChild(o.firstChild)}}else{c=o}if(F){c=g.call(a,c,true)}return c}return C?o.outerHTML:o.innerHTML};r.addHook=function(e,t){if(typeof t!=="function"){return}y[e]=y[e]||[];y[e].push(t)};r.removeHook=function(e){if(y[e]){y[e].pop()}};r.removeHooks=function(e){if(y[e]){y[e]=[]}};r.removeAllHooks=function(){y={}};return r});
+//# sourceMappingURL=./dist/purify.min.js.map
\ No newline at end of file
diff --git a/core/vendor/marked/.bower.json b/core/vendor/marked/.bower.json
new file mode 100644
index 00000000000..058b951d4b7
--- /dev/null
+++ b/core/vendor/marked/.bower.json
@@ -0,0 +1,33 @@
+{
+  "name": "marked",
+  "version": "0.3.6",
+  "homepage": "https://github.com/chjj/marked",
+  "authors": [
+    "Christopher Jeffrey <chjjeffrey@gmail.com>"
+  ],
+  "description": "A markdown parser built for speed",
+  "keywords": [
+    "markdown",
+    "markup",
+    "html"
+  ],
+  "main": "lib/marked.js",
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "app/bower_components",
+    "test",
+    "tests"
+  ],
+  "_release": "0.3.6",
+  "_resolution": {
+    "type": "version",
+    "tag": "v0.3.6",
+    "commit": "eddec20467c2d10c7769061ee9074e268500966f"
+  },
+  "_source": "https://github.com/chjj/marked.git",
+  "_target": "0.3.6",
+  "_originalSource": "marked"
+}
\ No newline at end of file
diff --git a/core/vendor/marked/LICENSE b/core/vendor/marked/LICENSE
new file mode 100644
index 00000000000..a7b812ed618
--- /dev/null
+++ b/core/vendor/marked/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/core/vendor/marked/marked.min.js b/core/vendor/marked/marked.min.js
new file mode 100644
index 00000000000..555c1dc1d9d
--- /dev/null
+++ b/core/vendor/marked/marked.min.js
@@ -0,0 +1,6 @@
+/**
+ * marked - a markdown parser
+ * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
+ * https://github.com/chjj/marked
+ */
+(function(){var block={newline:/^\n+/,code:/^( {4}[^\n]+\n*)+/,fences:noop,hr:/^( *[-*_]){3,} *(?:\n+|$)/,heading:/^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,nptable:noop,lheading:/^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,blockquote:/^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,list:/^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,html:/^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing *(?:\n{2,}|\s*$))/,def:/^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,table:noop,paragraph:/^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,text:/^[^\n]+/};block.bullet=/(?:[*+-]|\d+\.)/;block.item=/^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;block.item=replace(block.item,"gm")(/bull/g,block.bullet)();block.list=replace(block.list)(/bull/g,block.bullet)("hr","\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))")("def","\\n+(?="+block.def.source+")")();block.blockquote=replace(block.blockquote)("def",block.def)();block._tag="(?!(?:"+"a|em|strong|small|s|cite|q|dfn|abbr|data|time|code"+"|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo"+"|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b";block.html=replace(block.html)("comment",/<!--[\s\S]*?-->/)("closed",/<(tag)[\s\S]+?<\/\1>/)("closing",/<tag(?:"[^"]*"|'[^']*'|[^'">])*?>/)(/tag/g,block._tag)();block.paragraph=replace(block.paragraph)("hr",block.hr)("heading",block.heading)("lheading",block.lheading)("blockquote",block.blockquote)("tag","<"+block._tag)("def",block.def)();block.normal=merge({},block);block.gfm=merge({},block.normal,{fences:/^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\s*\1 *(?:\n+|$)/,paragraph:/^/,heading:/^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/});block.gfm.paragraph=replace(block.paragraph)("(?!","(?!"+block.gfm.fences.source.replace("\\1","\\2")+"|"+block.list.source.replace("\\1","\\3")+"|")();block.tables=merge({},block.gfm,{nptable:/^ *(\S.*\|.*)\n *([-:]+ *\|[-| :]*)\n((?:.*\|.*(?:\n|$))*)\n*/,table:/^ *\|(.+)\n *\|( *[-:]+[-| :]*)\n((?: *\|.*(?:\n|$))*)\n*/});function Lexer(options){this.tokens=[];this.tokens.links={};this.options=options||marked.defaults;this.rules=block.normal;if(this.options.gfm){if(this.options.tables){this.rules=block.tables}else{this.rules=block.gfm}}}Lexer.rules=block;Lexer.lex=function(src,options){var lexer=new Lexer(options);return lexer.lex(src)};Lexer.prototype.lex=function(src){src=src.replace(/\r\n|\r/g,"\n").replace(/\t/g,"    ").replace(/\u00a0/g," ").replace(/\u2424/g,"\n");return this.token(src,true)};Lexer.prototype.token=function(src,top,bq){var src=src.replace(/^ +$/gm,""),next,loose,cap,bull,b,item,space,i,l;while(src){if(cap=this.rules.newline.exec(src)){src=src.substring(cap[0].length);if(cap[0].length>1){this.tokens.push({type:"space"})}}if(cap=this.rules.code.exec(src)){src=src.substring(cap[0].length);cap=cap[0].replace(/^ {4}/gm,"");this.tokens.push({type:"code",text:!this.options.pedantic?cap.replace(/\n+$/,""):cap});continue}if(cap=this.rules.fences.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"code",lang:cap[2],text:cap[3]||""});continue}if(cap=this.rules.heading.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"heading",depth:cap[1].length,text:cap[2]});continue}if(top&&(cap=this.rules.nptable.exec(src))){src=src.substring(cap[0].length);item={type:"table",header:cap[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:cap[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:cap[3].replace(/\n$/,"").split("\n")};for(i=0;i<item.align.length;i++){if(/^ *-+: *$/.test(item.align[i])){item.align[i]="right"}else if(/^ *:-+: *$/.test(item.align[i])){item.align[i]="center"}else if(/^ *:-+ *$/.test(item.align[i])){item.align[i]="left"}else{item.align[i]=null}}for(i=0;i<item.cells.length;i++){item.cells[i]=item.cells[i].split(/ *\| */)}this.tokens.push(item);continue}if(cap=this.rules.lheading.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"heading",depth:cap[2]==="="?1:2,text:cap[1]});continue}if(cap=this.rules.hr.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"hr"});continue}if(cap=this.rules.blockquote.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"blockquote_start"});cap=cap[0].replace(/^ *> ?/gm,"");this.token(cap,top,true);this.tokens.push({type:"blockquote_end"});continue}if(cap=this.rules.list.exec(src)){src=src.substring(cap[0].length);bull=cap[2];this.tokens.push({type:"list_start",ordered:bull.length>1});cap=cap[0].match(this.rules.item);next=false;l=cap.length;i=0;for(;i<l;i++){item=cap[i];space=item.length;item=item.replace(/^ *([*+-]|\d+\.) +/,"");if(~item.indexOf("\n ")){space-=item.length;item=!this.options.pedantic?item.replace(new RegExp("^ {1,"+space+"}","gm"),""):item.replace(/^ {1,4}/gm,"")}if(this.options.smartLists&&i!==l-1){b=block.bullet.exec(cap[i+1])[0];if(bull!==b&&!(bull.length>1&&b.length>1)){src=cap.slice(i+1).join("\n")+src;i=l-1}}loose=next||/\n\n(?!\s*$)/.test(item);if(i!==l-1){next=item.charAt(item.length-1)==="\n";if(!loose)loose=next}this.tokens.push({type:loose?"loose_item_start":"list_item_start"});this.token(item,false,bq);this.tokens.push({type:"list_item_end"})}this.tokens.push({type:"list_end"});continue}if(cap=this.rules.html.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:this.options.sanitize?"paragraph":"html",pre:!this.options.sanitizer&&(cap[1]==="pre"||cap[1]==="script"||cap[1]==="style"),text:cap[0]});continue}if(!bq&&top&&(cap=this.rules.def.exec(src))){src=src.substring(cap[0].length);this.tokens.links[cap[1].toLowerCase()]={href:cap[2],title:cap[3]};continue}if(top&&(cap=this.rules.table.exec(src))){src=src.substring(cap[0].length);item={type:"table",header:cap[1].replace(/^ *| *\| *$/g,"").split(/ *\| */),align:cap[2].replace(/^ *|\| *$/g,"").split(/ *\| */),cells:cap[3].replace(/(?: *\| *)?\n$/,"").split("\n")};for(i=0;i<item.align.length;i++){if(/^ *-+: *$/.test(item.align[i])){item.align[i]="right"}else if(/^ *:-+: *$/.test(item.align[i])){item.align[i]="center"}else if(/^ *:-+ *$/.test(item.align[i])){item.align[i]="left"}else{item.align[i]=null}}for(i=0;i<item.cells.length;i++){item.cells[i]=item.cells[i].replace(/^ *\| *| *\| *$/g,"").split(/ *\| */)}this.tokens.push(item);continue}if(top&&(cap=this.rules.paragraph.exec(src))){src=src.substring(cap[0].length);this.tokens.push({type:"paragraph",text:cap[1].charAt(cap[1].length-1)==="\n"?cap[1].slice(0,-1):cap[1]});continue}if(cap=this.rules.text.exec(src)){src=src.substring(cap[0].length);this.tokens.push({type:"text",text:cap[0]});continue}if(src){throw new Error("Infinite loop on byte: "+src.charCodeAt(0))}}return this.tokens};var inline={escape:/^\\([\\`*{}\[\]()#+\-.!_>])/,autolink:/^<([^ >]+(@|:\/)[^ >]+)>/,url:noop,tag:/^<!--[\s\S]*?-->|^<\/?\w+(?:"[^"]*"|'[^']*'|[^'">])*?>/,link:/^!?\[(inside)\]\(href\)/,reflink:/^!?\[(inside)\]\s*\[([^\]]*)\]/,nolink:/^!?\[((?:\[[^\]]*\]|[^\[\]])*)\]/,strong:/^__([\s\S]+?)__(?!_)|^\*\*([\s\S]+?)\*\*(?!\*)/,em:/^\b_((?:[^_]|__)+?)_\b|^\*((?:\*\*|[\s\S])+?)\*(?!\*)/,code:/^(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/,br:/^ {2,}\n(?!\s*$)/,del:noop,text:/^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/};inline._inside=/(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/;inline._href=/\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;inline.link=replace(inline.link)("inside",inline._inside)("href",inline._href)();inline.reflink=replace(inline.reflink)("inside",inline._inside)();inline.normal=merge({},inline);inline.pedantic=merge({},inline.normal,{strong:/^__(?=\S)([\s\S]*?\S)__(?!_)|^\*\*(?=\S)([\s\S]*?\S)\*\*(?!\*)/,em:/^_(?=\S)([\s\S]*?\S)_(?!_)|^\*(?=\S)([\s\S]*?\S)\*(?!\*)/});inline.gfm=merge({},inline.normal,{escape:replace(inline.escape)("])","~|])")(),url:/^(https?:\/\/[^\s<]+[^<.,:;"')\]\s])/,del:/^~~(?=\S)([\s\S]*?\S)~~/,text:replace(inline.text)("]|","~]|")("|","|https?://|")()});inline.breaks=merge({},inline.gfm,{br:replace(inline.br)("{2,}","*")(),text:replace(inline.gfm.text)("{2,}","*")()});function InlineLexer(links,options){this.options=options||marked.defaults;this.links=links;this.rules=inline.normal;this.renderer=this.options.renderer||new Renderer;this.renderer.options=this.options;if(!this.links){throw new Error("Tokens array requires a `links` property.")}if(this.options.gfm){if(this.options.breaks){this.rules=inline.breaks}else{this.rules=inline.gfm}}else if(this.options.pedantic){this.rules=inline.pedantic}}InlineLexer.rules=inline;InlineLexer.output=function(src,links,options){var inline=new InlineLexer(links,options);return inline.output(src)};InlineLexer.prototype.output=function(src){var out="",link,text,href,cap;while(src){if(cap=this.rules.escape.exec(src)){src=src.substring(cap[0].length);out+=cap[1];continue}if(cap=this.rules.autolink.exec(src)){src=src.substring(cap[0].length);if(cap[2]==="@"){text=cap[1].charAt(6)===":"?this.mangle(cap[1].substring(7)):this.mangle(cap[1]);href=this.mangle("mailto:")+text}else{text=escape(cap[1]);href=text}out+=this.renderer.link(href,null,text);continue}if(!this.inLink&&(cap=this.rules.url.exec(src))){src=src.substring(cap[0].length);text=escape(cap[1]);href=text;out+=this.renderer.link(href,null,text);continue}if(cap=this.rules.tag.exec(src)){if(!this.inLink&&/^<a /i.test(cap[0])){this.inLink=true}else if(this.inLink&&/^<\/a>/i.test(cap[0])){this.inLink=false}src=src.substring(cap[0].length);out+=this.options.sanitize?this.options.sanitizer?this.options.sanitizer(cap[0]):escape(cap[0]):cap[0];continue}if(cap=this.rules.link.exec(src)){src=src.substring(cap[0].length);this.inLink=true;out+=this.outputLink(cap,{href:cap[2],title:cap[3]});this.inLink=false;continue}if((cap=this.rules.reflink.exec(src))||(cap=this.rules.nolink.exec(src))){src=src.substring(cap[0].length);link=(cap[2]||cap[1]).replace(/\s+/g," ");link=this.links[link.toLowerCase()];if(!link||!link.href){out+=cap[0].charAt(0);src=cap[0].substring(1)+src;continue}this.inLink=true;out+=this.outputLink(cap,link);this.inLink=false;continue}if(cap=this.rules.strong.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.strong(this.output(cap[2]||cap[1]));continue}if(cap=this.rules.em.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.em(this.output(cap[2]||cap[1]));continue}if(cap=this.rules.code.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.codespan(escape(cap[2],true));continue}if(cap=this.rules.br.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.br();continue}if(cap=this.rules.del.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.del(this.output(cap[1]));continue}if(cap=this.rules.text.exec(src)){src=src.substring(cap[0].length);out+=this.renderer.text(escape(this.smartypants(cap[0])));continue}if(src){throw new Error("Infinite loop on byte: "+src.charCodeAt(0))}}return out};InlineLexer.prototype.outputLink=function(cap,link){var href=escape(link.href),title=link.title?escape(link.title):null;return cap[0].charAt(0)!=="!"?this.renderer.link(href,title,this.output(cap[1])):this.renderer.image(href,title,escape(cap[1]))};InlineLexer.prototype.smartypants=function(text){if(!this.options.smartypants)return text;return text.replace(/---/g,"—").replace(/--/g,"–").replace(/(^|[-\u2014/(\[{"\s])'/g,"$1‘").replace(/'/g,"’").replace(/(^|[-\u2014/(\[{\u2018\s])"/g,"$1“").replace(/"/g,"”").replace(/\.{3}/g,"…")};InlineLexer.prototype.mangle=function(text){if(!this.options.mangle)return text;var out="",l=text.length,i=0,ch;for(;i<l;i++){ch=text.charCodeAt(i);if(Math.random()>.5){ch="x"+ch.toString(16)}out+="&#"+ch+";"}return out};function Renderer(options){this.options=options||{}}Renderer.prototype.code=function(code,lang,escaped){if(this.options.highlight){var out=this.options.highlight(code,lang);if(out!=null&&out!==code){escaped=true;code=out}}if(!lang){return"<pre><code>"+(escaped?code:escape(code,true))+"\n</code></pre>"}return'<pre><code class="'+this.options.langPrefix+escape(lang,true)+'">'+(escaped?code:escape(code,true))+"\n</code></pre>\n"};Renderer.prototype.blockquote=function(quote){return"<blockquote>\n"+quote+"</blockquote>\n"};Renderer.prototype.html=function(html){return html};Renderer.prototype.heading=function(text,level,raw){return"<h"+level+' id="'+this.options.headerPrefix+raw.toLowerCase().replace(/[^\w]+/g,"-")+'">'+text+"</h"+level+">\n"};Renderer.prototype.hr=function(){return this.options.xhtml?"<hr/>\n":"<hr>\n"};Renderer.prototype.list=function(body,ordered){var type=ordered?"ol":"ul";return"<"+type+">\n"+body+"</"+type+">\n"};Renderer.prototype.listitem=function(text){return"<li>"+text+"</li>\n"};Renderer.prototype.paragraph=function(text){return"<p>"+text+"</p>\n"};Renderer.prototype.table=function(header,body){return"<table>\n"+"<thead>\n"+header+"</thead>\n"+"<tbody>\n"+body+"</tbody>\n"+"</table>\n"};Renderer.prototype.tablerow=function(content){return"<tr>\n"+content+"</tr>\n"};Renderer.prototype.tablecell=function(content,flags){var type=flags.header?"th":"td";var tag=flags.align?"<"+type+' style="text-align:'+flags.align+'">':"<"+type+">";return tag+content+"</"+type+">\n"};Renderer.prototype.strong=function(text){return"<strong>"+text+"</strong>"};Renderer.prototype.em=function(text){return"<em>"+text+"</em>"};Renderer.prototype.codespan=function(text){return"<code>"+text+"</code>"};Renderer.prototype.br=function(){return this.options.xhtml?"<br/>":"<br>"};Renderer.prototype.del=function(text){return"<del>"+text+"</del>"};Renderer.prototype.link=function(href,title,text){if(this.options.sanitize){try{var prot=decodeURIComponent(unescape(href)).replace(/[^\w:]/g,"").toLowerCase()}catch(e){return""}if(prot.indexOf("javascript:")===0||prot.indexOf("vbscript:")===0){return""}}var out='<a href="'+href+'"';if(title){out+=' title="'+title+'"'}out+=">"+text+"</a>";return out};Renderer.prototype.image=function(href,title,text){var out='<img src="'+href+'" alt="'+text+'"';if(title){out+=' title="'+title+'"'}out+=this.options.xhtml?"/>":">";return out};Renderer.prototype.text=function(text){return text};function Parser(options){this.tokens=[];this.token=null;this.options=options||marked.defaults;this.options.renderer=this.options.renderer||new Renderer;this.renderer=this.options.renderer;this.renderer.options=this.options}Parser.parse=function(src,options,renderer){var parser=new Parser(options,renderer);return parser.parse(src)};Parser.prototype.parse=function(src){this.inline=new InlineLexer(src.links,this.options,this.renderer);this.tokens=src.reverse();var out="";while(this.next()){out+=this.tok()}return out};Parser.prototype.next=function(){return this.token=this.tokens.pop()};Parser.prototype.peek=function(){return this.tokens[this.tokens.length-1]||0};Parser.prototype.parseText=function(){var body=this.token.text;while(this.peek().type==="text"){body+="\n"+this.next().text}return this.inline.output(body)};Parser.prototype.tok=function(){switch(this.token.type){case"space":{return""}case"hr":{return this.renderer.hr()}case"heading":{return this.renderer.heading(this.inline.output(this.token.text),this.token.depth,this.token.text)}case"code":{return this.renderer.code(this.token.text,this.token.lang,this.token.escaped)}case"table":{var header="",body="",i,row,cell,flags,j;cell="";for(i=0;i<this.token.header.length;i++){flags={header:true,align:this.token.align[i]};cell+=this.renderer.tablecell(this.inline.output(this.token.header[i]),{header:true,align:this.token.align[i]})}header+=this.renderer.tablerow(cell);for(i=0;i<this.token.cells.length;i++){row=this.token.cells[i];cell="";for(j=0;j<row.length;j++){cell+=this.renderer.tablecell(this.inline.output(row[j]),{header:false,align:this.token.align[j]})}body+=this.renderer.tablerow(cell)}return this.renderer.table(header,body)}case"blockquote_start":{var body="";while(this.next().type!=="blockquote_end"){body+=this.tok()}return this.renderer.blockquote(body)}case"list_start":{var body="",ordered=this.token.ordered;while(this.next().type!=="list_end"){body+=this.tok()}return this.renderer.list(body,ordered)}case"list_item_start":{var body="";while(this.next().type!=="list_item_end"){body+=this.token.type==="text"?this.parseText():this.tok()}return this.renderer.listitem(body)}case"loose_item_start":{var body="";while(this.next().type!=="list_item_end"){body+=this.tok()}return this.renderer.listitem(body)}case"html":{var html=!this.token.pre&&!this.options.pedantic?this.inline.output(this.token.text):this.token.text;return this.renderer.html(html)}case"paragraph":{return this.renderer.paragraph(this.inline.output(this.token.text))}case"text":{return this.renderer.paragraph(this.parseText())}}};function escape(html,encode){return html.replace(!encode?/&(?!#?\w+;)/g:/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#39;")}function unescape(html){return html.replace(/&([#\w]+);/g,function(_,n){n=n.toLowerCase();if(n==="colon")return":";if(n.charAt(0)==="#"){return n.charAt(1)==="x"?String.fromCharCode(parseInt(n.substring(2),16)):String.fromCharCode(+n.substring(1))}return""})}function replace(regex,opt){regex=regex.source;opt=opt||"";return function self(name,val){if(!name)return new RegExp(regex,opt);val=val.source||val;val=val.replace(/(^|[^\[])\^/g,"$1");regex=regex.replace(name,val);return self}}function noop(){}noop.exec=noop;function merge(obj){var i=1,target,key;for(;i<arguments.length;i++){target=arguments[i];for(key in target){if(Object.prototype.hasOwnProperty.call(target,key)){obj[key]=target[key]}}}return obj}function marked(src,opt,callback){if(callback||typeof opt==="function"){if(!callback){callback=opt;opt=null}opt=merge({},marked.defaults,opt||{});var highlight=opt.highlight,tokens,pending,i=0;try{tokens=Lexer.lex(src,opt)}catch(e){return callback(e)}pending=tokens.length;var done=function(err){if(err){opt.highlight=highlight;return callback(err)}var out;try{out=Parser.parse(tokens,opt)}catch(e){err=e}opt.highlight=highlight;return err?callback(err):callback(null,out)};if(!highlight||highlight.length<3){return done()}delete opt.highlight;if(!pending)return done();for(;i<tokens.length;i++){(function(token){if(token.type!=="code"){return--pending||done()}return highlight(token.text,token.lang,function(err,code){if(err)return done(err);if(code==null||code===token.text){return--pending||done()}token.text=code;token.escaped=true;--pending||done()})})(tokens[i])}return}try{if(opt)opt=merge({},marked.defaults,opt);return Parser.parse(Lexer.lex(src,opt),opt)}catch(e){e.message+="\nPlease report this to https://github.com/chjj/marked.";if((opt||marked.defaults).silent){return"<p>An error occured:</p><pre>"+escape(e.message+"",true)+"</pre>"}throw e}}marked.options=marked.setOptions=function(opt){merge(marked.defaults,opt);return marked};marked.defaults={gfm:true,tables:true,breaks:false,pedantic:false,sanitize:false,sanitizer:null,mangle:true,smartLists:false,silent:false,highlight:null,langPrefix:"lang-",smartypants:false,headerPrefix:"",renderer:new Renderer,xhtml:false};marked.Parser=Parser;marked.parser=Parser.parse;marked.Renderer=Renderer;marked.Lexer=Lexer;marked.lexer=Lexer.lex;marked.InlineLexer=InlineLexer;marked.inlineLexer=InlineLexer.output;marked.parse=marked;if(typeof module!=="undefined"&&typeof exports==="object"){module.exports=marked}else if(typeof define==="function"&&define.amd){define(function(){return marked})}else{this.marked=marked}}).call(function(){return this||(typeof window!=="undefined"?window:global)}());
\ No newline at end of file