Merge remote-tracking branch 'owncloud/master' into add_resetadminpass_command

* owncloud/master: (238 commits) Change visibility of scanner internals [tx-robot] updated from transifex remove legacy OC_Filesystem being used in a hook callback add title property to share dialog forgotten infobox messages translations reverts 188c543 and translates only mail fix warning text and margin Adjust core apps to use "requiremin" instead of "require" Added requiremin/requiremax fields for apps [tx-robot] updated from transifex unwrapped strings fix allow resharing of files with only share permissions don't lose file size during rename drop superflous statement in phpdoc add preRememberedLogin hook and document this and postRememberedLogin in class descripttion. Also fixes documentation of postLogin hook [tx-robot] updated from transifex fix grammar make user_ldap fully translatable [tx-robot] updated from transifex fix typo ... Conflicts: core/register_command.php
author: Andreas Fischer <bantu@owncloud.com> 2014-05-28 22:57:33 +0200
committer: Andreas Fischer <bantu@owncloud.com> 2014-05-28 22:57:33 +0200
commit: 5754b0b9e70824786878b847abb6b728ca0414bb (patch)
tree: 9ad1fbc35edde8f54f44c9ef7029e007a16815b9 /core
parent: f81ee94cad8a997c3a2fef0b6aac4f8d509571f6 (diff)
parent: ce9d5df6df37e51587dcde638086dfe501892b56 (diff)
download: nextcloud-server-5754b0b9e70824786878b847abb6b728ca0414bb.tar.gz
nextcloud-server-5754b0b9e70824786878b847abb6b728ca0414bb.zip
105 files changed, 1279 insertions, 279 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 2b41bd8a5da..75b749a5b07 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -41,7 +41,8 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 						$shareType,
 						$shareWith,
 						$_POST['permissions'],
-						$_POST['itemSourceName']
+						$_POST['itemSourceName'],
+						(!empty($_POST['expirationDate']) ? new \DateTime($_POST['expirationDate']) : null)
 					);
 
 					if (is_string($token)) {
diff --git a/core/avatar/controller.php b/core/avatar/controller.php
index 22693824461..06efbec3f3c 100644
--- a/core/avatar/controller.php
+++ b/core/avatar/controller.php
@@ -71,7 +71,7 @@ class Controller {
 			$image = new \OC_Image($newAvatar);
 
 			if ($image->valid()) {
-				\OC_Cache::set('tmpavatar', $image->data(), 7200);
+				\OC\Cache::set('tmpavatar', $image->data(), 7200);
 				\OC_JSON::error(array("data" => "notsquare"));
 			} else {
 				$l = new \OC_L10n('core');
@@ -109,7 +109,7 @@ class Controller {
 		\OC_JSON::checkLoggedIn();
 		\OC_JSON::callCheck();
 
-		$tmpavatar = \OC_Cache::get('tmpavatar');
+		$tmpavatar = \OC\Cache::get('tmpavatar');
 		if (is_null($tmpavatar)) {
 			$l = new \OC_L10n('core');
 			\OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) ));
@@ -136,7 +136,7 @@ class Controller {
 			return;
 		}
 
-		$tmpavatar = \OC_Cache::get('tmpavatar');
+		$tmpavatar = \OC\Cache::get('tmpavatar');
 		if (is_null($tmpavatar)) {
 			$l = new \OC_L10n('core');
 			\OC_JSON::error(array("data" => array("message" => $l->t("No temporary profile picture available, try again")) ));
@@ -149,7 +149,7 @@ class Controller {
 			$avatar = new \OC_Avatar($user);
 			$avatar->set($image->data());
 			// Clean up
-			\OC_Cache::remove('tmpavatar');
+			\OC\Cache::remove('tmpavatar');
 			\OC_JSON::success();
 		} catch (\Exception $e) {
 			\OC_JSON::error(array("data" => array("message" => $e->getMessage()) ));
diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
new file mode 100644
index 00000000000..39e87853d60
--- /dev/null
+++ b/core/command/db/converttype.php
@@ -0,0 +1,295 @@
+<?php
+/**
+ * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2014 Andreas Fischer <bantu@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ *
+ */
+
+namespace OC\Core\Command\Db;
+
+use OC\Config;
+use OC\DB\Connection;
+use OC\DB\ConnectionFactory;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class ConvertType extends Command {
+	/**
+	 * @var \OC\Config
+	 */
+	protected $config;
+
+	/**
+	 * @var \OC\DB\ConnectionFactory
+	 */
+	protected $connectionFactory;
+
+	/**
+	 * @param \OC\Config $config
+	 * @param \OC\DB\ConnectionFactory $connectionFactory
+	 */
+	public function __construct(Config $config, ConnectionFactory $connectionFactory) {
+		$this->config = $config;
+		$this->connectionFactory = $connectionFactory;
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this
+			->setName('db:convert-type')
+			->setDescription('Convert the ownCloud database to the newly configured one')
+			->addArgument(
+				'type',
+				InputArgument::REQUIRED,
+				'the type of the database to convert to'
+			)
+			->addArgument(
+				'username',
+				InputArgument::REQUIRED,
+				'the username of the database to convert to'
+			)
+			->addArgument(
+				'hostname',
+				InputArgument::REQUIRED,
+				'the hostname of the database to convert to'
+			)
+			->addArgument(
+				'database',
+				InputArgument::REQUIRED,
+				'the name of the database to convert to'
+			)
+			->addOption(
+				'port',
+				null,
+				InputOption::VALUE_REQUIRED,
+				'the port of the database to convert to'
+			)
+			->addOption(
+				'password',
+				null,
+				InputOption::VALUE_REQUIRED,
+				'the password of the database to convert to. Will be asked when not specified. Can also be passed via stdin.'
+			)
+			->addOption(
+				'clear-schema',
+				null,
+				InputOption::VALUE_NONE,
+				'remove all tables from the destination database'
+			)
+			->addOption(
+				'all-apps',
+				null,
+				InputOption::VALUE_NONE,
+				'whether to create schema for all apps instead of only installed apps'
+			)
+		;
+	}
+
+	protected function validateInput(InputInterface $input, OutputInterface $output) {
+		$type = $this->connectionFactory->normalizeType($input->getArgument('type'));
+		if ($type === 'sqlite3') {
+			throw new \InvalidArgumentException(
+				'Converting to SQLite (sqlite3) is currently not supported.'
+			);
+		}
+		if ($type === 'mssql') {
+			throw new \InvalidArgumentException(
+				'Converting to Microsoft SQL Server (mssql) is currently not supported.'
+			);
+		}
+		if ($type === $this->config->getValue('dbtype', '')) {
+			throw new \InvalidArgumentException(sprintf(
+				'Can not convert from %1$s to %1$s.',
+				$type
+			));
+		}
+		if ($type === 'oci' && $input->getOption('clear-schema')) {
+			// Doctrine unconditionally tries (at least in version 2.3)
+			// to drop sequence triggers when dropping a table, even though
+			// such triggers may not exist. This results in errors like
+			// "ORA-04080: trigger 'OC_STORAGES_AI_PK' does not exist".
+			throw new \InvalidArgumentException(
+				'The --clear-schema option is not supported when converting to Oracle (oci).'
+			);
+		}
+	}
+
+	protected function readPassword(InputInterface $input, OutputInterface $output) {
+		// Explicitly specified password
+		if ($input->getOption('password')) {
+			return;
+		}
+
+		// Read from stdin. stream_set_blocking is used to prevent blocking
+		// when nothing is passed via stdin.
+		stream_set_blocking(STDIN, 0);
+		$password = file_get_contents('php://stdin');
+		stream_set_blocking(STDIN, 1);
+		if (trim($password) !== '') {
+			$input->setOption('password', $password);
+			return;
+		}
+
+		// Read password by interacting
+		if ($input->isInteractive()) {
+			/** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
+			$dialog = $this->getHelperSet()->get('dialog');
+			$password = $dialog->askHiddenResponse(
+				$output,
+				'<question>What is the database password?</question>',
+				false
+			);
+			$input->setOption('password', $password);
+			return;
+		}
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$this->validateInput($input, $output);
+		$this->readPassword($input, $output);
+
+		$fromDB = \OC_DB::getConnection();
+		$toDB = $this->getToDBConnection($input, $output);
+
+		if ($input->getOption('clear-schema')) {
+			$this->clearSchema($toDB, $input, $output);
+		}
+
+		$this->createSchema($toDB, $input, $output);
+
+		$toTables = $this->getTables($toDB);
+		$fromTables = $this->getTables($fromDB);
+
+		// warn/fail if there are more tables in 'from' database
+		$extraFromTables = array_diff($fromTables, $toTables);
+		if (!empty($extraFromTables)) {
+			$output->writeln('<comment>The following tables will not be converted:</comment>');
+			$output->writeln($extraFromTables);
+			if (!$input->getOption('all-apps')) {
+				$output->writeln('<comment>Please note that tables belonging to available but currently not installed apps</comment>');
+				$output->writeln('<comment>can be included by specifying the --all-apps option.</comment>');
+			}
+			/** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
+			$dialog = $this->getHelperSet()->get('dialog');
+			if (!$dialog->askConfirmation(
+				$output,
+				'<question>Continue with the conversion?</question>',
+				false
+			)) {
+				return;
+			}
+		}
+		$intersectingTables = array_intersect($toTables, $fromTables);
+		$this->convertDB($fromDB, $toDB, $intersectingTables, $input, $output);
+	}
+
+	protected function createSchema(Connection $toDB, InputInterface $input, OutputInterface $output) {
+		$output->writeln('<info>Creating schema in new database</info>');
+		$schemaManager = new \OC\DB\MDB2SchemaManager($toDB);
+		$schemaManager->createDbFromStructure(\OC::$SERVERROOT.'/db_structure.xml');
+		$apps = $input->getOption('all-apps') ? \OC_App::getAllApps() : \OC_App::getEnabledApps();
+		foreach($apps as $app) {
+			if (file_exists(\OC_App::getAppPath($app).'/appinfo/database.xml')) {
+				$schemaManager->createDbFromStructure(\OC_App::getAppPath($app).'/appinfo/database.xml');
+			}
+		}
+	}
+
+	protected function getToDBConnection(InputInterface $input, OutputInterface $output) {
+		$type = $input->getArgument('type');
+		$connectionParams = array(
+			'host' => $input->getArgument('hostname'),
+			'user' => $input->getArgument('username'),
+			'password' => $input->getOption('password'),
+			'dbname' => $input->getArgument('database'),
+			'tablePrefix' => $this->config->getValue('dbtableprefix', 'oc_'),
+		);
+		if ($input->getOption('port')) {
+			$connectionParams['port'] = $input->getOption('port');
+		}
+		return $this->connectionFactory->getConnection($type, $connectionParams);
+	}
+
+	protected function clearSchema(Connection $db, InputInterface $input, OutputInterface $output) {
+		$toTables = $this->getTables($db);
+		if (!empty($toTables)) {
+			$output->writeln('<info>Clearing schema in new database</info>');
+		}
+		foreach($toTables as $table) {
+			$db->getSchemaManager()->dropTable($table);
+		}
+	}
+
+	protected function getTables(Connection $db) {
+		return $db->getSchemaManager()->listTableNames();
+	}
+
+	protected function copyTable(Connection $fromDB, Connection $toDB, $table, InputInterface $input, OutputInterface $output) {
+		/** @var $progress \Symfony\Component\Console\Helper\ProgressHelper */
+		$progress = $this->getHelperSet()->get('progress');
+		$query = 'SELECT COUNT(*) FROM '.$table;
+		$count = $fromDB->fetchColumn($query);
+		$query = 'SELECT * FROM '.$table;
+		$statement = $fromDB->executeQuery($query);
+		$progress->start($output, $count);
+		$progress->setRedrawFrequency($count > 100 ? 5 : 1);
+		while($row = $statement->fetch()) {
+			$progress->advance();
+			if ($input->getArgument('type') === 'oci') {
+				$data = $row;
+			} else {
+				$data = array();
+				foreach ($row as $columnName => $value) {
+					$data[$toDB->quoteIdentifier($columnName)] = $value;
+				}
+			}
+			$toDB->insert($table, $data);
+		}
+		$progress->finish();
+	}
+
+	protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
+		$this->config->setValue('maintenance', true);
+		try {
+			// copy table rows
+			foreach($tables as $table) {
+				$output->writeln($table);
+				$this->copyTable($fromDB, $toDB, $table, $input, $output);
+			}
+			if ($input->getArgument('type') === 'pgsql') {
+				$tools = new \OC\DB\PgSqlTools;
+				$tools->resynchronizeDatabaseSequences($toDB);
+			}
+			// save new database config
+			$this->saveDBInfo($input);
+		} catch(\Exception $e) {
+			$this->config->setValue('maintenance', false);
+			throw $e;
+		}
+		$this->config->setValue('maintenance', false);
+	}
+
+	protected function saveDBInfo(InputInterface $input) {
+		$type = $input->getArgument('type');
+		$username = $input->getArgument('username');
+		$dbhost = $input->getArgument('hostname');
+		$dbname = $input->getArgument('database');
+		$password = $input->getOption('password');
+		if ($input->getOption('port')) {
+			$dbhost .= ':'.$input->getOption('port');
+		}
+
+		$this->config->setValue('dbtype', $type);
+		$this->config->setValue('dbname', $dbname);
+		$this->config->setValue('dbhost', $dbhost);
+		$this->config->setValue('dbuser', $username);
+		$this->config->setValue('dbpassword', $password);
+	}
+}
diff --git a/core/command/maintenance/repair.php b/core/command/maintenance/repair.php
index c5ef0c55cc0..310c01fbe2a 100644
--- a/core/command/maintenance/repair.php
+++ b/core/command/maintenance/repair.php
@@ -29,7 +29,7 @@ class Repair extends Command {
 	protected function configure() {
 		$this
 			->setName('maintenance:repair')
-			->setDescription('set single user mode');
+			->setDescription('repair this installation');
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
diff --git a/core/command/user/lastseen.php b/core/command/user/lastseen.php
new file mode 100644
index 00000000000..7a8db013e3a
--- /dev/null
+++ b/core/command/user/lastseen.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright (c) 2014 Arthur Schiwon <blizzz@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command\User;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+
+class LastSeen extends Command {
+	protected function configure() {
+		$this
+			->setName('user:lastseen')
+			->setDescription('shows when the user was logged it last time')
+			->addArgument(
+				'uid',
+				InputArgument::REQUIRED,
+				'the username'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$userManager = \OC::$server->getUserManager();
+		$user = $userManager->get($input->getArgument('uid'));
+		if(is_null($user)) {
+			$output->writeln('User does not exist');
+			return;
+		}
+
+		$lastLogin = $user->getLastLogin();
+		if($lastLogin === 0) {
+			$output->writeln('User ' . $user->getUID() .
+				' has never logged in, yet.');
+		} else {
+			$date = new \DateTime();
+			$date->setTimestamp($lastLogin);
+			$output->writeln($user->getUID() .
+				'`s last login: ' . $date->format('d.m.Y H:i'));
+		}
+	}
+}
diff --git a/core/css/apps.css b/core/css/apps.css
index a0bb262854d..377878467c0 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -178,6 +178,9 @@
 	bottom: 0;
 	border-top: 1px solid #ccc;
 }
+#app-settings.opened #app-settings-content {
+	display: block;
+}
 #app-settings-header {
 	background-color: #eee;
 }
diff --git a/core/css/fixes.css b/core/css/fixes.css
index a33afd5cf77..15635950746 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -10,6 +10,21 @@
 	background-image: url('../img/actions/delete-hover.png');
 }
 
+.lte9 .icon-triangle-e {
+	background-image: url('../img/actions/triangle-e.png');
+}
+.lte9 .icon-triangle-n {
+	background-image: url('../img/actions/triangle-n.png');
+}
+.lte9 .icon-triangle-s {
+	background-image: url('../img/actions/triangle-s.png');
+}
+.lte9 .icon-settings,
+.lte9 .settings-button {
+	background-image: url('../img/actions/settings.png');
+}
+
+
 /* IE8 needs background to be set to same color to make transparency look good. */
 .lte9 #body-login form input[type="text"] {
 	border: 1px solid lightgrey; /* use border to add 1px line between input fields */
diff --git a/core/css/icons.css b/core/css/icons.css
index cdfdd8e43ef..75d66a773a1 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -22,11 +22,6 @@
 	background-image: url('../img/loading-small.gif');
 }
 
-.icon-noise {
-	background-image: url('../img/noise.png');
-	background-repeat: repeat;
-}
-
 
 
 
diff --git a/core/css/mobile.css b/core/css/mobile.css
index fd0628d7e28..01852613062 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -1,5 +1,26 @@
 @media only screen and (max-width: 768px) {
 
+#body-login #header {
+	padding-top: 10px;
+}
+
+#body-login .wrapper {
+	display: -webkit-box;
+	-webkit-box-orient: horizontal;
+	-webkit-box-pack: center;
+	-webkit-box-align: center;
+
+	display: -moz-box;
+	-moz-box-orient: horizontal;
+	-moz-box-pack: center;
+	-moz-box-align: center;
+
+	display: box;
+	box-orient: horizontal;
+	box-pack: center;
+	box-align: center;
+}
+
 /* show caret indicator next to logo to make clear it is tappable */
 #owncloud.menutoggle {
 	background-image: url('../img/actions/caret.svg');
diff --git a/core/css/share.css b/core/css/share.css
index 4ae3b77757e..1527a3a0c0f 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -11,7 +11,7 @@
 	margin-right:112px;
 	position:absolute;
 	right:0;
-	width:320px;
+	width:420px;
 	z-index:500;
 	padding:16px;
 }
diff --git a/core/css/styles.css b/core/css/styles.css
index 26aaa1be944..423c40f6184 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -33,7 +33,7 @@ body {
 	z-index: 100;
 	height: 45px;
 	line-height: 2.5em;
-	background: #1d2d44 url('../img/noise.png') repeat;
+	background-color: #1d2d44;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }
@@ -41,12 +41,12 @@ body {
 #body-login {
 	text-align: center;
 	background: #1d2d44; /* Old browsers */
-	background: url('../img/noise.png'), -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
-	background: url('../img/noise.png'), -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
-	background: url('../img/noise.png'), -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
-	background: url('../img/noise.png'), -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
-	background: url('../img/noise.png'), -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
-	background: url('../img/noise.png'), linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
+	background: -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
+	background: -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
+	background: -o-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Opera11.10+ */
+	background: -ms-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* IE10+ */
+	background: linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
 	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
 }
 
@@ -352,9 +352,9 @@ input[type="submit"].enabled {
 #body-login #header {
 	padding-top: 100px;
 }
-/* Fix background gradient */
 #body-login {
-	background-attachment: fixed;
+	background-attachment: fixed; /* fix background gradient */
+	height: 100%; /* fix sticky footer */
 }
 
 /* Dark subtle label text */
@@ -699,7 +699,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 	width: 80px;
 	margin-top:45px;
 	z-index: 75;
-	background: #383c43 url('../img/noise.png') repeat;
+	background-color: #383c43;
 	overflow-y: auto;
 	overflow-x: hidden;
 	-moz-box-sizing:border-box; box-sizing:border-box;
@@ -791,7 +791,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #expand:hover img, #expand:focus img, #expand:active img { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 #expanddiv {
 	position:absolute; right:0; top:45px; z-index:76; display:none;
-	background:#383c43 url('../img/noise.png') repeat;
+	background-color: #383c43;
 	border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
 	box-shadow:0 0 7px rgb(29,45,68);
 	-moz-box-sizing: border-box; box-sizing: border-box;
diff --git a/core/img/noise.png b/core/img/noise.png
deleted file mode 100644
index 6c06c8a4d6d..00000000000
--- a/core/img/noise.png
+++ /dev/null
diff --git a/core/js/config.php b/core/js/config.php
index 7e23f3e2e41..80b1b6d242d 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -25,6 +25,13 @@ foreach(OC_App::getEnabledApps() as $app) {
 	$apps_paths[$app] = OC_App::getAppWebPath($app);
 }
 
+$defaultExpireDateEnabled = \OCP\Config::getAppValue('core', 'shareapi_default_expire_date', 'no');
+$defaultExpireDate = $enforceDefaultExpireDate = null;
+if ($defaultExpireDateEnabled === 'yes') {
+	$defaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7');
+	$enforceDefaultExpireDate = \OCP\Config::getAppValue('core', 'shareapi_enforce_expire_date', 'no');
+}
+
 $array = array(
 	"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
 	"oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false',
@@ -67,6 +74,16 @@ $array = array(
 			'versionstring'		=> OC_Util::getVersionString(),
 		)
 	),
+	"oc_appconfig" => json_encode(
+			array("core" => array(
+				'defaultExpireDateEnabled' => $defaultExpireDateEnabled,
+				'defaultExpireDate' => $defaultExpireDate,
+				'defaultExpireDateEnforced' => $enforceDefaultExpireDate,
+				'enforcePasswordForPublicLink' => \OCP\Util::isPublicLinkPasswordRequired(),
+				'sharingDisabledForUser' => \OCP\Util::isSharingDisabledForUser(),
+				)
+			)
+	),
 	"oc_defaults" => json_encode(
 		array(
 			'entity' => $defaults->getEntity(),
diff --git a/core/js/core.json b/core/js/core.json
index 05c2a17a679..f1e0ba883d0 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -14,6 +14,7 @@
 		"jquery.ocdialog.js",
 		"oc-dialogs.js",
 		"js.js",
+		"share.js",
 		"octemplate.js",
 		"eventsource.js",
 		"config.js",
diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js
index 02cd6ac1466..e2433f5f980 100644
--- a/core/js/jquery.ocdialog.js
+++ b/core/js/jquery.ocdialog.js
@@ -67,8 +67,8 @@
 				self.parent = self.$dialog.parent().length > 0 ? self.$dialog.parent() : $('body');
 				var pos = self.parent.position();
 				self.$dialog.css({
-					left: pos.left + (self.parent.width() - self.$dialog.outerWidth())/2,
-					top: pos.top + (self.parent.height() - self.$dialog.outerHeight())/2
+					left: pos.left + ($(window).innerWidth() - self.$dialog.outerWidth())/2,
+					top: pos.top + ($(window).innerHeight() - self.$dialog.outerHeight())/2
 				});
 			});
 
@@ -160,10 +160,16 @@
 			}
 			this.parent = this.$dialog.parent().length > 0 ? this.$dialog.parent() : $('body');
 			content_height = Math.min(content_height, this.parent.height()-20);
-			this.element.css({
-				height: content_height + 'px',
-				width: this.$dialog.innerWidth()-20 + 'px'
-			});
+			if (content_height> 0) {
+				this.element.css({
+					height: content_height + 'px',
+					width: this.$dialog.innerWidth()-20 + 'px'
+				});
+			} else {
+				this.element.css({
+					width : this.$dialog.innerWidth() - 20 + 'px'
+				});
+			}
 		},
 		_createOverlay: function() {
 			if(!this.options.modal) {
diff --git a/core/js/js.js b/core/js/js.js
index 27bc3c651e3..38b97590430 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1319,6 +1319,114 @@ OC.Util = {
 };
 
 /**
+ * Utility class for the history API,
+ * includes fallback to using the URL hash when
+ * the browser doesn't support the history API.
+ */
+OC.Util.History = {
+	_handlers: [],
+
+	/**
+	 * Push the current URL parameters to the history stack
+	 * and change the visible URL.
+	 * Note: this includes a workaround for IE8/IE9 that uses
+	 * the hash part instead of the search part.
+	 *
+	 * @param params to append to the URL, can be either a string
+	 * or a map
+	 */
+	pushState: function(params) {
+		var strParams;
+		if (typeof(params) === 'string') {
+			strParams = params;
+		}
+		else {
+			strParams = OC.buildQueryString(params);
+		}
+		if (window.history.pushState) {
+			var url = location.pathname + '?' + strParams;
+			window.history.pushState(params, '', url);
+		}
+		// use URL hash for IE8
+		else {
+			window.location.hash = '?' + strParams;
+			// inhibit next onhashchange that just added itself
+			// to the event queue
+			this._cancelPop = true;
+		}
+	},
+
+	/**
+	 * Add a popstate handler
+	 *
+	 * @param handler function
+	 */
+	addOnPopStateHandler: function(handler) {
+		this._handlers.push(handler);
+	},
+
+	/**
+	 * Parse a query string from the hash part of the URL.
+	 * (workaround for IE8 / IE9)
+	 */
+	_parseHashQuery: function() {
+		var hash = window.location.hash,
+			pos = hash.indexOf('?');
+		if (pos >= 0) {
+			return hash.substr(pos + 1);
+		}
+		return '';
+	},
+
+	_decodeQuery: function(query) {
+		return query.replace(/\+/g, ' ');
+	},
+
+	/**
+	 * Parse the query/search part of the URL.
+	 * Also try and parse it from the URL hash (for IE8)
+	 *
+	 * @return map of parameters
+	 */
+	parseUrlQuery: function() {
+		var query = this._parseHashQuery(),
+			params;
+		// try and parse from URL hash first
+		if (query) {
+			params = OC.parseQueryString(this._decodeQuery(query));
+		}
+		// else read from query attributes
+		if (!params) {
+			params = OC.parseQueryString(this._decodeQuery(location.search));
+		}
+		return params || {};
+	},
+
+	_onPopState: function(e) {
+		if (this._cancelPop) {
+			this._cancelPop = false;
+			return;
+		}
+		var params;
+		if (!this._handlers.length) {
+			return;
+		}
+		params = (e && e.state) || this.parseUrlQuery() || {};
+		for (var i = 0; i < this._handlers.length; i++) {
+			this._handlers[i](params);
+		}
+	}
+};
+
+// fallback to hashchange when no history support
+if (window.history.pushState) {
+	window.onpopstate = _.bind(OC.Util.History._onPopState, OC.Util.History);
+}
+else {
+	$(window).on('hashchange', _.bind(OC.Util.History._onPopState, OC.Util.History));
+}
+
+/**
  * Get a variable by name
  * @param {string} name
  * @return {*}
@@ -1368,6 +1476,11 @@ OC.set=function(name, value) {
 })();
 
 /**
+ * Namespace for apps
+ */
+window.OCA = {};
+
+/**
  * select a range in an input field
  * @link http://stackoverflow.com/questions/499126/jquery-set-cursor-position-in-text-area
  * @param {type} start
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 11833f12e2d..54b9442af27 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -19,7 +19,7 @@
  *
  */
 
-/* global OC, t, alert */
+/* global OC, t, alert, $ */
 
 /**
  * this class to ease the usage of jquery dialogs
@@ -62,6 +62,65 @@ var OCdialogs = {
 		this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal);
 	},
 	/**
+	 * displays prompt dialog
+	 * @param text content of dialog
+	 * @param title dialog title
+	 * @param callback which will be triggered when user presses YES or NO
+	 *        (true or false would be passed to callback respectively)
+	 * @param modal make the dialog modal
+	 * @param name name of the input field
+	 * @param password whether the input should be a password input
+	 */
+	prompt: function (text, title, callback, modal, name, password) {
+		$.when(this._getMessageTemplate()).then(function ($tmpl) {
+			var dialogName = 'oc-dialog-' + OCdialogs.dialogsCounter + '-content';
+			var dialogId = '#' + dialogName;
+			var $dlg = $tmpl.octemplate({
+				dialog_name: dialogName,
+				title      : title,
+				message    : text,
+				type       : 'notice'
+			});
+			var input = $('<input/>');
+			input.attr('type', password ? 'password' : 'text').attr('id', dialogName + '-input');
+			var label = $('<label/>').attr('for', dialogName + '-input').text(name + ': ');
+			$dlg.append(label);
+			$dlg.append(input);
+			if (modal === undefined) {
+				modal = false;
+			}
+			$('body').append($dlg);
+			var buttonlist = [
+				{
+					text         : t('core', 'Yes'),
+					click        : function () {
+						if (callback !== undefined) {
+							callback(true, input.val());
+						}
+						$(dialogId).ocdialog('close');
+					},
+					defaultButton: true
+				},
+				{
+					text : t('core', 'No'),
+					click: function () {
+						if (callback !== undefined) {
+							callback(false, input.val());
+						}
+						$(dialogId).ocdialog('close');
+					}
+				}
+			];
+
+			$(dialogId).ocdialog({
+				closeOnEscape: true,
+				modal        : modal,
+				buttons      : buttonlist
+			});
+			OCdialogs.dialogsCounter++;
+		});
+	},
+	/**
 	 * show a file picker to pick a file from
 	 * @param title dialog title
 	 * @param callback which will be triggered when user presses Choose
@@ -292,7 +351,7 @@ var OCdialogs = {
 
 			conflict.find('.filename').text(original.name);
 			conflict.find('.original .size').text(humanFileSize(original.size));
-			conflict.find('.original .mtime').text(formatDate(original.mtime*1000));
+			conflict.find('.original .mtime').text(formatDate(original.mtime));
 			// ie sucks
 			if (replacement.size && replacement.lastModifiedDate) {
 				conflict.find('.replacement .size').text(humanFileSize(replacement.size));
@@ -315,9 +374,9 @@ var OCdialogs = {
 
 			//set more recent mtime bold
 			// ie sucks
-			if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime*1000) {
+			if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime) {
 				conflict.find('.replacement .mtime').css('font-weight', 'bold');
-			} else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime*1000) {
+			} else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime) {
 				conflict.find('.original .mtime').css('font-weight', 'bold');
 			} else {
 				//TODO add to same mtime collection?
diff --git a/core/js/share.js b/core/js/share.js
index 2813570f718..d013f257579 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -136,7 +136,21 @@ OC.Share={
 
 		return data;
 	},
-	share:function(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, callback) {
+	share:function(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, expirationDate, callback) {
+		// Add a fallback for old share() calls without expirationDate.
+		// We should remove this in a later version,
+		// after the Apps have been updated.
+		if (typeof callback === 'undefined' &&
+			typeof expirationDate === 'function') {
+			callback = expirationDate;
+			expirationDate = '';
+			console.warn(
+				"Call to 'OC.Share.share()' with too few arguments. " +
+				"'expirationDate' was assumed to be 'callback'. " +
+				"Please revisit the call and fix the list of arguments."
+			);
+		}
+
 		$.post(OC.filePath('core', 'ajax', 'share.php'),
 			{
 				action: 'share',
@@ -145,7 +159,8 @@ OC.Share={
 				shareType: shareType,
 				shareWith: shareWith,
 				permissions: permissions,
-				itemSourceName: itemSourceName
+				itemSourceName: itemSourceName,
+				expirationDate: expirationDate
 			}, function (result) {
 			if (result && result.status === 'success') {
 				if (callback) {
@@ -219,11 +234,22 @@ OC.Share={
 				html += '<div id="link">';
 				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share link')+'</label>';
 				html += '<br />';
+
+				var defaultExpireMessage = '';
+				if ((itemType === 'folder' || itemType === 'file') && oc_appconfig.core.defaultExpireDateEnabled === 'yes') {
+					if (oc_appconfig.core.defaultExpireDateEnforced === 'yes') {
+						defaultExpireMessage = t('core', 'The public link will expire no later than {days} days after it is created',  {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>';
+					} else {
+						defaultExpireMessage = t('core', 'By default the public link will expire after {days} days', {'days': oc_appconfig.core.defaultExpireDate}) + '<br/>';
+					}
+				}
+
 				html += '<input id="linkText" type="text" readonly="readonly" />';
 				html += '<input type="checkbox" name="showPassword" id="showPassword" value="1" style="display:none;" /><label for="showPassword" style="display:none;">'+t('core', 'Password protect')+'</label>';
 				html += '<div id="linkPass">';
-				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
+				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Choose a password for the public link')+'" />';
 				html += '</div>';
+
 				if (itemType === 'folder' && (possiblePermissions & OC.PERMISSION_CREATE) && publicUploadEnabled === 'yes') {
 					html += '<div id="allowPublicUploadWrapper" style="display:none;">';
 					html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
@@ -239,6 +265,7 @@ OC.Share={
 			html += '<div id="expiration">';
 			html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
 			html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />';
+			html += '<div id="defaultExpireMessage">'+defaultExpireMessage+'</div>';
 			html += '</div>';
 			dropDownEl = $(html);
 			dropDownEl = dropDownEl.appendTo(appendTo);
@@ -291,6 +318,10 @@ OC.Share={
 				var itemType = $('#dropdown').data('item-type');
 				var itemSource = $('#dropdown').data('item-source');
 				var itemSourceName = $('#dropdown').data('item-source-name');
+				var expirationDate = '';
+				if ( $('#expirationCheckbox').is(':checked') === true ) {
+					expirationDate = $( "#expirationDate" ).val();
+				}
 				var shareType = selected.item.value.shareType;
 				var shareWith = selected.item.value.shareWith;
 				$(this).val(shareWith);
@@ -310,7 +341,7 @@ OC.Share={
 					permissions = permissions | OC.PERMISSION_SHARE;
 				}
 
-				OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, function() {
+				OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, itemSourceName, expirationDate, function() {
 					OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions);
 					$('#shareWith').val('');
 					OC.Share.updateIcon(itemType, itemSource);
@@ -347,8 +378,8 @@ OC.Share={
 					}
 				})
 				.data("ui-autocomplete")._renderItem = function( ul, item ) {
-					return $( "<li>" )
-						.append( "<a>" + item.displayname + "<br>" + item.email + "</a>" )
+					return $('<li>')
+						.append('<a>' + escapeHTML(item.displayname) + "<br>" + escapeHTML(item.email) + '</a>' )
 						.appendTo( ul );
 				};
 			}
@@ -420,7 +451,7 @@ OC.Share={
 			}
 			var html = '<li style="clear: both;" data-share-type="'+escapeHTML(shareType)+'" data-share-with="'+escapeHTML(shareWith)+'" title="' + escapeHTML(shareWith) + '">';
 			var showCrudsButton;
-			html += '<a href="#" class="unshare"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
+			html += '<a href="#" class="unshare"><img class="svg" alt="'+t('core', 'Unshare')+'" title="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
 			html += '<span class="username">' + escapeHTML(shareWithDisplayName) + '</span>';
 			var mailNotificationEnabled = $('input:hidden[name=mailNotificationEnabled]').val();
 			if (mailNotificationEnabled === 'yes') {
@@ -433,7 +464,7 @@ OC.Share={
 			if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
 				html += '<label><input type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label> ';
 			}
-			showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
+			showCrudsButton = '<a href="#" class="showCruds"><img class="svg" alt="'+t('core', 'access control')+'" title="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
 			html += '<div class="cruds" style="display:none;">';
 				if (possiblePermissions & OC.PERMISSION_CREATE) {
 					html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />'+t('core', 'create')+'</label>';
@@ -464,6 +495,10 @@ OC.Share={
 	showLink:function(token, password, itemSource) {
 		OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
 		$('#linkCheckbox').attr('checked', true);
+		
+		//check itemType
+		var linkSharetype=$('#dropdown').data('item-type');
+		
 		if (! token) {
 			//fallback to pre token link
 			var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
@@ -477,32 +512,43 @@ OC.Share={
 			var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file);
 		} else {
 			//TODO add path param when showing a link to file in a subfolder of a public link share
-			var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&t='+token;
+			var service='';
+			if(linkSharetype === 'folder' || linkSharetype === 'file'){
+				service='files';
+			}else{
+				service=linkSharetype;
+			}
+			
+			var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service='+service+'&t='+token;
+
 		}
 		$('#linkText').val(link);
 		$('#linkText').show('blind');
 		$('#linkText').css('display','block');
-		$('#showPassword').show();
-		$('#showPassword+label').show();
+		if (oc_appconfig.core.enforcePasswordForPublicLink === false || password === null) {
+			$('#showPassword').show();
+			$('#showPassword+label').show();
+		}
 		if (password != null) {
 			$('#linkPass').show('blind');
 			$('#showPassword').attr('checked', true);
 			$('#linkPassText').attr('placeholder', '**********');
 		}
 		$('#expiration').show();
+		$('#defaultExpireMessage').show();
 		$('#emailPrivateLink #email').show();
 		$('#emailPrivateLink #emailButton').show();
 		$('#allowPublicUploadWrapper').show();
 	},
 	hideLink:function() {
 		$('#linkText').hide('blind');
+		$('#defaultExpireMessage').hide();
 		$('#showPassword').hide();
 		$('#showPassword+label').hide();
-		$('#linkPass').hide();
+		$('#linkPass').hide('blind');
 		$('#emailPrivateLink #email').hide();
 		$('#emailPrivateLink #emailButton').hide();
 		$('#allowPublicUploadWrapper').hide();
-		$('#expirationDate').hide();
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
@@ -628,22 +674,33 @@ $(document).ready(function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		var itemSourceName = $('#dropdown').data('item-source-name');
+		var expirationDate = '';
+		if ($('#expirationCheckbox').is(':checked') === true) {
+			expirationDate = $( "#expirationDate" ).val();
+		}
 		if (this.checked) {
 			// Create a link
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, function(data) {
-				OC.Share.showLink(data.token, null, itemSource);
-				OC.Share.updateIcon(itemType, itemSource);
-			});
+			if (oc_appconfig.core.enforcePasswordForPublicLink === false) {
+				OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, itemSourceName, expirationDate, function(data) {
+					OC.Share.showLink(data.token, null, itemSource);
+					OC.Share.updateIcon(itemType, itemSource);
+				});
+			} else {
+				$('#linkPass').toggle('blind');
+				$('#linkPassText').focus();
+			}
 		} else {
 			// Delete private link
-			OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
-				OC.Share.hideLink();
-				OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
-				OC.Share.updateIcon(itemType, itemSource);
-				if (typeof OC.Share.statuses[itemSource] === 'undefined') {
-					$('#expiration').hide('blind');
-				}
-			});
+			OC.Share.hideLink();
+			if ($('#linkText').val() !== '') {
+				OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
+					OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false;
+					OC.Share.updateIcon(itemType, itemSource);
+					if (typeof OC.Share.statuses[itemSource] === 'undefined') {
+						$('#expiration').hide('blind');
+					}
+				});
+			}
 		}
 	});
 
@@ -660,6 +717,10 @@ $(document).ready(function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
 		var itemSourceName = $('#dropdown').data('item-source-name');
+		var expirationDate = '';
+		if ($('#expirationCheckbox').is(':checked') === true) {
+			expirationDate = $( "#expirationDate" ).val();
+		}
 		var permissions = 0;
 
 		// Calculate permissions
@@ -670,7 +731,7 @@ $(document).ready(function() {
 		}
 
 		// Update the share information
-		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName, function(data) {
+		OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', permissions, itemSourceName, expirationDate, function(data) {
 		});
 	});
 
@@ -715,11 +776,16 @@ $(document).ready(function() {
 				permissions = OC.PERMISSION_READ;
 			}
 
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, itemSourceName, function() {
-				console.log("password set to: '" + linkPassText.val() +"' by event: " + event.type);
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $('#linkPassText').val(), permissions, itemSourceName, function(data) {
 				linkPassText.val('');
 				linkPassText.attr('placeholder', t('core', 'Password protected'));
+
+				if (oc_appconfig.core.enforcePasswordForPublicLink) {
+					OC.Share.showLink(data.token, "password set", itemSource);
+					OC.Share.updateIcon(itemType, itemSource);
+				}
 			});
+
 		}
 	});
 
@@ -734,6 +800,9 @@ $(document).ready(function() {
 					OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error'));
 				}
 				$('#expirationDate').hide('blind');
+				if (oc_appconfig.core.defaultExpireDateEnforced === 'no') {
+					$('#defaultExpireMessage'). show('blind');
+				}
 			});
 		}
 	});
@@ -756,6 +825,10 @@ $(document).ready(function() {
 				expirationDateField.tipsy({gravity: 'n', fade: true});
 				expirationDateField.tipsy('show');
 				expirationDateField.addClass('error');
+			} else {
+				if (oc_appconfig.core.defaultExpireDateEnforced === 'no') {
+					$('#defaultExpireMessage'). hide('blind');
+				}
 			}
 		});
 	});
diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js
index d86cd81cda8..b9be9188a4e 100644
--- a/core/js/tests/specHelper.js
+++ b/core/js/tests/specHelper.js
@@ -63,6 +63,9 @@ window.oc_config = {
 	session_lifetime: 600 * 1000,
 	session_keepalive: false
 };
+window.oc_appconfig = {
+	core: {}
+};
 window.oc_defaults = {};
 
 // global setup for all tests
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
new file mode 100644
index 00000000000..a487b71fdbb
--- /dev/null
+++ b/core/js/tests/specs/shareSpec.js
@@ -0,0 +1,97 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/* global oc_appconfig */
+describe('OC.Share tests', function() {
+	describe('dropdown', function() {
+		var $container;
+		var oldAppConfig;
+		var loadItemStub;
+		var autocompleteStub;
+		beforeEach(function() {
+			$('#testArea').append($('<div id="shareContainer"></div>'));
+			$container = $('#shareContainer');
+			/* jshint camelcase:false */
+			oldAppConfig = oc_appconfig.core;
+			loadItemStub = sinon.stub(OC.Share, 'loadItem');
+
+			loadItemStub.returns({
+				reshare: [],
+				shares: []
+			});
+
+			autocompleteStub = sinon.stub($.fn, 'autocomplete', function() {
+				// dummy container with the expected attributes
+				var $el = $('<div></div>').data('ui-autocomplete', {});
+				return $el;
+			});
+		});
+		afterEach(function() {
+			/* jshint camelcase:false */
+			oc_appconfig.core = oldAppConfig;
+			loadItemStub.restore();
+
+			autocompleteStub.restore();
+		});
+		it('calls loadItem with the correct arguments', function() {
+			OC.Share.showDropDown(
+				'file',
+			   	123,
+			   	$container,
+				'http://localhost/dummylink',
+				31,
+				'shared_file_name.txt'
+			);
+			expect(loadItemStub.calledOnce).toEqual(true);
+			expect(loadItemStub.calledWith('file', 123)).toEqual(true);
+		});
+		it('shows the dropdown with default values', function() {
+			var $el;
+			OC.Share.showDropDown(
+				'file',
+			   	123,
+			   	$container,
+				'http://localhost/dummylink',
+				31,
+				'shared_file_name.txt'
+			);
+			$el = $container.find('#dropdown');
+			expect($el.length).toEqual(1);
+			expect($el.attr('data-item-type')).toEqual('file');
+			expect($el.attr('data-item-source')).toEqual('123');
+			// TODO: expect that other parts are rendered correctly
+		});
+		it('shows default expiration date when set', function() {
+			oc_appconfig.core.defaultExpireDateEnabled = "yes";
+			oc_appconfig.core.defaultExpireDate = '';
+			// TODO: expect that default date was set
+		});
+		it('shows default expiration date is set but disabled', function() {
+			oc_appconfig.core.defaultExpireDateEnabled = "no";
+			oc_appconfig.core.defaultExpireDate = '';
+			// TODO: expect that default date was NOT set
+		});
+		// TODO: test password field visibility (whenever enforced or not)
+		// TODO: check link share field visibility based on whether it is allowed
+		// TODO: check public upload visibility based on config
+	});
+});
+
diff --git a/core/js/visitortimezone.js b/core/js/visitortimezone.js
index ee0105c783d..d9b63a10879 100644
--- a/core/js/visitortimezone.js
+++ b/core/js/visitortimezone.js
@@ -1,4 +1,10 @@
 $(document).ready(function () {
 		var visitortimezone = (-new Date().getTimezoneOffset() / 60);
 		$('#timezone-offset').val(visitortimezone);
+
+		// only enable the submit button once we are sure that the timezone is set
+		var $loginForm = $('form[name="login"]');
+		if ($loginForm.length) {
+			$loginForm.find('input#submit').prop('disabled', false);
+		}
 });
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index 79efa67242c..50523b02526 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n maande gelede","%n maande gelede"),
 "last year" => "verlede jaar",
 "years ago" => "jare gelede",
-"Choose" => "Kies",
 "Yes" => "Ja",
 "No" => "Nee",
+"Choose" => "Kies",
 "Ok" => "OK",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "New Files" => "Nuwe leêrs",
@@ -60,7 +60,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Met jou en die groep {group} gedeel deur {owner}",
 "Shared with you by {owner}" => "Met jou gedeel deur {owner}",
 "Password protect" => "Beskerm met Wagwoord",
-"Password" => "Wagwoord",
 "Allow Public Upload" => "Laat Publieke Oplaai toe",
 "Email link to person" => "E-pos aan persoon",
 "Send" => "Stuur",
@@ -83,6 +82,7 @@ $TRANSLATIONS = array(
 "Error setting expiration date" => "Fout met opstel van verval datum",
 "Sending ..." => "Stuur ...",
 "Email sent" => "E-pos gestuur",
+"Warning" => "Waarskuwing",
 "The object type is not specified." => "Hierdie objek tipe is nie gespesifiseer nie.",
 "Add" => "Voeg by",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Die opdatering was nie suksesvol nie. Rapporteer die probleem by <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
@@ -113,6 +113,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jou data gids en leers is moontlik toeganklik vanaf die internet omdat die .htaccess leer nie werk nie.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
 "Create an <strong>admin account</strong>" => "Skep `n <strong>admin-rekening</strong>",
+"Password" => "Wagwoord",
 "Data folder" => "Data vouer",
 "Configure the database" => "Stel databasis op",
 "will be used" => "sal gebruik word",
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 16092348ec6..1eeb7f1eac6 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","","","","",""),
 "last year" => "السنةالماضية",
 "years ago" => "سنة مضت",
-"Choose" => "اختيار",
 "Yes" => "نعم",
 "No" => "لا",
+"Choose" => "اختيار",
 "Ok" => "موافق",
 "_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""),
 "Cancel" => "الغاء",
@@ -54,7 +54,6 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "شورك معك من قبل {owner}",
 "Share link" => "شارك الرابط",
 "Password protect" => "حماية كلمة السر",
-"Password" => "كلمة المرور",
 "Allow Public Upload" => "اسمح بالرفع للعامة",
 "Email link to person" => "ارسل الرابط بالبريد الى صديق",
 "Send" => "أرسل",
@@ -109,6 +108,7 @@ $TRANSLATIONS = array(
 "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\">documentation</a>." => "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
 "Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>",
+"Password" => "كلمة المرور",
 "Data folder" => "مجلد المعلومات",
 "Configure the database" => "أسس قاعدة البيانات",
 "will be used" => "سيتم استخدمه",
diff --git a/core/l10n/ast.php b/core/l10n/ast.php
index c813a5deb9e..a2072fdd3aa 100644
--- a/core/l10n/ast.php
+++ b/core/l10n/ast.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Couldn't send mail to following users: %s " => "Nun pudo dunviase'l corréu a los usuarios siguientes: %s",
 "Updated database" => "Base de datos anovada",
+"Unknown filetype" => "Triba de ficheru desconocida",
 "Invalid image" => "Imaxe inválida",
 "Sunday" => "Domingu",
 "Monday" => "Llunes",
@@ -33,13 +35,18 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("fai %n mes","fai %n meses"),
 "last year" => "añu caberu",
 "years ago" => "fai años",
-"Choose" => "Esbillar",
 "Yes" => "Sí",
 "No" => "Non",
+"Choose" => "Esbillar",
+"Ok" => "Aceutar",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"New Files" => "Ficheros nuevos",
+"Already existing files" => "Ficheros qu'esisten yá",
 "Which files do you want to keep?" => "¿Qué ficheros quies caltener?",
 "Cancel" => "Encaboxar",
 "Continue" => "Continuar",
+"(all selected)" => "(esbillao too)",
+"({count} selected)" => "(esbillaos {count})",
 "Very weak password" => "Contraseña mui feble",
 "Weak password" => "Contraseña feble",
 "So-so password" => "Contraseña pasable",
@@ -48,10 +55,23 @@ $TRANSLATIONS = array(
 "Shared" => "Compartíu",
 "Share" => "Compartir",
 "Error" => "Fallu",
+"Error while sharing" => "Fallu mientres la compartición",
+"Error while unsharing" => "Fallu mientres se dexaba de compartir",
+"Error while changing permissions" => "Fallu mientres camudaben los permisos",
+"Shared with you and the group {group} by {owner}" => "Compartíu contigo y col grupu {group} por {owner}",
+"Shared with you by {owner}" => "Compartíu contigo por {owner}",
 "Share link" => "Compartir enllaz",
-"Password" => "Contraseña",
+"Password protect" => "Protexer con contraseña",
+"Choose a password for the public link" => "Escueyi una contraseña pal enllaz públicu",
+"Email link to person" => "Enlláz de corréu electrónicu a la persona",
 "Send" => "Unviar",
+"Set expiration date" => "Afitar la data de caducidá",
+"Expiration date" => "Data de caducidá",
+"Share via email:" => "Compartir vía corréu electrónicu:",
+"No people found" => "Nun s'atoparon persones",
 "group" => "grupu",
+"Resharing is not allowed" => "Recompartir nun ta permitíu",
+"Shared in {item} with {user}" => "Compartíu en {item} con {user}",
 "Unshare" => "Dexar de compartir",
 "notify by email" => "notificar per corréu",
 "can edit" => "pue editar",
@@ -61,26 +81,68 @@ $TRANSLATIONS = array(
 "delete" => "desaniciar",
 "share" => "compartir",
 "Password protected" => "Contraseña protexida",
+"Error unsetting expiration date" => "Fallu desafitando la data de caducidá",
+"Error setting expiration date" => "Fallu afitando la fecha de caducidá",
+"Sending ..." => "Unviando ...",
 "Email sent" => "Corréu unviáu",
 "Warning" => "Avisu",
+"The object type is not specified." => "El tipu d'oxetu nun ta especificáu.",
 "Delete" => "Desaniciar",
 "Add" => "Amestar",
 "Edit tags" => "Editar etiquetes",
+"Please reload the page." => "Por favor, recarga la páxina",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'anovamientu fízose con ésitu. Por favor, informa d'esti problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comuña ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
+"Use the following link to reset your password: {link}" => "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
+"The link to reset your password has been sent to your email.<br>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 ." => "Dunviósete al to corréu l'enllaz pa reaniciar la to contraseña.<br>Si nun lu recibes dientro de dellos minutos, comprueba les tos carpetes de corréu puxarra.<br>Sinón, pues entrugar al to alministrador llocal.",
+"Request failed!<br>Did you make sure your email/username was right?" => "¡Petición fallida!<br>¿Asegurástite qué'l to nome d'usuariu/corréu tean bien?",
+"You will receive a link to reset your password via Email." => "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
 "Username" => "Nome d'usuariu",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Los tos ficheros tan cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru que facer, por favor contauta col to alministrador enantes de siguir. ¿De xuru quies continuar?",
+"Yes, I really want to reset my password now" => "Sí, quiero reaniciar daveres la mio contraseña agora",
 "Reset" => "Reaniciar",
+"Your password was reset" => "Restablecióse la contraseña",
+"To login page" => "Aniciar sesión na páxina",
 "New password" => "Contraseña nueva",
+"Reset password" => "Restablecer contraseña",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
 "For the best results, please consider using a GNU/Linux server instead." => "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
 "Personal" => "Personal",
 "Users" => "Usuarios",
+"Apps" => "Aplicaciones",
+"Admin" => "Alministrador",
 "Help" => "Ayuda",
+"Access forbidden" => "Accesu denegáu",
+"Cloud not found" => "Ñube non atopada",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
 "Cheers!" => "¡Salú!",
 "Security Warning" => "Avisu de seguridá",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Por favor, anova la to instalación de PHP pa usar %s de mou seguru.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nun ta disponible'l xenerador de númberos al debalu, por favor activa la estensión PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ensin un xenerador de númberos al debalu, un atacante podría aldovinar los tokens pa restablecer la contraseña y tomar el control de la cuenta.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
+"Create an <strong>admin account</strong>" => "Crea una <strong>cuenta d'alministrador</strong>",
+"Password" => "Contraseña",
+"Data folder" => "Carpeta de datos",
+"Configure the database" => "Configura la base de datos",
 "will be used" => "usaráse",
+"Database user" => "Usuariu de la base de datos",
+"Database password" => "Contraseña de la base de datos",
+"Database name" => "Nome de la base de datos",
+"Database tablespace" => "Espaciu de tables de la base de datos",
+"Database host" => "Agospiador de la base de datos",
+"Finish setup" => "Finar la configuración ",
 "Finishing …" => "Finando ...",
+"%s is available. Get more information on how to update." => "Ta disponible %s. Consigui más información en como anovar·",
 "Log out" => "Zarrar sesión",
+"Automatic logon rejected!" => "¡Aniciu de sesión automáticu refugáu!",
+"Please contact your administrator." => "Por favor, contauta col to alministrador",
 "Lost your password?" => "¿Escaeciesti la to contraseña?",
+"remember" => "recordar",
 "Log in" => "Aniciar sesión",
 "Alternative Logins" => "Anicios de sesión alternativos",
-"Thank you for your patience." => "Gracies pola to paciencia."
+"Thank you for your patience." => "Gracies pola to paciencia.",
+"Updating ownCloud to version %s, this may take a while." => "Anovando ownCloud a la versión %s, esto pue tardar un pocoñín"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/be.php b/core/l10n/be.php
index 383d2494d2c..d0c3b3ecba7 100644
--- a/core/l10n/be.php
+++ b/core/l10n/be.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","","",""),
 "last year" => "У мінулым годзе",
 "years ago" => "Гадоў таму",
-"Choose" => "Выбар",
 "Yes" => "Так",
 "No" => "Не",
+"Choose" => "Выбар",
 "Ok" => "Добра",
 "_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
 "Error" => "Памылка",
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 861d7370ed1..8653f2435cd 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "последната година",
 "years ago" => "последните години",
-"Choose" => "Избери",
 "Yes" => "Да",
 "No" => "Не",
+"Choose" => "Избери",
 "Ok" => "Добре",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Отказ",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Споделено с тебе и група {group} от {owner}",
 "Shared with you by {owner}" => "Споделено с тебе от {owner}",
 "Password protect" => "Защитено с парола",
-"Password" => "Парола",
 "Email link to person" => "Изпрати връзка до пощата на някои",
 "Send" => "Изпрати",
 "Set expiration date" => "Посочи дата на изтичане",
@@ -85,6 +84,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Достъпът е забранен",
 "Cloud not found" => "облакът не намерен",
 "Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
+"Password" => "Парола",
 "Data folder" => "Директория за данни",
 "Configure the database" => "Конфигуриране на базата",
 "will be used" => "ще се ползва",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index e9f46d686c1..c7a1c6545bb 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "গত বছর",
 "years ago" => "বছর পূর্বে",
-"Choose" => "বেছে নিন",
 "Yes" => "হ্যাঁ",
 "No" => "না",
+"Choose" => "বেছে নিন",
 "Ok" => "তথাস্তু",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "বাতির",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
 "Shared with you by {owner}" => "{owner} আপনার সাথে ভাগাভাগি করেছেন",
 "Password protect" => "কূটশব্দ সুরক্ষিত",
-"Password" => "কূটশব্দ",
 "Email link to person" => "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
 "Send" => "পাঠাও",
 "Set expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
@@ -87,6 +86,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "ক্লাউড খুঁজে পাওয়া গেল না",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
 "Create an <strong>admin account</strong>" => "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
+"Password" => "কূটশব্দ",
 "Data folder" => "ডাটা ফোল্ডার ",
 "Configure the database" => "ডাটাবেচ কনফিগার করুন",
 "will be used" => "ব্যবহৃত হবে",
diff --git a/core/l10n/bn_IN.php b/core/l10n/bn_IN.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/bn_IN.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index d4adb682f8a..455b57f4f99 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("fa %n mes","fa %n mesos"),
 "last year" => "l'any passat",
 "years ago" => "anys enrere",
-"Choose" => "Escull",
-"Error loading file picker template: {error}" => "Error en carregar la plantilla de càrrega de fitxers: {error}",
 "Yes" => "Sí",
 "No" => "No",
+"Choose" => "Escull",
+"Error loading file picker template: {error}" => "Error en carregar la plantilla de càrrega de fitxers: {error}",
 "Ok" => "D'acord",
 "Error loading message template: {error}" => "Error en carregar la plantilla de missatge: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicte de fitxer","{count} conflictes de fitxer"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Comparteix amb usuari o grup...",
 "Share link" => "Enllaç de compartició",
 "Password protect" => "Protegir amb contrasenya",
-"Password" => "Contrasenya",
 "Allow Public Upload" => "Permet pujada pública",
 "Email link to person" => "Enllaç per correu electrónic amb la persona",
 "Send" => "Envia",
@@ -150,6 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
+"Password" => "Contrasenya",
 "Storage & database" => "Emmagatzematge i base de dades",
 "Data folder" => "Carpeta de dades",
 "Configure the database" => "Configura la base de dades",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 2e373e63bae..fef0396e324 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"),
 "last year" => "minulý rok",
 "years ago" => "před lety",
-"Choose" => "Vybrat",
-"Error loading file picker template: {error}" => "Chyba při nahrávání šablony výběru souborů: {error}",
 "Yes" => "Ano",
 "No" => "Ne",
+"Choose" => "Vybrat",
+"Error loading file picker template: {error}" => "Chyba při nahrávání šablony výběru souborů: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "S Vámi sdílí {owner}",
 "Share with user or group …" => "Sdílet s uživatelem nebo skupinou",
 "Share link" => "Sdílet odkaz",
+"The public link will expire no later than {days} days after it is created" => "Veřejný odkaz nevyprší dříve než za {days} dní po svém vytvoření",
+"By default the public link will expire after {days} days" => "Ve výchozím nastavení vyprší veřejný odkaz za {days} dní",
 "Password protect" => "Chránit heslem",
-"Password" => "Heslo",
+"Choose a password for the public link" => "Zadej heslo pro tento veřejný odkaz",
 "Allow Public Upload" => "Povolit veřejné nahrávání",
 "Email link to person" => "Odeslat osobě odkaz e-mailem",
 "Send" => "Odeslat",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
 "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>.",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
+"Password" => "Heslo",
 "Storage & database" => "Úložiště & databáze",
 "Data folder" => "Složka s daty",
 "Configure the database" => "Nastavit databázi",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index b79c1d5df59..737f9aa7c15 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","","",""),
 "last year" => "y llynedd",
 "years ago" => "blwyddyn yn ôl",
-"Choose" => "Dewisiwch",
 "Yes" => "Ie",
 "No" => "Na",
+"Choose" => "Dewisiwch",
 "Ok" => "Iawn",
 "_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
 "Cancel" => "Diddymu",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Rhannwyd â chi a'r grŵp {group} gan {owner}",
 "Shared with you by {owner}" => "Rhannwyd â chi gan {owner}",
 "Password protect" => "Diogelu cyfrinair",
-"Password" => "Cyfrinair",
 "Email link to person" => "E-bostio dolen at berson",
 "Send" => "Anfon",
 "Set expiration date" => "Gosod dyddiad dod i ben",
@@ -96,6 +95,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Heb gynhyrchydd rhifau hap diogel efallai y gall ymosodwr ragweld tocynnau ailosod cyfrinair a meddiannu eich cyfrif.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
 "Create an <strong>admin account</strong>" => "Crewch <strong>gyfrif gweinyddol</strong>",
+"Password" => "Cyfrinair",
 "Data folder" => "Plygell data",
 "Configure the database" => "Cyflunio'r gronfa ddata",
 "will be used" => "ddefnyddir",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index f7906e168bc..99b5c239738 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"),
 "last year" => "sidste år",
 "years ago" => "år siden",
-"Choose" => "Vælg",
-"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
 "Yes" => "Ja",
 "No" => "Nej",
+"Choose" => "Vælg",
+"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
 "Ok" => "OK",
 "Error loading message template: {error}" => "Fejl ved indlæsning af besked skabelon: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Del med bruger eller gruppe ...",
 "Share link" => "Del link",
 "Password protect" => "Beskyt med adgangskode",
-"Password" => "Kodeord",
 "Allow Public Upload" => "Tillad Offentlig Upload",
 "Email link to person" => "E-mail link til person",
 "Send" => "Send",
@@ -150,6 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
+"Password" => "Kodeord",
 "Storage & database" => "Lager & database",
 "Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 7a0aecf4d5f..c3f912bdc90 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
 "Yes" => "Ja",
 "No" => "Nein",
+"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
 "Ok" => "OK",
 "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "{owner} hat dies mit Dir geteilt",
 "Share with user or group …" => "Mit Benutzer oder Gruppe teilen ....",
 "Share link" => "Link Teilen",
+"The public link will expire no later than {days} days after it is created" => "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+"By default the public link will expire after {days} days" => "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen",
 "Password protect" => "Passwortschutz",
-"Password" => "Passwort",
+"Choose a password for the public link" => "Wählen Sie ein Passwort für den öffentlichen Link",
 "Allow Public Upload" => "Öffentliches Hochladen erlauben",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Password" => "Passwort",
 "Storage & database" => "Speicher & Datenbank",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
index 54c39463427..18a4adb948e 100644
--- a/core/l10n/de_AT.php
+++ b/core/l10n/de_AT.php
@@ -27,11 +27,11 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Abbrechen",
 "Share" => "Freigeben",
-"Password" => "Passwort",
 "group" => "Gruppe",
 "Unshare" => "Teilung zurücknehmen",
 "can edit" => "kann bearbeiten",
 "Delete" => "Löschen",
-"Personal" => "Persönlich"
+"Personal" => "Persönlich",
+"Password" => "Passwort"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index 1a2c56635cf..a0c303b6cdb 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
 "Yes" => "Ja",
 "No" => "Nein",
+"Choose" => "Auswählen",
 "Ok" => "OK",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "New Files" => "Neue Dateien",
@@ -50,7 +50,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
 "Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
 "Password protect" => "Passwortschutz",
-"Password" => "Passwort",
 "Allow Public Upload" => "Öffentliches Hochladen erlauben",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
@@ -107,6 +106,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Password" => "Passwort",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
 "will be used" => "wird verwendet",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index b8bce778f87..b638d1a4c8c 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
 "last year" => "Letztes Jahr",
 "years ago" => "Vor Jahren",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
 "Yes" => "Ja",
 "No" => "Nein",
+"Choose" => "Auswählen",
+"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
 "Ok" => "OK",
 "Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Von {owner} mit Ihnen geteilt.",
 "Share with user or group …" => "Mit Benutzer oder Gruppe teilen ....",
 "Share link" => "Link teilen",
+"The public link will expire no later than {days} days after it is created" => "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+"By default the public link will expire after {days} days" => "Standardmäßig wird der öffentliche Link nach {days} Tagen ablaufen",
 "Password protect" => "Passwortschutz",
-"Password" => "Passwort",
+"Choose a password for the public link" => "Wählen Sie ein Passwort für den öffentlichen Link",
 "Allow Public Upload" => "Öffentliches Hochladen erlauben",
 "Email link to person" => "Link per E-Mail verschicken",
 "Send" => "Senden",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
+"Password" => "Passwort",
 "Storage & database" => "Speicher & Datenbank",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index c9506fda05a..32c89a4a05c 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -41,15 +41,16 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n μήνας πριν","%n μήνες πριν"),
 "last year" => "τελευταίο χρόνο",
 "years ago" => "χρόνια πριν",
-"Choose" => "Επιλέξτε",
-"Error loading file picker template: {error}" => "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
 "Yes" => "Ναι",
 "No" => "Όχι",
+"Choose" => "Επιλέξτε",
+"Error loading file picker template: {error}" => "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
 "Ok" => "Οκ",
 "Error loading message template: {error}" => "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{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." => "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο.",
 "Cancel" => "Άκυρο",
@@ -72,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Διαμοιράστηκε με σας από τον {owner}",
 "Share with user or group …" => "Διαμοιρασμός με χρήστη ή ομάδα ...",
 "Share link" => "Διαμοιρασμός συνδέσμου",
+"The public link will expire no later than {days} days after it is created" => "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
+"By default the public link will expire after {days} days" => "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί ερήμην μετά από {days} ημέρες",
 "Password protect" => "Προστασία συνθηματικού",
-"Password" => "Συνθηματικό",
+"Choose a password for the public link" => "Επιλέξτε κωδικό για τον δημόσιο σύνδεσμο",
 "Allow Public Upload" => "Επιτρέπεται η Δημόσια Αποστολή",
 "Email link to person" => "Αποστολή συνδέσμου με email ",
 "Send" => "Αποστολή",
@@ -149,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.",
 "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
+"Password" => "Συνθηματικό",
 "Storage & database" => "Αποθήκευση & βάση δεδομένων",
 "Data folder" => "Φάκελος δεδομένων",
 "Configure the database" => "Ρύθμιση της βάσης δεδομένων",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 016bf23e8e1..a2bda0a286e 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"),
 "last year" => "last year",
 "years ago" => "years ago",
-"Choose" => "Choose",
-"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
 "Yes" => "Yes",
 "No" => "No",
+"Choose" => "Choose",
+"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
 "Ok" => "OK",
 "Error loading message template: {error}" => "Error loading message template: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} file conflict","{count} file conflicts"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Shared with you by {owner}",
 "Share with user or group …" => "Share with user or group …",
 "Share link" => "Share link",
+"The public link will expire no later than {days} days after it is created" => "The public link will expire no later than {days} days after it is created",
+"By default the public link will expire after {days} days" => "By default the public link will expire after {days} days",
 "Password protect" => "Password protect",
-"Password" => "Password",
+"Choose a password for the public link" => "Choose a password for the public link",
 "Allow Public Upload" => "Allow Public Upload",
 "Email link to person" => "Email link to person",
 "Send" => "Send",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Create an <strong>admin account</strong>",
+"Password" => "Password",
 "Storage & database" => "Storage & database",
 "Data folder" => "Data folder",
 "Configure the database" => "Configure the database",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 19d330e5c26..1dc8b8ac4af 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("antaŭ %n monato","antaŭ %n monatoj"),
 "last year" => "lastajare",
 "years ago" => "jaroj antaŭe",
-"Choose" => "Elekti",
 "Yes" => "Jes",
 "No" => "Ne",
+"Choose" => "Elekti",
 "Ok" => "Akcepti",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} dosierkonflikto","{count} dosierkonfliktoj"),
 "One file conflict" => "Unu dosierkonflikto",
@@ -46,6 +46,11 @@ $TRANSLATIONS = array(
 "Cancel" => "Nuligi",
 "(all selected)" => "(ĉiuj elektitas)",
 "({count} selected)" => "({count} elektitas)",
+"Very weak password" => "Tre malforta pasvorto",
+"Weak password" => "Malforta pasvorto",
+"So-so password" => "Mezaĉa pasvorto",
+"Good password" => "Bona pasvorto",
+"Strong password" => "Forta pasvorto",
 "Shared" => "Dividita",
 "Share" => "Kunhavigi",
 "Error" => "Eraro",
@@ -57,7 +62,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Kunhavigi kun uzanto aŭ grupo...",
 "Share link" => "Konhavigi ligilon",
 "Password protect" => "Protekti per pasvorto",
-"Password" => "Pasvorto",
 "Email link to person" => "Retpoŝti la ligilon al ulo",
 "Send" => "Sendi",
 "Set expiration date" => "Agordi limdaton",
@@ -116,6 +120,7 @@ $TRANSLATIONS = array(
 "Please update your PHP installation to use %s securely." => "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.",
 "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
+"Password" => "Pasvorto",
 "Data folder" => "Datuma dosierujo",
 "Configure the database" => "Agordi la datumbazon",
 "will be used" => "estos uzata",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index ca314a8b537..e64ad6aa29a 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Hace %n mes","hace %n meses"),
 "last year" => "el año pasado",
 "years ago" => "hace años",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
 "Yes" => "Sí",
 "No" => "No",
+"Choose" => "Seleccionar",
+"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
 "Ok" => "Aceptar",
 "Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Compartido contigo por {owner}",
 "Share with user or group …" => "Compartido con el usuario o con el grupo ...",
 "Share link" => "Enlace compartido",
+"The public link will expire no later than {days} days after it is created" => "El link publico no expirará antes de {days} desde que fué creado",
+"By default the public link will expire after {days} days" => "El link publico expirará por defecto pasados {days} dias",
 "Password protect" => "Protección con contraseña",
-"Password" => "Contraseña",
+"Choose a password for the public link" => "Elija una contraseña para el enlace publico",
 "Allow Public Upload" => "Permitir Subida Pública",
 "Email link to person" => "Enviar enlace por correo electrónico a una persona",
 "Send" => "Enviar",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
+"Password" => "Contraseña",
 "Storage & database" => "Almacenamiento y base de datos",
 "Data folder" => "Directorio de datos",
 "Configure the database" => "Configurar la base de datos",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 1bf43449fd7..b287d3769e4 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
 "last year" => "el año pasado",
 "years ago" => "años atrás",
-"Choose" => "Elegir",
-"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
 "Yes" => "Sí",
 "No" => "No",
+"Choose" => "Elegir",
+"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
 "Ok" => "Aceptar",
 "Error loading message template: {error}" => "Error cargando la plantilla del mensaje: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("un archivo en conflicto","{count} archivos en conflicto"),
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Compartir con usuario o grupo ...",
 "Share link" => "Compartir vínculo",
 "Password protect" => "Proteger con contraseña ",
-"Password" => "Contraseña",
 "Allow Public Upload" => "Permitir Subida Pública",
 "Email link to person" => "Enviar el enlace por e-mail.",
 "Send" => "Mandar",
@@ -145,6 +144,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
 "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 apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
+"Password" => "Contraseña",
 "Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
 "will be used" => "se usarán",
diff --git a/core/l10n/es_BO.php b/core/l10n/es_BO.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/es_BO.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_CL.php b/core/l10n/es_CL.php
index cab130cbd3c..05588a6d671 100644
--- a/core/l10n/es_CL.php
+++ b/core/l10n/es_CL.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "último año",
 "years ago" => "años anteriores",
-"Choose" => "Choose",
 "Yes" => "Si",
 "No" => "No",
+"Choose" => "Choose",
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Cancelar",
@@ -42,8 +42,8 @@ $TRANSLATIONS = array(
 "Error while sharing" => "Ocurrió un error mientras compartía",
 "Error while unsharing" => "Ocurrió un error mientras dejaba de compartir",
 "Error while changing permissions" => "Ocurrió un error mientras se cambiaban los permisos",
-"Password" => "Clave",
 "The object type is not specified." => "El tipo de objeto no está especificado.",
-"Username" => "Usuario"
+"Username" => "Usuario",
+"Password" => "Clave"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
index dca69ebaa33..e19724fa45e 100644
--- a/core/l10n/es_MX.php
+++ b/core/l10n/es_MX.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
 "last year" => "el año pasado",
 "years ago" => "años antes",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
 "Yes" => "Sí",
 "No" => "No",
+"Choose" => "Seleccionar",
+"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
 "Ok" => "Aceptar",
 "Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Compartido con el usuario o con el grupo …",
 "Share link" => "Enlace compartido",
 "Password protect" => "Protección con contraseña",
-"Password" => "Contraseña",
 "Allow Public Upload" => "Permitir Subida Pública",
 "Email link to person" => "Enviar enlace por correo electrónico a una persona",
 "Send" => "Enviar",
@@ -139,6 +138,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
+"Password" => "Contraseña",
 "Data folder" => "Directorio de datos",
 "Configure the database" => "Configurar la base de datos",
 "will be used" => "se utilizarán",
diff --git a/core/l10n/es_PY.php b/core/l10n/es_PY.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/es_PY.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_US.php b/core/l10n/es_US.php
new file mode 100644
index 00000000000..ffcdde48d47
--- /dev/null
+++ b/core/l10n/es_US.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 4807bc0414c..86f60c8c5c4 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n kuu tagasi","%n kuud tagasi"),
 "last year" => "viimasel aastal",
 "years ago" => "aastat tagasi",
-"Choose" => "Vali",
-"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel:  {error}",
 "Yes" => "Jah",
 "No" => "Ei",
+"Choose" => "Vali",
+"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel:  {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} failikonflikt","{count} failikonflikti"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Jaga kasutaja või grupiga ...",
 "Share link" => "Jaga linki",
 "Password protect" => "Parooliga kaitstud",
-"Password" => "Parool",
 "Allow Public Upload" => "Luba avalik üleslaadimine",
 "Email link to person" => "Saada link isikule e-postiga",
 "Send" => "Saada",
@@ -150,6 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
 "Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
+"Password" => "Parool",
 "Storage & database" => "Andmehoidla ja andmebaas",
 "Data folder" => "Andmete kaust",
 "Configure the database" => "Seadista andmebaasi",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 13a28602ffd..0e9d4c5fe76 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "Muga data iraganekoa da",
 "Couldn't send mail to following users: %s " => "Ezin izan da posta bidali hurrengo erabiltzaileei: %s",
 "Turned on maintenance mode" => "Mantenu modua gaitu da",
 "Turned off maintenance mode" => "Mantenu modua desgaitu da",
@@ -40,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("orain dela hilabete %n","orain dela %n hilabete"),
 "last year" => "joan den urtean",
 "years ago" => "urte",
-"Choose" => "Aukeratu",
-"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
 "Yes" => "Bai",
 "No" => "Ez",
+"Choose" => "Aukeratu",
+"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
 "Ok" => "Ados",
 "Error loading message template: {error}" => "Errorea mezu txantiloia kargatzean: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"),
@@ -57,6 +58,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(denak hautatuta)",
 "({count} selected)" => "({count} hautatuta)",
 "Error loading file exists template" => "Errorea fitxategia existitzen da txantiloiak kargatzerakoan",
+"Very weak password" => "Pasahitz oso ahula",
+"Weak password" => "Pasahitz ahula",
+"So-so password" => "Halamoduzko pasahitza",
+"Good password" => "Pasahitz ona",
+"Strong password" => "Pasahitz sendoa",
 "Shared" => "Elkarbanatuta",
 "Share" => "Elkarbanatu",
 "Error" => "Errorea",
@@ -68,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Elkarbanatu erabiltzaile edo taldearekin...",
 "Share link" => "Elkarbanatu lotura",
 "Password protect" => "Babestu pasahitzarekin",
-"Password" => "Pasahitza",
 "Allow Public Upload" => "Gaitu igotze publikoa",
 "Email link to person" => "Postaz bidali lotura ",
 "Send" => "Bidali",
@@ -104,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
 "%s password reset" => "%s pasahitza berrezarri",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Arazo bat gertatu da posta elektronikoa bidaltzerakoan, mesedez jarri harremanetan zure administrariarekin.",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
 "The link to reset your password has been sent to your email.<br>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 ." => "Zure pasahitza berrezartzeko lotura zure postara bidalia izan da.<br>Ez baduzu arrazoizko denbora \nepe batean jasotzen begiratu zure zabor-posta karpetan.<br>Hor ere ez badago kudeatzailearekin harremanetan ipini.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?",
@@ -116,6 +122,7 @@ $TRANSLATIONS = array(
 "To login page" => "Sarrera orrira",
 "New password" => "Pasahitz berria",
 "Reset password" => "Berrezarri pasahitza",
+"For the best results, please consider using a GNU/Linux server instead." => "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
 "Personal" => "Pertsonala",
 "Users" => "Erabiltzaileak",
 "Apps" => "Aplikazioak",
@@ -141,6 +148,8 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
 "Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
+"Password" => "Pasahitza",
+"Storage & database" => "Biltegia & datubasea",
 "Data folder" => "Datuen karpeta",
 "Configure the database" => "Konfiguratu datu basea",
 "will be used" => "erabiliko da",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index ee634f466c8..28a53095ae8 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown filetype" => "نوع فایل ناشناخته",
+"Invalid image" => "عکس نامعتبر",
 "Sunday" => "یکشنبه",
 "Monday" => "دوشنبه",
 "Tuesday" => "سه شنبه",
@@ -22,22 +24,27 @@ $TRANSLATIONS = array(
 "Settings" => "تنظیمات",
 "Saving..." => "در حال ذخیره سازی...",
 "seconds ago" => "ثانیه‌ها پیش",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n دقیقه قبل"),
+"_%n hour ago_::_%n hours ago_" => array("%n ساعت قبل"),
 "today" => "امروز",
 "yesterday" => "دیروز",
-"_%n day ago_::_%n days ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array("%n روز قبل"),
 "last month" => "ماه قبل",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n ماه قبل"),
 "last year" => "سال قبل",
 "years ago" => "سال‌های قبل",
-"Choose" => "انتخاب کردن",
 "Yes" => "بله",
 "No" => "نه",
+"Choose" => "انتخاب کردن",
 "Ok" => "قبول",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "New Files" => "فایل های جدید",
 "Cancel" => "منصرف شدن",
+"Continue" => "ادامه",
+"Weak password" => "رمز عبور ضعیف",
+"So-so password" => "رمز عبور متوسط",
+"Good password" => "رمز عبور خوب",
+"Strong password" => "رمز عبور قوی",
 "Shared" => "اشتراک گذاشته شده",
 "Share" => "اشتراک‌گذاری",
 "Error" => "خطا",
@@ -48,7 +55,6 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "به اشتراک گذاشته شده با شما توسط { دارنده}",
 "Share link" => "اشتراک گذاشتن لینک",
 "Password protect" => "نگهداری کردن رمز عبور",
-"Password" => "گذرواژه",
 "Allow Public Upload" => "اجازه آپلود عمومی",
 "Email link to person" => "پیوند ایمیل برای شخص.",
 "Send" => "ارسال",
@@ -96,12 +102,15 @@ $TRANSLATIONS = array(
 "Help" => "راه‌نما",
 "Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
 "Cloud not found" => "پیدا نشد",
+"Cheers!" => "سلامتی!",
 "Security Warning" => "اخطار امنیتی",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "هیچ مولد تصادفی امن در دسترس نیست، لطفا فرمت PHP OpenSSL را فعال نمایید.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "بدون وجود یک تولید کننده اعداد تصادفی امن ، یک مهاجم ممکن است این قابلیت را داشته باشد که پیشگویی کند پسوورد های راه انداز گرفته شده و کنترلی روی حساب کاربری شما داشته باشد .",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
 "Create an <strong>admin account</strong>" => "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
+"Password" => "گذرواژه",
+"Storage & database" => "انبارش و پایگاه داده",
 "Data folder" => "پوشه اطلاعاتی",
 "Configure the database" => "پایگاه داده برنامه ریزی شدند",
 "will be used" => "استفاده خواهد شد",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 9188469abc2..25da5ef81d9 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"),
 "last year" => "viime vuonna",
 "years ago" => "vuotta sitten",
-"Choose" => "Valitse",
-"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
 "Yes" => "Kyllä",
 "No" => "Ei",
+"Choose" => "Valitse",
+"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Virhe ladatessa viestipohjaa: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} tiedoston ristiriita","{count} tiedoston ristiriita"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Jaettu kanssasi käyttäjän {owner} toimesta",
 "Share with user or group …" => "Jaa käyttäjän tai ryhmän kanssa…",
 "Share link" => "Jaa linkki",
+"The public link will expire no later than {days} days after it is created" => "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
+"By default the public link will expire after {days} days" => "Oletuksena julkinen linkki vanhenee {days} päivässä",
 "Password protect" => "Suojaa salasanalla",
-"Password" => "Salasana",
+"Choose a password for the public link" => "Valitse salasana julkiselle linkille",
 "Allow Public Upload" => "Salli julkinen lähetys",
 "Email link to person" => "Lähetä linkki sähköpostitse",
 "Send" => "Lähetä",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
 "Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
+"Password" => "Salasana",
 "Storage & database" => "Tallennus ja tietokanta",
 "Data folder" => "Datakansio",
 "Configure the database" => "Muokkaa tietokantaa",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 49be57abf37..c8697983619 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Il y a %n mois","Il y a %n mois"),
 "last year" => "l'année dernière",
 "years ago" => "il y a plusieurs années",
-"Choose" => "Choisir",
-"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}",
 "Yes" => "Oui",
 "No" => "Non",
+"Choose" => "Choisir",
+"Error loading file picker template: {error}" => "Erreur de chargement du modèle de sélectionneur de fichiers : {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} fichier en conflit","{count} fichiers en conflit"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Partagé avec vous par {owner}",
 "Share with user or group …" => "Partager avec un utilisateur ou un groupe...",
 "Share link" => "Partager le lien",
+"The public link will expire no later than {days} days after it is created" => "Ce lien public expirera au plus tard, dans {days} jours après sa création.",
+"By default the public link will expire after {days} days" => "Par défaut, le lien public expire après {days} jour(s).",
 "Password protect" => "Protéger par un mot de passe",
-"Password" => "Mot de passe",
+"Choose a password for the public link" => "Choisissez un mot de passe pour le lien public.",
 "Allow Public Upload" => "Autoriser l'upload par les utilisateurs non enregistrés",
 "Email link to person" => "Envoyez le lien par email",
 "Send" => "Envoyer",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre répertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
+"Password" => "Mot de passe",
 "Storage & database" => "Support de stockage & base de données",
 "Data folder" => "Répertoire des données",
 "Configure the database" => "Configurer la base de données",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 9509446ec7c..88ba544b16e 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"),
 "last year" => "último ano",
 "years ago" => "anos atrás",
-"Choose" => "Escoller",
-"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
 "Yes" => "Si",
 "No" => "Non",
+"Choose" => "Escoller",
+"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
 "Ok" => "Aceptar",
 "Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de ficheiro","{count} conflitos de ficheiros"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Compartido con vostede por {owner}",
 "Share with user or group …" => "Compartir cun usuario ou grupo ...",
 "Share link" => "Ligazón para compartir",
+"The public link will expire no later than {days} days after it is created" => "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
+"By default the public link will expire after {days} days" => "De xeito predeterminado, a ligazón pública caduca aos {days} días",
 "Password protect" => "Protexido con contrasinais",
-"Password" => "Contrasinal",
+"Choose a password for the public link" => "Escolla un contrasinal para a ligazón pública",
 "Allow Public Upload" => "Permitir o envío público",
 "Email link to person" => "Enviar ligazón por correo",
 "Send" => "Enviar",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
+"Password" => "Contrasinal",
 "Storage & database" => "Almacenamento e base de datos",
 "Data folder" => "Cartafol de datos",
 "Configure the database" => "Configurar a base de datos",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index d629ac66213..5c7fbba0c4f 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("לפני %n חודש","לפני %n חודשים"),
 "last year" => "שנה שעברה",
 "years ago" => "שנים",
-"Choose" => "בחירה",
 "Yes" => "כן",
 "No" => "לא",
+"Choose" => "בחירה",
 "Ok" => "בסדר",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "New Files" => "קבצים חדשים",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
 "Shared with you by {owner}" => "שותף אתך על ידי {owner}",
 "Password protect" => "הגנה בססמה",
-"Password" => "סיסמא",
 "Email link to person" => "שליחת קישור בדוא״ל למשתמש",
 "Send" => "שליחה",
 "Set expiration date" => "הגדרת תאריך תפוגה",
@@ -99,6 +98,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ללא מחולל מספרים אקראיים מאובטח תוקף יכול לנבא את מחרוזות איפוס הססמה ולהשתלט על החשבון שלך.",
 "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>",
+"Password" => "סיסמא",
 "Data folder" => "תיקיית נתונים",
 "Configure the database" => "הגדרת מסד הנתונים",
 "will be used" => "ינוצלו",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index 3fad334f70f..1b156291681 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -27,7 +27,6 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Share" => "साझा करें",
 "Error" => "त्रुटि",
-"Password" => "पासवर्ड",
 "Send" => "भेजें",
 "No people found" => "कोई व्यक्ति नहीं मिले ",
 "Sending ..." => "भेजा जा रहा है",
@@ -46,6 +45,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "क्लौड नहीं मिला ",
 "Security Warning" => "सुरक्षा चेतावनी ",
 "Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ",
+"Password" => "पासवर्ड",
 "Data folder" => "डाटा फोल्डर",
 "Configure the database" => "डेटाबेस कॉन्फ़िगर करें ",
 "will be used" => "उपयोग होगा",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 60b82a22ad7..248a56e4fa1 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "prošlu godinu",
 "years ago" => "godina",
-"Choose" => "Izaberi",
 "Yes" => "Da",
 "No" => "Ne",
+"Choose" => "Izaberi",
 "Ok" => "U redu",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Odustani",
@@ -43,7 +43,6 @@ $TRANSLATIONS = array(
 "Error while unsharing" => "Greška prilikom isključivanja djeljenja",
 "Error while changing permissions" => "Greška prilikom promjena prava",
 "Password protect" => "Zaštiti lozinkom",
-"Password" => "Lozinka",
 "Set expiration date" => "Postavi datum isteka",
 "Expiration date" => "Datum isteka",
 "Share via email:" => "Dijeli preko email-a:",
@@ -76,6 +75,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Pristup zabranjen",
 "Cloud not found" => "Cloud nije pronađen",
 "Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
+"Password" => "Lozinka",
 "Data folder" => "Mapa baze podataka",
 "Configure the database" => "Konfiguriraj bazu podataka",
 "will be used" => "će se koristiti",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 56b8b4dbc4a..b1e8bf98e55 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n hónappal ezelőtt","%n hónappal ezelőtt"),
 "last year" => "tavaly",
 "years ago" => "több éve",
-"Choose" => "Válasszon",
-"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
 "Yes" => "Igen",
 "No" => "Nem",
+"Choose" => "Válasszon",
+"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Nem sikerült betölteni az üzenet sablont: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} fájl ütközik","{count} fájl ütközik"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Megosztani egy felhasználóval vagy csoporttal ...",
 "Share link" => "Megosztás hivatkozással",
 "Password protect" => "Jelszóval is védem",
-"Password" => "Jelszó",
 "Allow Public Upload" => "Feltöltést is engedélyezek",
 "Email link to person" => "Email címre küldjük el",
 "Send" => "Küldjük el",
@@ -150,6 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Rendszergazdai belépés</strong> létrehozása",
+"Password" => "Jelszó",
 "Storage & database" => "Tárolás & adatbázis",
 "Data folder" => "Adatkönyvtár",
 "Configure the database" => "Adatbázis konfigurálása",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index ef9c79a654f..fcf64fa8f67 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -38,9 +38,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "ultime anno",
 "years ago" => "annos passate",
-"Choose" => "Seliger",
 "Yes" => "Si",
 "No" => "No",
+"Choose" => "Seliger",
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de file","{count} conflictos de file"),
 "One file conflict" => "Un conflicto de file",
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Compartir con usator o gruppo ...",
 "Share link" => "Compartir ligamine",
 "Password protect" => "Protegite per contrasigno",
-"Password" => "Contrasigno",
 "Allow Public Upload" => "Permitter incargamento public",
 "Email link to person" => "Ligamine de e-posta a persona",
 "Send" => "Invia",
@@ -123,6 +122,7 @@ $TRANSLATIONS = array(
 "Security Warning" => "Aviso de securitate",
 "Please update your PHP installation to use %s securely." => "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
 "Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
+"Password" => "Contrasigno",
 "Storage & database" => "Immagazinage & base de datos",
 "Data folder" => "Dossier de datos",
 "Configure the database" => "Configurar le base de datos",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 7bb6883943d..c8b7853365e 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"),
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
-"Choose" => "Pilih",
-"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
 "Yes" => "Ya",
 "No" => "Tidak",
+"Choose" => "Pilih",
+"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
 "Ok" => "Oke",
 "Error loading message template: {error}" => "Galat memuat templat pesan: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} berkas konflik"),
@@ -73,7 +73,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Bagikan dengan pengguna atau grup ...",
 "Share link" => "Bagikan tautan",
 "Password protect" => "Lindungi dengan sandi",
-"Password" => "Sandi",
 "Allow Public Upload" => "Izinkan Unggahan Publik",
 "Email link to person" => "Emailkan tautan ini ke orang",
 "Send" => "Kirim",
@@ -149,6 +148,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
+"Password" => "Sandi",
 "Storage & database" => "Penyimpanan & Basis data",
 "Data folder" => "Folder data",
 "Configure the database" => "Konfigurasikan basis data",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 254c4b38689..dcce228e243 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "síðasta ári",
 "years ago" => "einhverjum árum",
-"Choose" => "Veldu",
 "Yes" => "Já",
 "No" => "Nei",
+"Choose" => "Veldu",
 "Ok" => "Í lagi",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Hætta við",
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Deilt með þér og hópnum {group} af {owner}",
 "Shared with you by {owner}" => "Deilt með þér af {owner}",
 "Password protect" => "Verja með lykilorði",
-"Password" => "Lykilorð",
 "Email link to person" => "Senda vefhlekk í tölvupóstu til notenda",
 "Send" => "Senda",
 "Set expiration date" => "Setja gildistíma",
@@ -90,6 +89,7 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Enginn traustur slembitölugjafi í boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Án öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn.",
 "Create an <strong>admin account</strong>" => "Útbúa <strong>vefstjóra aðgang</strong>",
+"Password" => "Lykilorð",
 "Data folder" => "Gagnamappa",
 "Configure the database" => "Stilla gagnagrunn",
 "will be used" => "verður notað",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index dfcc0a480ac..2c420dff250 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n mese fa","%n mesi fa"),
 "last year" => "anno scorso",
 "years ago" => "anni fa",
-"Choose" => "Scegli",
-"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
 "Yes" => "Sì",
 "No" => "No",
+"Choose" => "Scegli",
+"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Errore durante il caricamento del modello di messaggio: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} file in conflitto","{count} file in conflitto"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Condiviso con te da {owner}",
 "Share with user or group …" => "Condividi con utente o gruppo ...",
 "Share link" => "Condividi collegamento",
+"The public link will expire no later than {days} days after it is created" => "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
+"By default the public link will expire after {days} days" => "In modo predefinito, il collegamento pubblico scadrà dopo {days} giorni",
 "Password protect" => "Proteggi con password",
-"Password" => "Password",
+"Choose a password for the public link" => "Scegli una password per il collegamento pubblico",
 "Allow Public Upload" => "Consenti caricamento pubblico",
 "Email link to person" => "Invia collegamento via email",
 "Send" => "Invia",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
 "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>.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
+"Password" => "Password",
 "Storage & database" => "Archiviazione e database",
 "Data folder" => "Cartella dati",
 "Configure the database" => "Configura il database",
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index cedf0009cb5..51d0df65f32 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%nヶ月前"),
 "last year" => "1年前",
 "years ago" => "数年前",
-"Choose" => "選択",
-"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
 "Yes" => "はい",
 "No" => "いいえ",
+"Choose" => "選択",
+"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
 "Ok" => "OK",
 "Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルが競合"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "ユーザーもしくはグループと共有 ...",
 "Share link" => "URLで共有",
 "Password protect" => "パスワード保護",
-"Password" => "パスワード",
 "Allow Public Upload" => "アップロードを許可",
 "Email link to person" => "メールリンク",
 "Send" => "送信",
@@ -150,6 +149,7 @@ $TRANSLATIONS = array(
 "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\">documentation</a>." => "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
+"Password" => "パスワード",
 "Storage & database" => "ストレージとデータベース",
 "Data folder" => "データフォルダー",
 "Configure the database" => "データベースを設定してください",
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 3389bafa7a2..5d1d14ecb0e 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array(""),
 "last year" => "ბოლო წელს",
 "years ago" => "წლის წინ",
-"Choose" => "არჩევა",
 "Yes" => "კი",
 "No" => "არა",
+"Choose" => "არჩევა",
 "Ok" => "დიახ",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "New Files" => "ახალი ფაილები",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
 "Shared with you by {owner}" => "გაზიარდა თქვენთვის {owner}–ის მიერ",
 "Password protect" => "პაროლით დაცვა",
-"Password" => "პაროლი",
 "Email link to person" => "ლინკის პიროვნების იმეილზე გაგზავნა",
 "Send" => "გაგზავნა",
 "Set expiration date" => "მიუთითე ვადის გასვლის დრო",
@@ -95,6 +94,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "შემთხვევითი სიმბოლოების გენერატორის გარეშე, შემტევმა შეიძლება ამოიცნოს თქვენი პაროლი შეგიცვალოთ ის და დაეუფლოს თქვენს ექაუნთს.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
 "Create an <strong>admin account</strong>" => "შექმენი <strong>ადმინ ექაუნტი</strong>",
+"Password" => "პაროლი",
 "Data folder" => "მონაცემთა საქაღალდე",
 "Configure the database" => "მონაცემთა ბაზის კონფიგურირება",
 "will be used" => "გამოყენებული იქნება",
diff --git a/core/l10n/km.php b/core/l10n/km.php
index 76b1492456c..0ba2e2f92cf 100644
--- a/core/l10n/km.php
+++ b/core/l10n/km.php
@@ -33,9 +33,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n ខែមុន"),
 "last year" => "ឆ្នាំមុន",
 "years ago" => "ឆ្នាំមុន",
-"Choose" => "ជ្រើស",
 "Yes" => "ព្រម",
 "No" => "ទេ",
+"Choose" => "ជ្រើស",
 "Ok" => "ព្រម",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "New Files" => "ឯកសារថ្មី",
@@ -58,7 +58,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "បានចែករំលែកជាមួយអ្នក និងក្រុម {group} ដោយ {owner}",
 "Shared with you by {owner}" => "បានចែករំលែកជាមួយអ្នកដោយ {owner}",
 "Password protect" => "ការពារដោយពាក្យសម្ងាត់",
-"Password" => "ពាក្យសម្ងាត់",
 "Allow Public Upload" => "អនុញ្ញាតការផ្ទុកឡើងជាសាធារណៈ",
 "Send" => "ផ្ញើ",
 "Set expiration date" => "កំណត់ពេលផុតកំណត់",
@@ -98,6 +97,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "រកមិនឃើញ Cloud",
 "Security Warning" => "បម្រាមសុវត្ថិភាព",
 "Create an <strong>admin account</strong>" => "បង្កើត<strong>គណនីអភិបាល</strong>",
+"Password" => "ពាក្យសម្ងាត់",
 "Storage & database" => "ឃ្លាំងផ្ទុក & មូលដ្ឋានទិន្នន័យ",
 "Data folder" => "ថតទិន្នន័យ",
 "Configure the database" => "កំណត់សណ្ឋានមូលដ្ឋានទិន្នន័យ",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index d8c32e070d3..bf509c31c4b 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n달 전 "),
 "last year" => "작년",
 "years ago" => "년 전",
-"Choose" => "선택",
-"Error loading file picker template: {error}" => "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
 "Yes" => "예",
 "No" => "아니요",
+"Choose" => "선택",
+"Error loading file picker template: {error}" => "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
 "Ok" => "확인",
 "Error loading message template: {error}" => "메시지 템플릿을 불러오는 중 오류 발생: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("파일 {count}개 충돌"),
@@ -71,7 +71,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "사용자 및 그룹과 공유...",
 "Share link" => "링크 공유",
 "Password protect" => "암호 보호",
-"Password" => "암호",
 "Allow Public Upload" => "공개 업로드 허용",
 "Email link to person" => "이메일 주소",
 "Send" => "전송",
@@ -144,6 +143,7 @@ $TRANSLATIONS = array(
 "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\">documentation</a>." => "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
 "Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong> 만들기",
+"Password" => "암호",
 "Storage & database" => "스토리지 & 데이터베이스",
 "Data folder" => "데이터 폴더",
 "Configure the database" => "데이터베이스 설정",
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index 781018d4ab8..3aa234f1d51 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -12,7 +12,6 @@ $TRANSLATIONS = array(
 "Cancel" => "لابردن",
 "Share" => "هاوبەشی کردن",
 "Error" => "هه‌ڵه",
-"Password" => "وشەی تێپەربو",
 "Warning" => "ئاگاداری",
 "Add" => "زیادکردن",
 "Username" => "ناوی به‌کارهێنه‌ر",
@@ -23,6 +22,7 @@ $TRANSLATIONS = array(
 "Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
 "Help" => "یارمەتی",
 "Cloud not found" => "هیچ نه‌دۆزرایه‌وه‌",
+"Password" => "وشەی تێپەربو",
 "Data folder" => "زانیاری فۆڵده‌ر",
 "Database user" => "به‌كارهێنه‌ری داتابه‌یس",
 "Database password" => "وشه‌ی نهێنی داتا به‌یس",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 30337c5fc8f..913a16d892f 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "Lescht Joer",
 "years ago" => "Joren hir",
-"Choose" => "Auswielen",
 "Yes" => "Jo",
 "No" => "Nee",
+"Choose" => "Auswielen",
 "Ok" => "OK",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Which files do you want to keep?" => "Weieng Fichieren wëlls de gär behalen?",
@@ -57,7 +57,6 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Gedeelt mat dir vum {owner}",
 "Share link" => "Link deelen",
 "Password protect" => "Passwuertgeschützt",
-"Password" => "Passwuert",
 "Allow Public Upload" => "Ëffentlechen Upload erlaaben",
 "Email link to person" => "Link enger Persoun mailen",
 "Send" => "Schécken",
@@ -119,6 +118,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ouni e sécheren Zoufallsgenerator kann en Ugräifer d'Passwuert-Zrécksetzungs-Schlësselen viraussoen an en Account iwwerhuelen.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
 "Create an <strong>admin account</strong>" => "En <strong>Admin-Account</strong> uleeën",
+"Password" => "Passwuert",
 "Data folder" => "Daten-Dossier",
 "Configure the database" => "D'Datebank konfiguréieren",
 "will be used" => "wärt benotzt ginn",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index e3b612df3fa..15d09e9308d 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("prieš %n mėnesį","prieš %n mėnesius","prieš %n mėnesių"),
 "last year" => "praeitais metais",
 "years ago" => "prieš metus",
-"Choose" => "Pasirinkite",
-"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
 "Yes" => "Taip",
 "No" => "Ne",
+"Choose" => "Pasirinkite",
+"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
 "Ok" => "Gerai",
 "Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"),
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Dalintis su vartotoju arba grupe...",
 "Share link" => "Dalintis nuoroda",
 "Password protect" => "Apsaugotas slaptažodžiu",
-"Password" => "Slaptažodis",
 "Allow Public Upload" => "Leisti viešą įkėlimą",
 "Email link to person" => "Nusiųsti nuorodą paštu",
 "Send" => "Siųsti",
@@ -139,6 +138,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
 "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
+"Password" => "Slaptažodis",
 "Data folder" => "Duomenų katalogas",
 "Configure the database" => "Nustatyti duomenų bazę",
 "will be used" => "bus naudojama",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 37cde915c5e..e0e59e7eae8 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("Šomēnes, %n mēneši","Pirms %n mēneša","Pirms %n mēnešiem"),
 "last year" => "gājušajā gadā",
 "years ago" => "gadus atpakaļ",
-"Choose" => "Izvēlieties",
 "Yes" => "Jā",
 "No" => "Nē",
+"Choose" => "Izvēlieties",
 "Ok" => "Labi",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "New Files" => "Jaunās datnes",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "{owner} dalījās ar jums un grupu {group}",
 "Shared with you by {owner}" => "{owner} dalījās ar jums",
 "Password protect" => "Aizsargāt ar paroli",
-"Password" => "Parole",
 "Allow Public Upload" => "Ļaut publisko augšupielādi.",
 "Email link to person" => "Sūtīt saiti personai pa e-pastu",
 "Send" => "Sūtīt",
@@ -103,6 +102,7 @@ $TRANSLATIONS = array(
 "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.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
 "Create an <strong>admin account</strong>" => "Izveidot <strong>administratora kontu</strong>",
+"Password" => "Parole",
 "Data folder" => "Datu mape",
 "Configure the database" => "Konfigurēt datubāzi",
 "will be used" => "tiks izmantots",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 64c6671abf8..e27f5a6af6d 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -37,9 +37,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "минатата година",
 "years ago" => "пред години",
-"Choose" => "Избери",
 "Yes" => "Да",
 "No" => "Не",
+"Choose" => "Избери",
 "Ok" => "Во ред",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "One file conflict" => "Конфликт со една датотека",
@@ -58,7 +58,6 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Споделено со Вас од {owner}",
 "Share link" => "Сподели ја врската",
 "Password protect" => "Заштити со лозинка",
-"Password" => "Лозинка",
 "Allow Public Upload" => "Дозволи јавен аплоуд",
 "Email link to person" => "Прати врска по е-пошта на личност",
 "Send" => "Прати",
@@ -121,6 +120,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без сигурен генератор на случајни броеви напаѓач може да ги предвиди жетоните за ресетирање на лозинка и да преземе контрола врз Вашата сметка. ",
 "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>",
+"Password" => "Лозинка",
 "Data folder" => "Фолдер со податоци",
 "Configure the database" => "Конфигурирај ја базата",
 "will be used" => "ќе биде користено",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 63355191b6c..b32888238c1 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -32,7 +32,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Batal",
 "Share" => "Kongsi",
 "Error" => "Ralat",
-"Password" => "Kata laluan",
 "Warning" => "Amaran",
 "Delete" => "Padam",
 "Add" => "Tambah",
@@ -52,6 +51,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "Awan tidak dijumpai",
 "Security Warning" => "Amaran keselamatan",
 "Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
+"Password" => "Kata laluan",
 "Data folder" => "Fail data",
 "Configure the database" => "Konfigurasi pangkalan data",
 "will be used" => "akan digunakan",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 4ccf19b186e..4d722a859fc 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -22,13 +22,12 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array(""),
 "last year" => "မနှစ်က",
 "years ago" => "နှစ် အရင်က",
-"Choose" => "ရွေးချယ်",
 "Yes" => "ဟုတ်",
 "No" => "မဟုတ်ဘူး",
+"Choose" => "ရွေးချယ်",
 "Ok" => "အိုကေ",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "Cancel" => "ပယ်ဖျက်မည်",
-"Password" => "စကားဝှက်",
 "Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
 "Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်",
 "Share via email:" => "အီးမေးလ်ဖြင့်ဝေမျှမည် -",
@@ -51,6 +50,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "မတွေ့ရှိမိပါ",
 "Security Warning" => "လုံခြုံရေးသတိပေးချက်",
 "Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+"Password" => "စကားဝှက်",
 "Data folder" => "အချက်အလက်ဖိုလ်ဒါလ်",
 "Database user" => "Database သုံးစွဲသူ",
 "Database password" => "Database စကားဝှက်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 2a9873f4815..c832544d15c 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n dag siden","%n dager siden"),
 "last year" => "i fjor",
 "years ago" => "år siden",
-"Choose" => "Velg",
-"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
 "Yes" => "Ja",
 "No" => "Nei",
+"Choose" => "Velg",
+"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Feil ved lasting av meldingsmal: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Del med bruker eller gruppe …",
 "Share link" => "Del lenke",
 "Password protect" => "Passordbeskyttet",
-"Password" => "Passord",
 "Allow Public Upload" => "Tillat Offentlig Opplasting",
 "Email link to person" => "Email lenke til person",
 "Send" => "Send",
@@ -143,6 +142,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
 "Create an <strong>admin account</strong>" => "opprett en <strong>administrator-konto</strong>",
+"Password" => "Passord",
 "Storage & database" => "Lagring og database",
 "Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 961866fc158..0270a65f3a0 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","%n maanden geleden"),
 "last year" => "vorig jaar",
 "years ago" => "jaar geleden",
-"Choose" => "Kies",
-"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
 "Yes" => "Ja",
 "No" => "Nee",
+"Choose" => "Kies",
+"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} bestandsconflict","{count} bestandsconflicten"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Gedeeld met u door {owner}",
 "Share with user or group …" => "Delen met gebruiker of groep ...",
 "Share link" => "Deel link",
+"The public link will expire no later than {days} days after it is created" => "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
+"By default the public link will expire after {days} days" => "Standaard vervalt een openbare link na {days} dagen",
 "Password protect" => "Wachtwoord beveiligd",
-"Password" => "Wachtwoord",
+"Choose a password for the public link" => "Kies een wachtwoord voor de openbare link",
 "Allow Public Upload" => "Sta publieke uploads toe",
 "Email link to person" => "E-mail link naar persoon",
 "Send" => "Versturen",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
 "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 uw server.",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
+"Password" => "Wachtwoord",
 "Storage & database" => "Opslag & database",
 "Data folder" => "Gegevensmap",
 "Configure the database" => "Configureer de database",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 25d0f1da725..a0b9b88729b 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n månad sidan","%n månadar sidan"),
 "last year" => "i fjor",
 "years ago" => "år sidan",
-"Choose" => "Vel",
-"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
 "Yes" => "Ja",
 "No" => "Nei",
+"Choose" => "Vel",
+"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
 "Ok" => "Greitt",
 "Error loading message template: {error}" => "Klarte ikkje å lasta meldingsmal: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonfliktar"),
@@ -64,7 +64,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Delt med deg og gruppa {group} av {owner}",
 "Shared with you by {owner}" => "Delt med deg av {owner}",
 "Password protect" => "Passordvern",
-"Password" => "Passord",
 "Allow Public Upload" => "Tillat offentleg opplasting",
 "Email link to person" => "Send lenkja over e-post",
 "Send" => "Send",
@@ -120,6 +119,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
 "Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
+"Password" => "Passord",
 "Data folder" => "Datamappe",
 "Configure the database" => "Set opp databasen",
 "will be used" => "vil verta nytta",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index b13275822bd..f4dc0a01263 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "an passat",
 "years ago" => "ans a",
-"Choose" => "Causís",
 "Yes" => "Òc",
 "No" => "Non",
+"Choose" => "Causís",
 "Ok" => "D'accòrdi",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Annula",
@@ -43,7 +43,6 @@ $TRANSLATIONS = array(
 "Error while unsharing" => "Error al non partejar",
 "Error while changing permissions" => "Error al cambiar permissions",
 "Password protect" => "Parat per senhal",
-"Password" => "Senhal",
 "Set expiration date" => "Met la data d'expiracion",
 "Expiration date" => "Data d'expiracion",
 "Share via email:" => "Parteja tras corrièl :",
@@ -78,6 +77,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "Nívol pas trobada",
 "Security Warning" => "Avertiment de securitat",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte admin</strong>",
+"Password" => "Senhal",
 "Data folder" => "Dorsièr de donadas",
 "Configure the database" => "Configura la basa de donadas",
 "will be used" => "serà utilizat",
diff --git a/core/l10n/pa.php b/core/l10n/pa.php
index 021452d0b31..5144e96788e 100644
--- a/core/l10n/pa.php
+++ b/core/l10n/pa.php
@@ -31,19 +31,19 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "ਪਿਛਲੇ ਸਾਲ",
 "years ago" => "ਸਾਲਾਂ ਪਹਿਲਾਂ",
-"Choose" => "ਚੁਣੋ",
 "Yes" => "ਹਾਂ",
 "No" => "ਨਹੀਂ",
+"Choose" => "ਚੁਣੋ",
 "Ok" => "ਠੀਕ ਹੈ",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "ਰੱਦ ਕਰੋ",
 "Share" => "ਸਾਂਝਾ ਕਰੋ",
 "Error" => "ਗਲ",
-"Password" => "ਪਾਸਵਰ",
 "Send" => "ਭੇਜੋ",
 "Warning" => "ਚੇਤਾਵਨੀ",
 "Delete" => "ਹਟਾਓ",
 "Username" => "ਯੂਜ਼ਰ-ਨਾਂ",
-"Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ"
+"Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+"Password" => "ਪਾਸਵਰ"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 0e9860b4bf9..4a7e212d0ad 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"),
 "last year" => "w zeszłym roku",
 "years ago" => "lat temu",
-"Choose" => "Wybierz",
-"Error loading file picker template: {error}" => "Błąd podczas ładowania pliku wybranego szablonu: {error}",
 "Yes" => "Tak",
 "No" => "Nie",
+"Choose" => "Wybierz",
+"Error loading file picker template: {error}" => "Błąd podczas ładowania pliku wybranego szablonu: {error}",
 "Ok" => "OK",
 "Error loading message template: {error}" => "Błąd podczas ładowania szablonu wiadomości: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Udostępnione tobie przez {owner}",
 "Share with user or group …" => "Współdziel z użytkownikiem lub grupą ...",
 "Share link" => "Udostępnij link",
+"The public link will expire no later than {days} days after it is created" => "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
+"By default the public link will expire after {days} days" => "Domyślnie link publiczny wygaśnie po {days} dniach",
 "Password protect" => "Zabezpiecz hasłem",
-"Password" => "Hasło",
+"Choose a password for the public link" => "Wybierz hasło dla linku publicznego",
 "Allow Public Upload" => "Pozwól na  publiczne wczytywanie",
 "Email link to person" => "Wyślij osobie odnośnik poprzez e-mail",
 "Send" => "Wyślij",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
 "Create an <strong>admin account</strong>" => "Utwórz <strong>konta administratora</strong>",
+"Password" => "Hasło",
 "Storage & database" => "Zasoby dysku & baza danych",
 "Data folder" => "Katalog danych",
 "Configure the database" => "Skonfiguruj bazę danych",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index a7b671b4408..d6b802dacfb 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("ha %n mês","ha %n meses"),
 "last year" => "último ano",
 "years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
 "Yes" => "Sim",
 "No" => "Não",
+"Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Erro no carregamento de modelo de mensagem: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de arquivo","{count} conflitos de arquivos"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Compartilhado com você por {owner}",
 "Share with user or group …" => "Compartilhar com usuário ou grupo ...",
 "Share link" => "Compartilher link",
+"The public link will expire no later than {days} days after it is created" => "O link público irá expirar não antes de {days} depois de ser criado",
+"By default the public link will expire after {days} days" => "Por padrão o link público irá expirar após {days} dias",
 "Password protect" => "Proteger com senha",
-"Password" => "Senha",
+"Choose a password for the public link" => "Escolha uma senha para o link público",
 "Allow Public Upload" => "Permitir upload público",
 "Email link to person" => "Enviar link por e-mail",
 "Send" => "Enviar",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
 "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, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta de administrador</strong>",
+"Password" => "Senha",
 "Storage & database" => "Armazenamento & banco de dados",
 "Data folder" => "Pasta de dados",
 "Configure the database" => "Configurar o banco de dados",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 8c5d3fd5a6a..e8ec0371178 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n mês atrás","%n meses atrás"),
 "last year" => "ano passado",
 "years ago" => "anos atrás",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
 "Yes" => "Sim",
 "No" => "Não",
+"Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Erro ao carregar o template: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de ficheiro","{count} conflitos de ficheiro"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Partilhado consigo por {owner}",
 "Share with user or group …" => "Partilhar com utilizador ou grupo...",
 "Share link" => "Partilhar o link",
+"The public link will expire no later than {days} days after it is created" => "O link público expira, o mais tardar {days} dias após sua criação",
+"By default the public link will expire after {days} days" => "Por defeito, o link publico irá expirar depois de {days} dias",
 "Password protect" => "Proteger com palavra-passe",
-"Password" => "Password",
+"Choose a password for the public link" => "Defina a palavra-passe para o link público",
 "Allow Public Upload" => "Permitir Envios Públicos",
 "Email link to person" => "Enviar o link por e-mail",
 "Send" => "Enviar",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
+"Password" => "Password",
 "Storage & database" => "Armazenamento e base de dados",
 "Data folder" => "Pasta de dados",
 "Configure the database" => "Configure a base de dados",
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 648e8ba3eaf..cb62d71ee19 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "ultimul an",
 "years ago" => "ani în urmă",
-"Choose" => "Alege",
 "Yes" => "Da",
 "No" => "Nu",
+"Choose" => "Alege",
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "One file conflict" => "Un conflict de fișier",
@@ -55,7 +55,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Distribuie cu tine si grupul {group} de {owner}",
 "Shared with you by {owner}" => "Distribuie cu tine de {owner}",
 "Password protect" => "Protejare cu parolă",
-"Password" => "Parolă",
 "Allow Public Upload" => "Permiteţi încărcarea publică.",
 "Email link to person" => "Expediază legătura prin poșta electronică",
 "Send" => "Expediază",
@@ -110,6 +109,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
 "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
+"Password" => "Parolă",
 "Data folder" => "Director date",
 "Configure the database" => "Configurează baza de date",
 "will be used" => "vor fi folosite",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index a09178a6cd1..09757f41a1c 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
 "last year" => "в прошлом году",
 "years ago" => "несколько лет назад",
-"Choose" => "Выбрать",
-"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
 "Yes" => "Да",
 "No" => "Нет",
+"Choose" => "Выбрать",
+"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
 "Ok" => "Ок",
 "Error loading message template: {error}" => "Ошибка загрузки шаблона сообщений: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"),
@@ -73,7 +73,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Поделиться с пользователем или группой...",
 "Share link" => "Поделиться ссылкой",
 "Password protect" => "Защитить паролем",
-"Password" => "Пароль",
 "Allow Public Upload" => "Разрешить открытую загрузку",
 "Email link to person" => "Почтовая ссылка на персону",
 "Send" => "Отправить",
@@ -149,6 +148,7 @@ $TRANSLATIONS = array(
 "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\">documentation</a>." => "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.",
 "Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
+"Password" => "Пароль",
 "Storage & database" => "Система хранения данных & база данных",
 "Data folder" => "Директория с данными",
 "Configure the database" => "Настройка базы данных",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index bb125cc6af7..1ce41214e91 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -31,16 +31,15 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "පෙර අවුරුද්දේ",
 "years ago" => "අවුරුදු කීපයකට පෙර",
-"Choose" => "තෝරන්න",
 "Yes" => "ඔව්",
 "No" => "එපා",
+"Choose" => "තෝරන්න",
 "Ok" => "හරි",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "එපා",
 "Share" => "බෙදා හදා ගන්න",
 "Error" => "දෝෂයක්",
 "Password protect" => "මුර පදයකින් ආරක්ශාකරන්න",
-"Password" => "මුර පදය",
 "Set expiration date" => "කල් ඉකුත් විමේ දිනය දමන්න",
 "Expiration date" => "කල් ඉකුත් විමේ දිනය",
 "Share via email:" => "විද්‍යුත් තැපෑල මඟින් බෙදාගන්න: ",
@@ -73,6 +72,7 @@ $TRANSLATIONS = array(
 "Cloud not found" => "සොයා ගත නොහැක",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිත අහඹු සංඛ්‍යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්‍ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක.",
+"Password" => "මුර පදය",
 "Data folder" => "දත්ත ෆෝල්ඩරය",
 "Configure the database" => "දත්ත සමුදාය හැඩගැසීම",
 "will be used" => "භාවිතා වනු ඇත",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 80d816a461d..40a3aad7ac5 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"),
 "last year" => "minulý rok",
 "years ago" => "pred rokmi",
-"Choose" => "Vybrať",
-"Error loading file picker template: {error}" => "Chyba pri nahrávaní šablóny výberu súborov: {error}",
 "Yes" => "Áno",
 "No" => "Nie",
+"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}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Zdieľať s používateľom alebo skupinou ...",
 "Share link" => "Zdieľať linku",
 "Password protect" => "Chrániť heslom",
-"Password" => "Heslo",
 "Allow Public Upload" => "Povoliť verejné nahrávanie",
 "Email link to person" => "Odoslať odkaz emailom",
 "Send" => "Odoslať",
@@ -150,6 +149,7 @@ $TRANSLATIONS = array(
 "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.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
 "Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
+"Password" => "Heslo",
 "Storage & database" => "Úložislo & databáza",
 "Data folder" => "Priečinok dát",
 "Configure the database" => "Nastaviť databázu",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index c87a8d8d8f3..f7a634df07a 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"),
 "last year" => "lansko leto",
 "years ago" => "let nazaj",
-"Choose" => "Izbor",
-"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
 "Yes" => "Da",
 "No" => "Ne",
+"Choose" => "Izbor",
+"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
 "Ok" => "V redu",
 "Error loading message template: {error}" => "Napaka nalaganja predloge sporočil: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"),
@@ -74,7 +74,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Souporaba z uporabnikom ali skupino ...",
 "Share link" => "Povezava za prejem",
 "Password protect" => "Zaščiti z geslom",
-"Password" => "Geslo",
 "Allow Public Upload" => "Dovoli javno pošiljanje na strežnik",
 "Email link to person" => "Posreduj povezavo po elektronski pošti",
 "Send" => "Pošlji",
@@ -150,6 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
 "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
+"Password" => "Geslo",
 "Storage & database" => "Shramba in podatkovna zbirka",
 "Data folder" => "Podatkovna mapa",
 "Configure the database" => "Nastavi podatkovno zbirko",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index b3221dc75f3..efe07d0791b 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -34,9 +34,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n muaj më parë","%n muaj më parë"),
 "last year" => "vitin e shkuar",
 "years ago" => "vite më parë",
-"Choose" => "Zgjidh",
 "Yes" => "Po",
 "No" => "Jo",
+"Choose" => "Zgjidh",
 "Ok" => "Në rregull",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Anulo",
@@ -49,7 +49,6 @@ $TRANSLATIONS = array(
 "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}",
 "Password protect" => "Mbro me kod",
-"Password" => "Kodi",
 "Allow Public Upload" => "Lejo Ngarkimin Publik",
 "Email link to person" => "Dërgo email me lidhjen",
 "Send" => "Dërgo",
@@ -104,6 +103,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
 "Create an <strong>admin account</strong>" => "Krijo një <strong>llogari administruesi</strong>",
+"Password" => "Kodi",
 "Data folder" => "Emri i dosjes",
 "Configure the database" => "Konfiguro database-in",
 "will be used" => "do të përdoret",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 388ebb0df92..a597d671981 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "прошле године",
 "years ago" => "година раније",
-"Choose" => "Одабери",
 "Yes" => "Да",
 "No" => "Не",
+"Choose" => "Одабери",
 "Ok" => "У реду",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Откажи",
@@ -45,7 +45,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "Дељено са вама и са групом {group}. Поделио {owner}.",
 "Shared with you by {owner}" => "Поделио са вама {owner}",
 "Password protect" => "Заштићено лозинком",
-"Password" => "Лозинка",
 "Send" => "Пошаљи",
 "Set expiration date" => "Постави датум истека",
 "Expiration date" => "Датум истека",
@@ -88,6 +87,7 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Поуздан генератор случајних бројева није доступан, предлажемо да укључите PHP проширење OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без поузданог генератора случајнох бројева нападач лако може предвидети лозинку за поништавање кључа шифровања и отети вам налог.",
 "Create an <strong>admin account</strong>" => "Направи <strong>административни налог</strong>",
+"Password" => "Лозинка",
 "Data folder" => "Фацикла података",
 "Configure the database" => "Подешавање базе",
 "will be used" => "ће бити коришћен",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index e7783b3c023..9b10179b722 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -30,9 +30,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "prošle godine",
 "years ago" => "pre nekoliko godina",
-"Choose" => "Izaberi",
 "Yes" => "Da",
 "No" => "Ne",
+"Choose" => "Izaberi",
 "Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("","",""),
 "Cancel" => "Otkaži",
@@ -45,7 +45,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "{owner} podelio sa Vama i grupom {group} ",
 "Shared with you by {owner}" => "Sa vama podelio {owner}",
 "Password protect" => "Zaštita lozinkom",
-"Password" => "Lozinka",
 "Email link to person" => "Pošalji link e-mailom",
 "Send" => "Pošalji",
 "Set expiration date" => "Datum isteka",
@@ -91,6 +90,7 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez generatora slučajnog broja napadač može predvideti token za reset lozinke i preuzeti Vaš nalog.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
 "Create an <strong>admin account</strong>" => "Napravi <strong>administrativni nalog</strong>",
+"Password" => "Lozinka",
 "Data folder" => "Fascikla podataka",
 "Configure the database" => "Podešavanje baze",
 "will be used" => "će biti korišćen",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index f24398c662d..3258d03caf3 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"),
 "last year" => "förra året",
 "years ago" => "år sedan",
-"Choose" => "Välj",
-"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
 "Yes" => "Ja",
 "No" => "Nej",
+"Choose" => "Välj",
+"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Fel uppstod under inläsningen av meddelandemallen: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Delad med dig av {owner}",
 "Share with user or group …" => "Dela med användare eller grupp...",
 "Share link" => "Dela länk",
+"The public link will expire no later than {days} days after it is created" => "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
+"By default the public link will expire after {days} days" => "Som standard kommer den publika länken att sluta gälla efter {days} dagar",
 "Password protect" => "Lösenordsskydda",
-"Password" => "Lösenord",
+"Choose a password for the public link" => "Välj ett lösenord för den publika länken",
 "Allow Public Upload" => "Tillåt publik uppladdning",
 "Email link to person" => "E-posta länk till person",
 "Send" => "Skicka",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
+"Password" => "Lösenord",
 "Storage & database" => "Lagring & databas",
 "Data folder" => "Datamapp",
 "Configure the database" => "Konfigurera databasen",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index c0b4dce7cf4..53c8cb13333 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("",""),
 "last year" => "கடந்த வருடம்",
 "years ago" => "வருடங்களுக்கு முன்",
-"Choose" => "தெரிவுசெய்க ",
 "Yes" => "ஆம்",
 "No" => "இல்லை",
+"Choose" => "தெரிவுசெய்க ",
 "Ok" => "சரி",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "இரத்து செய்க",
@@ -45,7 +45,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
 "Shared with you by {owner}" => "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
 "Password protect" => "கடவுச்சொல்லை பாதுகாத்தல்",
-"Password" => "கடவுச்சொல்",
 "Set expiration date" => "காலாவதி தேதியை குறிப்பிடுக",
 "Expiration date" => "காலவதியாகும் திகதி",
 "Share via email:" => "மின்னஞ்சலினூடான பகிர்வு: ",
@@ -85,6 +84,7 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "குறிப்பிட்ட எண்ணிக்கை பாதுகாப்பான புறப்பாக்கி / உண்டாக்கிகள் இல்லை, தயவுசெய்து PHP OpenSSL நீட்சியை இயலுமைப்படுத்துக. ",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "பாதுகாப்பான சீரற்ற எண்ணிக்கையான புறப்பாக்கி இல்லையெனின், தாக்குனரால் கடவுச்சொல் மீளமைப்பு அடையாளவில்லைகள் முன்மொழியப்பட்டு உங்களுடைய கணக்கை கைப்பற்றலாம்.",
 "Create an <strong>admin account</strong>" => "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
+"Password" => "கடவுச்சொல்",
 "Data folder" => "தரவு கோப்புறை",
 "Configure the database" => "தரவுத்தளத்தை தகவமைக்க",
 "will be used" => "பயன்படுத்தப்படும்",
diff --git a/core/l10n/te.php b/core/l10n/te.php
index 7b76349b852..7016cde75f2 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -37,7 +37,6 @@ $TRANSLATIONS = array(
 "Cancel" => "రద్దుచేయి",
 "Continue" => "కొనసాగించు",
 "Error" => "పొరపాటు",
-"Password" => "సంకేతపదం",
 "Send" => "పంపించు",
 "Expiration date" => "కాలం చెల్లు తేదీ",
 "delete" => "తొలగించు",
@@ -49,6 +48,7 @@ $TRANSLATIONS = array(
 "Personal" => "వ్యక్తిగతం",
 "Users" => "వాడుకరులు",
 "Help" => "సహాయం",
+"Password" => "సంకేతపదం",
 "Log out" => "నిష్క్రమించు",
 "Lost your password?" => "మీ సంకేతపదం పోయిందా?"
 );
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 61a67f78026..314fa3e8655 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -31,9 +31,9 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array(""),
 "last year" => "ปีที่แล้ว",
 "years ago" => "ปี ที่ผ่านมา",
-"Choose" => "เลือก",
 "Yes" => "ตกลง",
 "No" => "ไม่ตกลง",
+"Choose" => "เลือก",
 "Ok" => "ตกลง",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
 "New Files" => "ไฟล์ใหม่",
@@ -47,7 +47,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
 "Shared with you by {owner}" => "ถูกแชร์ให้กับคุณโดย {owner}",
 "Password protect" => "ใส่รหัสผ่านไว้",
-"Password" => "รหัสผ่าน",
 "Email link to person" => "ส่งลิงก์ให้ทางอีเมล",
 "Send" => "ส่ง",
 "Set expiration date" => "กำหนดวันที่หมดอายุ",
@@ -93,6 +92,7 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "ยังไม่มีตัวสร้างหมายเลขแบบสุ่มให้ใช้งาน, กรุณาเปิดใช้งานส่วนเสริม PHP OpenSSL",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "หากปราศจากตัวสร้างหมายเลขแบบสุ่มที่ช่วยป้องกันความปลอดภัย ผู้บุกรุกอาจสามารถที่จะคาดคะเนรหัสยืนยันการเข้าถึงเพื่อรีเซ็ตรหัสผ่าน และเอาบัญชีของคุณไปเป็นของตนเองได้",
 "Create an <strong>admin account</strong>" => "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+"Password" => "รหัสผ่าน",
 "Data folder" => "โฟลเดอร์เก็บข้อมูล",
 "Configure the database" => "กำหนดค่าฐานข้อมูล",
 "will be used" => "จะถูกใช้",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index d5880d8a09d..80b60ddaca8 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n ay önce","%n ay önce"),
 "last year" => "geçen yıl",
 "years ago" => "yıllar önce",
-"Choose" => "Seç",
-"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
 "Yes" => "Evet",
 "No" => "Hayır",
+"Choose" => "Seç",
+"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
 "Ok" => "Tamam",
 "Error loading message template: {error}" => "İleti şablonu yüklenirken hata: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} dosya çakışması","{count} dosya çakışması"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "{owner} tarafından sizinle paylaşıldı",
 "Share with user or group …" => "Kullanıcı veya grup ile paylaş...",
 "Share link" => "Paylaşma bağlantısı",
+"The public link will expire no later than {days} days after it is created" => "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
+"By default the public link will expire after {days} days" => "Öntanımlı olarak herkese açık bağlantı {days} gün sonra sona erecek",
 "Password protect" => "Parola koruması",
-"Password" => "Parola",
+"Choose a password for the public link" => "Herkese açık bağlantı için bir parola seçin",
 "Allow Public Upload" => "Herkes Tarafından Gönderime İzin Ver",
 "Email link to person" => "Bağlantıyı e-posta ile gönder",
 "Send" => "Gönder",
@@ -85,7 +87,7 @@ $TRANSLATIONS = array(
 "group" => "grup",
 "Resharing is not allowed" => "Tekrar paylaşmaya izin verilmiyor",
 "Shared in {item} with {user}" => "{item} içinde {user} ile paylaşılanlar",
-"Unshare" => "Paylaşılmayan",
+"Unshare" => "Paylaşmayı Kaldır",
 "notify by email" => "e-posta ile bildir",
 "can edit" => "düzenleyebilir",
 "access control" => "erişim kontrolü",
@@ -144,12 +146,13 @@ $TRANSLATIONS = array(
 "Cheers!" => "Hoşça kalın!",
 "Security Warning" => "Güvenlik Uyarısı",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "%s güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
+"Please update your PHP installation to use %s securely." => "%s yazılımını güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Güvenli rastgele sayı üreticisi bulunamadı. Lütfen PHP OpenSSL eklentisini etkinleştirin.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Güvenli rastgele sayı üreticisi olmadan saldırganlar parola sıfırlama simgelerini tahmin edip hesabınızı ele geçirebilir.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
 "Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
+"Password" => "Parola",
 "Storage & database" => "Depolama ve veritabanı",
 "Data folder" => "Veri klasörü",
 "Configure the database" => "Veritabanını yapılandır",
@@ -162,7 +165,7 @@ $TRANSLATIONS = array(
 "Finish setup" => "Kurulumu tamamla",
 "Finishing …" => "Tamamlanıyor ...",
 "This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesini gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve bu arayüzü yeniden yükleyin.",
-"%s is available. Get more information on how to update." => "%s mevcut. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
+"%s is available. Get more information on how to update." => "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
 "Log out" => "Çıkış yap",
 "Automatic logon rejected!" => "Otomatik oturum açma reddedildi!",
 "If you did not change your password recently, your account may be compromised!" => "Yakın zamanda parolanızı değiştirmediyseniz hesabınız tehlikede olabilir!",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index 9b923070356..a21c47fc76c 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -34,7 +34,6 @@ $TRANSLATIONS = array(
 "Cancel" => "ۋاز كەچ",
 "Share" => "ھەمبەھىر",
 "Error" => "خاتالىق",
-"Password" => "ئىم",
 "Send" => "يوللا",
 "group" => "گۇرۇپپا",
 "Unshare" => "ھەمبەھىرلىمە",
@@ -50,6 +49,7 @@ $TRANSLATIONS = array(
 "Apps" => "ئەپلەر",
 "Help" => "ياردەم",
 "Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
+"Password" => "ئىم",
 "Finish setup" => "تەڭشەك تامام",
 "Log out" => "تىزىمدىن چىق"
 );
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 015183e6470..95de28ce0cc 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n місяць тому","%n місяці тому","%n місяців тому"),
 "last year" => "минулого року",
 "years ago" => "роки тому",
-"Choose" => "Обрати",
-"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
 "Yes" => "Так",
 "No" => "Ні",
+"Choose" => "Обрати",
+"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Помилка при завантаженні шаблону повідомлення: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"),
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Поділитися з користувачем або групою ...",
 "Share link" => "Опублікувати посилання",
 "Password protect" => "Захистити паролем",
-"Password" => "Пароль",
 "Allow Public Upload" => "Дозволити Публічне Завантаження",
 "Email link to person" => "Ел. пошта належить Пану",
 "Send" => "Надіслати",
@@ -146,6 +145,7 @@ $TRANSLATIONS = array(
 "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\">documentation</a>." => "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
 "Create an <strong>admin account</strong>" => "Створити <strong>обліковий запис адміністратора</strong>",
+"Password" => "Пароль",
 "Data folder" => "Каталог даних",
 "Configure the database" => "Налаштування бази даних",
 "will be used" => "буде використано",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index 3012eb869c9..50a0e14c684 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -1,5 +1,19 @@
 <?php
 $TRANSLATIONS = array(
+"Expiration date is in the past." => "ختم ہونے کی تاریخ ماضی میں ہے.",
+"Turned on maintenance mode" => "بحالی موڈ چالو ہے",
+"Turned off maintenance mode" => "بحالی موڈ بند ہے",
+"Updated database" => "اپ ڈیٹ ہوئ ڈیٹا بیس",
+"No image or file provided" => "کوئی تصویر یا فائل فراہم نہیں",
+"Unknown filetype" => "غیر معرروف قسم کی فائل",
+"Invalid image" => "غلط تصویر",
+"Sunday" => "اتوار",
+"Monday" => "سوموار",
+"Tuesday" => "منگل",
+"Wednesday" => "بدھ",
+"Thursday" => "جمعرات",
+"Friday" => "جمعہ",
+"Saturday" => "ہفتہ",
 "January" => "جنوری",
 "February" => "فرورئ",
 "March" => "مارچ",
@@ -12,51 +26,105 @@ $TRANSLATIONS = array(
 "October" => "اکتوبر",
 "November" => "نومبر",
 "December" => "دسمبر",
-"Settings" => "سیٹینگز",
+"Settings" => "ترتیبات",
+"Saving..." => "محفوظ ھو رہا ہے ...",
+"seconds ago" => "سیکنڈز پہلے",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "آج",
+"yesterday" => "کل",
 "_%n day ago_::_%n days ago_" => array("",""),
+"last month" => "پچھلے مہنیے",
 "_%n month ago_::_%n months ago_" => array("",""),
-"Choose" => "منتخب کریں",
+"last year" => "پچھلے سال",
+"years ago" => "سالوں پہلے",
 "Yes" => "ہاں",
 "No" => "نہیں",
+"Choose" => "منتخب کریں",
 "Ok" => "اوکے",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"New Files" => "جدید فائلیں",
+"Already existing files" => "پہلے سے موجودجدید فائلیں",
 "Cancel" => "منسوخ کریں",
-"Error" => "ایرر",
-"Error while sharing" => "شئیرنگ کے دوران ایرر",
-"Error while unsharing" => "شئیرنگ ختم کرنے  کے دوران ایرر",
-"Error while changing permissions" => "اختیارات کو تبدیل کرنے کے دوران ایرر",
-"Password protect" => "پاسورڈ سے محفوظ کریں",
-"Password" => "پاسورڈ",
+"Continue" => "جاری",
+"(all selected)" => "(سب منتخب شدہ)",
+"({count} selected)" => "({گنتی} منتخب شدہ)",
+"Very weak password" => "بہت کمزور پاسورڈ",
+"Weak password" => "کمزور پاسورڈ",
+"So-so password" => "نص نص پاسورڈ",
+"Good password" => "اچھا پاسورڈ",
+"Strong password" => "مضبوط پاسورڈ",
+"Shared" => "اشتراک شدہ",
+"Share" => "اشتراک",
+"Error" => "خرابی",
+"Error while sharing" => "اشتراک کے دوران خرابی ",
+"Error while unsharing" => "اشترک ختم کرنے کے دوران خرابی",
+"Error while changing permissions" => "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
+"Shared with you and the group {group} by {owner}" => "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
+"Shared with you by {owner}" => "اشتراک شدہ آپ سے{مالک}",
+"Share with user or group …" => "صارف یا مجموعہ کے ساتھ اشتراک کریں ...",
+"Share link" => "اشتراک لنک",
+"By default the public link will expire after {days} days" => "ڈیفالٹ میں عوامی لنک ختم ہو جائے گا {دن} دن",
+"Password protect" => "محفوظ پاسورڈ",
+"Choose a password for the public link" => "عوامی لنک کے لئےپاس ورڈ منتخب کریں",
+"Allow Public Upload" => "پبلک اپ لوڈ کرنے کی اجازت دیں",
+"Email link to person" => "شحص کے لیے ای میل لنک",
+"Send" => "بھجیں",
 "Set expiration date" => "تاریخ معیاد سیٹ کریں",
 "Expiration date" => "تاریخ معیاد",
-"No people found" => "کوئی لوگ نہیں ملے۔",
-"Resharing is not allowed" => "دوبارہ شئیر کرنے کی اجازت نہیں",
+"Share via email:" => "ای میل کے زریعے ارسال کریں",
+"No people found" => "کوئ شخص موجود نہیں ",
+"group" => "مجموعہ",
+"Resharing is not allowed" => "دوبارہ اشتراک کی اجازت نہیں",
+"Shared in {item} with {user}" => "شراکت میں {آئٹم}اور {مستخدم}",
 "Unshare" => "شئیرنگ ختم کریں",
-"can edit" => "ایڈٹ کر سکے",
+"notify by email" => "ای میل کے ذریعے مطلع کریں",
+"can edit" => "تبدیل کر سکے ھیں",
 "access control" => "اسیس کنٹرول",
 "create" => "نیا بنائیں",
 "update" => "اپ ڈیٹ",
 "delete" => "ختم کریں",
 "share" => "شئیر کریں",
 "Password protected" => "پاسورڈ سے محفوظ کیا گیا ہے",
+"Error unsetting expiration date" => "خرابی غیر تصحیح تاریخ معیاد",
+"Error setting expiration date" => "خرابی  تصحیح تاریخ معیاد",
+"Sending ..." => "ارسال ہو رہا ھے",
+"Email sent" => "ارسال شدہ ای میل ",
+"Warning" => "انتباہ",
+"The object type is not specified." => "اس چیز کی قسم کی وضاحت نہیں",
+"Enter new" => "جدید درج کریں",
+"Delete" => "حذف کریں",
 "Add" => "شامل کریں",
+"Edit tags" => "ترمیم ٹیگز",
+"Please reload the page." => "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "اپ ڈیٹ نا کامیاب تھی۔ براہ مہربانی اس مسلے کو رپورٹ کریں اس پے  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>. ",
+"The update was successful. Redirecting you to ownCloud now." => "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
+"A problem has occurred whilst sending the email, please contact your administrator." => "ای میل بھیجنے کے دوران ایک مسئلہ پیش آیا ہے , براہ مہربانی اپنےایڈمنسٹریٹر سے رابطہ کریں.",
 "Use the following link to reset your password: {link}" => "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
+"Request failed!<br>Did you make sure your email/username was right?" => "گذارش ناکام!<br>کيا پ نے يقينی بنايا کہ  آپ کی ای میل / صارف کا نام درست تھا؟",
 "You will receive a link to reset your password via Email." => "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
 "Username" => "یوزر نیم",
+"Yes, I really want to reset my password now" => "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
+"Reset" => "ری سیٹ",
 "Your password was reset" => "آپ کا پاسورڈ ری سیٹ کر دیا گیا ہے",
 "To login page" => "لاگ ان صفحے کی طرف",
 "New password" => "نیا پاسورڈ",
 "Reset password" => "ری سیٹ پاسورڈ",
-"Personal" => "ذاتی",
-"Users" => "یوزرز",
+"Personal" => "شخصی",
+"Users" => "صارفین",
 "Apps" => "ایپز",
 "Admin" => "ایڈمن",
 "Help" => "مدد",
-"Access forbidden" => "پہنچ کی اجازت نہیں",
-"Cloud not found" => "نہیں مل سکا",
+"Access forbidden" => "رسائ منقطع ہے",
+"Cloud not found" => "کلوڈ موجود نہہں",
+"Cheers!" => "واہ!",
+"Security Warning" => "حفاظتی انتباہ",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "آپ کا پی ایچ پی ورین نل بائٹ کے حملے کے خطرے سے دوچار  ہے (CVE-2006-7243)",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "کوئ محفوظ بے ترتیب نمبر جنریٹر موجود نہیں مہربانی کر کے پی ایچ پی اوپن ایس ایس ایل ایکسٹنشن  چالو کریں.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ایک محفوظ بے ترتیب نمبر جنریٹر کے بغیر ایک حملہ آور پاس ورڈ ری سیٹ ٹوکن کی پیشن گوئی کرنے کے قابل اور اپ کے حساب پر قبضہ کر سکتا ہے",
 "Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
+"Password" => "پاسورڈ",
+"Storage & database" => "ذخیرہ اور ڈیٹا بیس",
 "Data folder" => "ڈیٹا فولڈر",
 "Configure the database" => "ڈیٹا بیس کونفگر کریں",
 "will be used" => "استعمال ہو گا",
@@ -66,9 +134,17 @@ $TRANSLATIONS = array(
 "Database tablespace" => "ڈیٹابیس ٹیبل سپیس",
 "Database host" => "ڈیٹابیس ہوسٹ",
 "Finish setup" => "سیٹ اپ ختم کریں",
+"Finishing …" => "تکمیل ...",
+"%s is available. Get more information on how to update." => "%s دستیاب ہے. اپ ڈیٹ کرنے کے  بارے میں مزید معلومات حاصل کریں.",
 "Log out" => "لاگ آؤٹ",
+"Automatic logon rejected!" => "آٹومیٹک لاگ ان مسترد",
+"If you did not change your password recently, your account may be compromised!" => "آپ نے حال ہی میں اپنا پاس ورڈ تبدیل نہیں کیا تو، آپ کے اکاؤنٹ سے سمجھوتہ ہو سکتا ہے",
+"Please change your password to secure your account again." => "براہ مہربانی پھر سے اکاونٹ محفوظ کرنے کے لیے  اپنا پاس ورڈ تبدیل کریں.",
 "Lost your password?" => "کیا آپ پاسورڈ بھول گئے ہیں؟",
 "remember" => "یاد رکھیں",
-"Log in" => "لاگ ان"
+"Log in" => "لاگ ان",
+"Alternative Logins" => "متبادل لاگ ان ",
+"Thank you for your patience." => "آپ کے صبر کا شکریہ",
+"Updating ownCloud to version %s, this may take a while." => "اون کلوڈ اپ ڈیٹ ہو رہا ہے ورژن %s میں, یہ تھوڑی دیر لےگا"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index fe24cb385e5..07ac648c91b 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n tháng trước"),
 "last year" => "năm trước",
 "years ago" => "năm trước",
-"Choose" => "Chọn",
-"Error loading file picker template: {error}" => "Lỗi khi tải mẫu tập tin picker: {error}",
 "Yes" => "Có",
 "No" => "Không",
+"Choose" => "Chọn",
+"Error loading file picker template: {error}" => "Lỗi khi tải mẫu tập tin picker: {error}",
 "Ok" => "Đồng ý",
 "Error loading message template: {error}" => "Lỗi khi tải mẫu thông điệp: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} tập tin xung đột"),
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "Chia sẻ với người dùng hoặc nhóm",
 "Share link" => "Chia sẻ liên kết",
 "Password protect" => "Mật khẩu bảo vệ",
-"Password" => "Mật khẩu",
 "Allow Public Upload" => "Cho phép công khai tập tin tải lên",
 "Email link to person" => "Liên kết email tới cá nhân",
 "Send" => "Gởi",
@@ -138,6 +137,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
 "Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>",
+"Password" => "Mật khẩu",
 "Data folder" => "Thư mục dữ liệu",
 "Configure the database" => "Cấu hình cơ sở dữ liệu",
 "will be used" => "được sử dụng",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 4d3c55b07f4..6def20dac34 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -41,10 +41,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n 月前"),
 "last year" => "去年",
 "years ago" => "年前",
-"Choose" => "选择(&C)...",
-"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
 "Yes" => "是",
 "No" => "否",
+"Choose" => "选择(&C)...",
+"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
 "Ok" => "好",
 "Error loading message template: {error}" => "加载消息模板出错: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} 个文件冲突"),
@@ -73,8 +73,10 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "{owner} 与您共享",
 "Share with user or group …" => "分享给其他用户或组 ...",
 "Share link" => "分享链接",
+"The public link will expire no later than {days} days after it is created" => "这个共享链接将在创建后 {days} 天失效",
+"By default the public link will expire after {days} days" => "默认共享链接失效天数为 {days} ",
 "Password protect" => "密码保护",
-"Password" => "密码",
+"Choose a password for the public link" => "为共享链接设置密码",
 "Allow Public Upload" => "允许公开上传",
 "Email link to person" => "发送链接到个人",
 "Send" => "发送",
@@ -150,6 +152,7 @@ $TRANSLATIONS = array(
 "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\">documentation</a>." => "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
 "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
+"Password" => "密码",
 "Storage & database" => "存储 & 数据库",
 "Data folder" => "数据目录",
 "Configure the database" => "配置数据库",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 294fa7d6fe6..57653c1fab2 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -41,7 +41,6 @@ $TRANSLATIONS = array(
 "Shared with you and the group {group} by {owner}" => "{owner}與你及群組的分享",
 "Shared with you by {owner}" => "{owner}與你的分享",
 "Password protect" => "密碼保護",
-"Password" => "密碼",
 "Send" => "傳送",
 "Set expiration date" => "設定分享期限",
 "Expiration date" => "分享期限",
@@ -72,6 +71,7 @@ $TRANSLATIONS = array(
 "Help" => "幫助",
 "Cloud not found" => "未找到Cloud",
 "Create an <strong>admin account</strong>" => "建立管理員帳戶",
+"Password" => "密碼",
 "Configure the database" => "設定資料庫",
 "will be used" => "將被使用",
 "Database user" => "資料庫帳戶",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 465ae0c7008..dffb890f137 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -40,10 +40,10 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n 個月前"),
 "last year" => "去年",
 "years ago" => "幾年前",
-"Choose" => "選擇",
-"Error loading file picker template: {error}" => "載入檔案選擇器樣板出錯： {error}",
 "Yes" => "是",
 "No" => "否",
+"Choose" => "選擇",
+"Error loading file picker template: {error}" => "載入檔案選擇器樣板出錯： {error}",
 "Ok" => "好",
 "Error loading message template: {error}" => "載入訊息樣板出錯： {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} 個檔案衝突"),
@@ -72,7 +72,6 @@ $TRANSLATIONS = array(
 "Share with user or group …" => "與用戶或群組分享",
 "Share link" => "分享連結",
 "Password protect" => "密碼保護",
-"Password" => "密碼",
 "Allow Public Upload" => "允許任何人上傳",
 "Email link to person" => "將連結 email 給別人",
 "Send" => "寄出",
@@ -142,6 +141,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
 "Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>",
+"Password" => "密碼",
 "Data folder" => "資料儲存位置",
 "Configure the database" => "設定資料庫",
 "will be used" => "將會使用",
diff --git a/core/lostpassword/css/lostpassword.css b/core/lostpassword/css/lostpassword.css
index 85cce9f9407..b7f7023648d 100644
--- a/core/lostpassword/css/lostpassword.css
+++ b/core/lostpassword/css/lostpassword.css
@@ -1,11 +1,6 @@
 #body-login
-input[type="text"],
-input[type="submit"] {
-	margin: 5px 0;
-}
-
 input[type="text"]#user{
-	padding-right: 12px;
+	padding-right: 20px;
 	padding-left: 41px;
 }
 
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
index 83a23f7b239..d0fed38ee27 100644
--- a/core/lostpassword/templates/lostpassword.php
+++ b/core/lostpassword/templates/lostpassword.php
@@ -21,10 +21,10 @@ OCP\Util::addStyle('lostpassword', 'lostpassword');
 				<label for="user" class="infield"><?php print_unescaped($l->t( 'Username' )); ?></label>
 				<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
 				<?php if ($_['isEncrypted']): ?>
-				<br /><br />
-				<?php print_unescaped($l->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. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br />
+				<br />
+				<p class="warning"><?php print_unescaped($l->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. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br />
 				<input type="checkbox" name="continue" value="Yes" />
-					<?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?><br/><br/>
+					<?php print_unescaped($l->t('Yes, I really want to reset my password now')); ?></p>
 				<?php endif; ?>
 			</p>
 			<input type="submit" id="submit" value="<?php print_unescaped($l->t('Reset')); ?>" />
diff --git a/core/register_command.php b/core/register_command.php
index 8efd2673afe..fb656c0f403 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -9,6 +9,7 @@
 /** @var $application Symfony\Component\Console\Application */
 $application->add(new OC\Core\Command\Status);
 $application->add(new OC\Core\Command\Db\GenerateChangeScript());
+$application->add(new OC\Core\Command\Db\ConvertType(OC_Config::getObject(), new \OC\DB\ConnectionFactory()));
 $application->add(new OC\Core\Command\Upgrade());
 $application->add(new OC\Core\Command\Maintenance\SingleUser());
 $application->add(new OC\Core\Command\App\Disable());
@@ -17,3 +18,4 @@ $application->add(new OC\Core\Command\App\ListApps());
 $application->add(new OC\Core\Command\Maintenance\Repair(new \OC\Repair()));
 $application->add(new OC\Core\Command\User\Report());
 $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
+$application->add(new OC\Core\Command\User\LastSeen());
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 1f89e3f0403..d38dc24d9ce 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -35,14 +35,15 @@
 	<?php flush(); ?>
 	<body id="body-login">
 		<div class="wrapper"><!-- for sticky footer -->
-			<header><div id="header">
-				<div class="logo svg"></div>
-				<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
-			</div></header>
-
-			<?php print_unescaped($_['content']); ?>
+			<div class="v-align"><!-- vertically centred box -->
+				<header><div id="header">
+					<div class="logo svg"></div>
+					<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
+				</div></header>
 
+				<?php print_unescaped($_['content']); ?>
 			<div class="push"></div><!-- for sticky footer -->
+			</div>
 		</div>
 
 		<footer>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index a217446ca73..b0ae8637acc 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -123,7 +123,7 @@
 		</div></nav>
 
 		<div id="content-wrapper">
-			<div id="content">
+			<div id="content" class="app-<?php p($_['appid']) ?>">
 				<?php print_unescaped($_['content']); ?>
 			</div>
 		</div>
diff --git a/core/templates/login.php b/core/templates/login.php
index 65f760c1ee8..669d20b32e4 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -51,7 +51,7 @@
 		<label for="remember_login"><?php p($l->t('remember')); ?></label>
 		<?php endif; ?>
 		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
-		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>"/>
+		<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>" disabled="disabled"/>
 	</fieldset>
 </form>
 <?php if (!empty($_['alt_login'])) { ?>
author	Andreas Fischer <bantu@owncloud.com>	2014-05-28 22:57:33 +0200
committer	Andreas Fischer <bantu@owncloud.com>	2014-05-28 22:57:33 +0200
commit	5754b0b9e70824786878b847abb6b728ca0414bb (patch)
tree	9ad1fbc35edde8f54f44c9ef7029e007a16815b9 /core
parent	f81ee94cad8a997c3a2fef0b6aac4f8d509571f6 (diff)
parent	ce9d5df6df37e51587dcde638086dfe501892b56 (diff)
download	nextcloud-server-5754b0b9e70824786878b847abb6b728ca0414bb.tar.gz nextcloud-server-5754b0b9e70824786878b847abb6b728ca0414bb.zip